Request 4230 (accepted)

Overview

Request 4230 (accepted)

No description set

Created by Aloysius over 6 years ago
In state accepted
Package maintainer: phils3r

Submit xcfa

Submit package home:Aloysius:branches:Multimedia / xcfa to package Multimedia / xcfa

xcfa.changes Changed

xcfa.spec Changed

@@ -1,7 +1,7 @@
 #
-# spec file for package clementine
+# spec file for package xcfa
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 Packman Team <packman@links2linux.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,36 +12,45 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.links2linux.org/
 #
 
 
-
 Name: xcfa
-Version: 4.2.8
-Release: 1
+Version: 5.0.2
+Release: 0
 Summary: A lightweight multimedia converter and audio CD ripper
 License: GPL-3.0
 Group: Productivity/Multimedia/Sound/Players
-Url: http://www.xcfa.tuxfamily.org/static2/xcfa
+URL: http://www.xcfa.tuxfamily.org/static2/xcfa
 Source0: http://download.tuxfamily.org/xcfaudio/xcfa_download/src/%{name}-%{version}.tar.gz
 Patch0: deskop_file_valid.patch
 Patch1: manpage.patch
 Patch2: xcfa-no-buildtime.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: gcc-c++ pkg-config glib2-devel gtk2-devel alsa-devel libcurl-devel
+BuildRequires: alsa-devel
+BuildRequires: fdupes
+BuildRequires: gcc-c++
+BuildRequires: glib2-devel
+BuildRequires: gtk3-devel
+BuildRequires: libcurl-devel
 BuildRequires: libtag-devel
-%if 0%{?suse_version} == 1140
+BuildRequires: pkgconfig
 BuildRequires: vte-devel
-%endif
-%if 0%{?suse_version} >= 1210
-BuildRequires: vte2-devel
-%endif
-
-BuildRequires: fdupes
-Requires(post): desktop-file-utils update-desktop-files
+Requires(post): desktop-file-utils
+Requires(post): update-desktop-files
+Recommends: cdparanoia
+Recommends: faac
+Recommends: faad2
+Recommends: flac
+Recommends: lame
+Recommends: lsdvd
+Recommends: mp3gain
+Recommends: mplayer
+Recommends: normalize
+Recommends: vorbis-tools
+Recommends: vorbisgain
+Recommends: wavpack
 Suggests: %{name}-lang
-Recommends: lsdvd cdparanoia flac faac faad2 lame vorbisgain wavpack mplayer mp3gain normalize vorbis-tools 
 
 %description
 XFCA (X Convert File Audio) is a tool to create audio files out of a DVD, convert audio files into another, and rip audio CDs.
@@ -51,25 +60,22 @@
 %prep
 %setup -q
 %patch0 -p1
-#rm menu/xcfa.desktop
 gunzip man/xcfa.gz
 %patch1 -p1
 gzip man/xcfa
 %patch2 -p1
+mv man/xcfa_cli.1.gz man/xcfa_cli.gz
+sed -i 's/xcfa_cli\.1\.gz/xcfa_cli\.gz/g' man/Makefile.in
 
 %build
-export CXXFLAGS="%{optflags}"
-export CFLAGS="$CXXFLAGS"
-%configure --prefix %{_prefix} --libdir=%{_libdir}
-make %{?_smp_mflags}
-
-
+export LDADD="-lm"
+%configure
+make %{?_smp_mflags} V=1
 
 %install
 %make_install
-%find_lang %{name} %{?no_lang_C}
+%find_lang %{name} %{?no_lang_C} --all-name
 %fdupes %{buildroot}
-#%%suse_update_desktop_file -c xcfa xcfa "X Convert File Audio. Program for converting audio files." xcfa xcfa AudioVideo 
 
 %post
 update-desktop-database > /dev/null
@@ -80,18 +86,15 @@
 update-desktop-database > /dev/null
 
 %files
-%defattr(-,root,root,-)
 %doc ChangeLog COPYING
-%dir %{_libdir}/mime
-%dir %{_libdir}/mime/packages
 %dir %{_datadir}/pixmaps/xcfa
 %dir %{_datadir}/xcfa
 %dir %{_datadir}/xcfa/glade
-
 %{_bindir}/xcfa
-%{_libdir}/mime/packages/xcfa
+%{_bindir}/xcfa_cli
 %{_datadir}/applications/xcfa.desktop
-%{_mandir}/man1/xcfa.1.gz
+%{_mandir}/man1/xcfa.1%{ext_man}
+%{_mandir}/man1/xcfa_cli.1%{ext_man}
 %{_datadir}/pixmaps/xcfa-cd.png
 %{_datadir}/pixmaps/xcfa.png
 %{_datadir}/pixmaps/xcfa.xpm
@@ -119,7 +122,11 @@
 %{_datadir}/pixmaps/xcfa/sol.png
 %{_datadir}/pixmaps/xcfa/trash.png
 %{_datadir}/xcfa/glade/xcfa.glade
-
+%{_datadir}/xcfa/glade/xcfa_win_about.glade
+%{_datadir}/xcfa/glade/xcfa_win_info.glade
+%{_datadir}/xcfa/glade/xcfa_win_reader.glade
+%{_datadir}/xcfa/glade/xcfa_win_scan.glade
+%{_datadir}/xcfa/glade/xcfa_win_treeview.glade
 
 %files lang -f %{name}.lang

deskop_file_valid.patch Changed

@@ -1,26 +1,25 @@
-Patch to make the desktop file valid
-
-Mon Feb 27 21:16:34 CET 2012 Philipp Seiler <seiler@b1-systems.de>
-
---- xcfa-4.2.8/menu/xcfa.desktop	2012-02-27 21:10:09.839680240 +0100
-+++ xcfa-4.2.8/menu/xcfa.desktop	2012-02-27 21:12:08.359252441 +0100
-@@ -1,5 +1,4 @@
+Index: xcfa-5.0.2/menu/xcfa.desktop
+===================================================================
+--- xcfa-5.0.2.orig/menu/xcfa.desktop
++++ xcfa-5.0.2/menu/xcfa.desktop
+@@ -1,5 +1,5 @@
 [Desktop Entry]
--Version=4.0.0
+-Version=5.0.2
++Version=1.0
 Name=XCFA
 Name[ar]=XCFA
 Name[cs]=XCFA
-@@ -51,11 +50,11 @@ Comment[sk]=Konvertuj X audio súborov.
+@@ -51,11 +51,11 @@ Comment[sk]=Konvertuj X audio súborov.
 Comment[sr]=Претвори Кс Филе Аудио. Програм за претварање аудио датотеке.
 Comment[sv]=Konvertera X File Audio. Program för att konvertera ljudfiler.
 Comment[zh_CN]=X档案音频转换。程序转换为音频文件。
 -Icon=xcfa.png
 +Icon=xcfa
- MimeType=audio/x-wav;application/x-flac;audio/x-ape;audio/ape;audio/x-wavpack;application/x-ogg;audio/ogg;application/ogg;audio/x-m4a;audio/x-aac;audio/aac;audio/mp3;audio/x-mp3;audio/x-ms-wma;
+ MimeType=
 Type=Application
 Exec=xcfa
 Terminal=false
- StartupNotify=true
+ StartupNotify=false
 -Categories=Application;AudioVideo;AudioVideoEditing;
 +Categories=AudioVideo;AudioVideoEditing;

xcfa-4.2.8.tar.gz/configure.in Deleted

@@ -1,369 +0,0 @@
-#
-# configure.in
-# -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-# For XCFA project
-#
-
-AC_INIT([xcfa],
-        [4.2.8],
-        [http://www.xcfa.tuxfamily.org/],
-        [xcfa],
-        [http://www.xcfa.tuxfamily.org/])
-AM_INIT_AUTOMAKE
-AC_CONFIG_SRCDIR([src/main.c])
-AM_CONFIG_HEADER([config.h])
-
-# Enable silent rules if supported
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-# Checks for programs.
-AC_PROG_CXX
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-AC_PATH_X
-AC_PROG_RANLIB
-AM_PROG_CC_C_O
-
-AC_DEFINE(ENABLE_STATIC_LIBRARY,1,[Define for enable static libarry])
-
-# Set PREFIX: ./configure  OR ./configure --prefix=/usr
-AC_SUBST(INSTALL_PREFIX)
-AC_PREFIX_DEFAULT(/usr/local)
-if [[ $prefix = "NONE" ]] ; then
-	AC_DEFINE(INSTALL_PREFIX, "/usr/local",
-		[define as prefix where xcfa is installed])
-else
-	AC_DEFINE_UNQUOTED(INSTALL_PREFIX, "$prefix")
-fi
-
-# Set used name package glade: *.glade or *.ui
-AC_DEFINE(PACKAGE_NAME_GLADE, "xcfa.glade", [define as package name of glade])
-AC_DEFINE(PACKAGE_NAME_GLADE_UI, "xcfa.ui", [define as package name of ui])
-
-# nls support
-AC_MSG_CHECKING(for nls mode support)
-XCFA_LANG="en en_GB es fr de it nl"
-AC_ARG_ENABLE(nls, , [
-if test "$enableval" = "yes"; then
-	ALL_LINGUAS=$XCFA_LANG
-	AC_MSG_RESULT(yes)
-	AM_GNU_GETTEXT([external])
-	AC_DEFINE(ENABLE_NLS,1,[Define for NLS support])
-else
-	AC_MSG_RESULT(no)
-	ALL_LINGUAS=
-	USE_NLS="no"
-fi
-], [
-	ALL_LINGUAS=$XCFA_LANG
-	AC_MSG_RESULT(yes)
-	AM_GNU_GETTEXT([external])
-	AC_DEFINE(ENABLE_NLS,1,[Define for NLS support])
-])
-
-GETTEXT_PACKAGE=[$PACKAGE]
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain])
-
-# Checks for libraries.
-AC_CHECK_LIB([lib], [libutils_test_file_exist])
-
-# Checks for header files.
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([fcntl.h libintl.h stdlib.h string.h unistd.h sys/time.h math.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_HEADER_STDBOOL
-AC_C_CONST
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_TYPE_SSIZE_T
-AC_TYPE_INT64_T
-
-# Checks for library functions.
-AC_FUNC_CLOSEDIR_VOID
-AC_FUNC_FORK
-AC_PROG_GCC_TRADITIONAL
-AC_FUNC_LSTAT
-AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
-AC_FUNC_MALLOC
-AC_TYPE_SIGNAL
-AC_CHECK_FUNCS([dup2 getcwd memset mkfifo setlocale strcasecmp strchr strdup strncasecmp strrchr strstr uname gettimeofday strtoul])
-
-#
-# debug and ansi support
-#
-AC_ARG_ENABLE(debug_pg, AC_HELP_STRING([--disable-debug-pg], [Enable debug mode (default=disable)]),,enable_debug_pg=no)
-AC_ARG_ENABLE(debug, AC_HELP_STRING([--disable-debug], [Disable debug mode (default=disable)]),,enable_debug=no)
-AC_ARG_ENABLE(ansi,  AC_HELP_STRING([--disable-ansi],  [Enable ansi (default=enabled)]),,enable_ansi=no)
-
-AC_MSG_CHECKING(for debug mode request)
-if test "$enable_debug" = "yes"; then
- 	AC_MSG_RESULT(yes)
-	AC_DEFINE(DEBUG,1,[Define for debug support])
-	AC_MSG_CHECKING(With ansi compilate)
-	if test "$enable_ansi" = "yes"; then
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(ENABLE_ANSI,1,[Define With ansi compilate])
-		AC_MSG_CHECKING(With enable_debug_pg)
-		if test "$enable_debug_pg" = "yes"; then
-			AC_MSG_RESULT(yes)
-			AC_DEFINE(ENABLE_DEBUG_PG,1,[Define for debug gprof support])
-			echo "***"
-			echo "*** enable_debug=yes, enable_ansi=yes, enable_debug_pg=yes"
-			echo "*** CFLAGS=-pg -g -O2 -Wall -ansi -D_REENTRANT -DLinux -Wl,--export-dynamic"
-			echo "***"
-			CFLAGS="-pg -g -O2 -Wall -ansi -D_REENTRANT -DLinux -Wl,--export-dynamic"
-		else
-			AC_MSG_RESULT(no)
-			echo "***"
-			echo "*** enable_debug=yes, enable_ansi=yes, enable_debug_pg=no"
-			echo "*** CFLAGS=-g -O2 -Wall -ansi -D_REENTRANT -DLinux -Wl,--export-dynamic"
-			echo "***"
-			CFLAGS="-g -O2 -Wall -ansi -D_REENTRANT -DLinux -Wl,--export-dynamic"
-		fi
-	else
-		AC_MSG_RESULT(no)
-		AC_MSG_CHECKING(With enable_debug_pg)
-		if test "$enable_debug_pg" = "yes"; then
-			AC_MSG_RESULT(yes)
-			AC_DEFINE(ENABLE_DEBUG_PG,1,[Define for debug gprof support])
-			echo "***"
-			echo "*** enable_debug=yes, enable_ansi=no, enable_debug_pg=yes"
-			echo "*** CFLAGS=-pg -g -O2 -Wall -D_REENTRANT -DLinux -Wl,--export-dynamic"
-			echo "***"
-			CFLAGS="-pg -g -O2 -Wall -D_REENTRANT -DLinux -Wl,--export-dynamic"
-		else
-			AC_MSG_RESULT(no)
-			echo "***"
-			echo "*** enable_debug=yes, enable_ansi=no, enable_debug_pg=no"
-			echo "*** CFLAGS=-g -O2 -Wall -D_REENTRANT -DLinux -Wl,--export-dynamic"
-			echo "***"
-			CFLAGS="-g -O2 -Wall -D_REENTRANT -DLinux -Wl,--export-dynamic"
-		fi
-	fi
-else
- 	AC_MSG_RESULT(no)
-	AC_MSG_CHECKING(With ansi compilate)
- 	if test "$enable_ansi" = "yes"; then
- 		AC_MSG_RESULT(yes)
-		AC_DEFINE(ENABLE_ANSI,1,[Define With ansi compilate])
-		AC_MSG_CHECKING(With enable_debug_pg)
-		if test "$enable_debug_pg" = "yes"; then
-			AC_MSG_RESULT(yes)
-			AC_DEFINE(ENABLE_DEBUG_PG,1,[Define for debug gprof support])
-			echo "***"
-			echo "*** enable_debug=no, enable_ansi=yes, enable_debug_pg=yes"
-			echo "*** CFLAGS=-pg -Wall -ansi -D_REENTRANT -DLinux -Wl,--export-dynamic"
-			echo "***"
-			CFLAGS="-pg -Wall -ansi -D_REENTRANT -DLinux -Wl,--export-dynamic"
-		else
-			echo "***"
-			echo "*** enable_debug=no, enable_ansi=yes, enable_debug_pg=no"
-			echo "*** CFLAGS=-Wall -ansi -D_REENTRANT -DLinux -Wl,--export-dynamic"
-			echo "***"
-			CFLAGS="-Wall -ansi -D_REENTRANT -DLinux -Wl,--export-dynamic"
-		fi
-	else
-		AC_MSG_RESULT(no)
-		AC_MSG_CHECKING(With enable_debug_pg)
-		if test "$enable_debug_pg" = "yes"; then
-			AC_MSG_RESULT(yes)
-			AC_DEFINE(ENABLE_DEBUG_PG,1,[Define for debug gprof support])
-			echo "***"
-			echo "*** enable_debug=no, enable_ansi=no, enable_debug_pg=yes"
-			echo "*** CFLAGS=-pg -Wall -D_REENTRANT -DLinux -Wl,--export-dynamic"
-			echo "***"
-			CFLAGS="-pg -Wall -D_REENTRANT -DLinux -Wl,--export-dynamic"
-		else
-			AC_MSG_RESULT(no)
-			echo "***"
-			echo "*** enable_debug=no, enable_ansi=no, enable_debug_pg=no"
-			echo "*** CFLAGS=-Wall -O3 -D_REENTRANT -DLinux -Wl,--export-dynamic"
-			echo "***"
-			CFLAGS="-Wall -O3 -D_REENTRANT -DLinux -Wl,--export-dynamic"
-		fi
-	fi
-fi
-
-# 
-# LDFLAGS="-lm$LDFLAGS"
-# Check for complex math functions support: -lm
-#
-AC_CHECK_LIB([m],[csin],,,)
-
-# 
-# gtk support
-#
-pkg_modules="gtk+-2.0 cairo glib-2.0 gthread-2.0"
-PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
-AC_SUBST(PACKAGE_CFLAGS)
-AC_SUBST(PACKAGE_LIBS)
-
-#
-# taglib support
-#
-AC_CHECK_LIB([tag_c], [taglib_file_new],,
-[
-  echo "***"
-  echo "*** Please, install libtag1-dev,libtagc0-dev development headers"
-  echo "*** OR"
-  echo "*** install taglib-dev for Fedora, Mandriva"
-  echo "***"
-  exit -1
-])
-AC_DEFINE([HAVE_TAGLIB], 1, [Define if you have TAGLIB installed])
-
-# 
-# asound support
-# 
-AC_CHECK_LIB([asound], [snd_pcm_open],,
-[
-  echo "***"
-  echo "*** Please, install libasound2-dev development headers"
-  echo "***"
-  exit -1
-])
-AC_DEFINE([HAVE_ALSA], 1, [Define if you have ALSA installed])
-
-# 
-# pthread support
-# 
-AC_CHECK_LIB([pthread], [pthread_create],,
-[
-  echo "***"
-  echo "*** Please, install pthread-dev development headers"
-  echo "***"
-  exit -1
-])
-
-# 
-# curl support
-# 
-AC_CHECK_LIB([curl], [curl_easy_init],,
-[
-  echo "***"
-  echo "*** Please, install libcurl4-gnutls-dev or libcurl4-openssl-dev development headers"
-  echo "***"
-  exit -1
-])
-AC_DEFINE([HAVE_CURL], 1, [Define if you have CURL installed])
-
-# 
-# vte support
-# 
-AC_CHECK_LIB([vte], [vte_terminal_feed],,
-[
-  echo "***"
-  echo "*** Please, install libvte-dev development headers"
-  echo "***"
-  exit -1
-])
-AC_DEFINE([HAVE_VTE], 1, [Define if you have VTE installed])
-# 
-# for win_vte.c: directory vte.h ?
-# 
-FILE_DEBIAN_VTE_H="/usr/include/vte/vte.h"
-FILE_ARCH_VTE_H="/usr/include/vte-0.0/vte/vte.h"
-FILE_FW_VTE_H="/usr/include/vte-2.90/vte/vte.h"
-if test -f $FILE_DEBIAN_VTE_H; then
-	AC_DEFINE([FILE_DEBIAN_VTE_H_IS_OK], 1, [Define if you have vte.h in /usr/include/vte/vte.h])
-elif test -f $FILE_ARCH_VTE_H; then
-	AC_DEFINE([FILE_ARCH_VTE_H_IS_OK], 1, [Define if you have vte.h in /usr/include/vte-0.0/vte/vte.h])
-elif test -f $FILE_FW_VTE_H; then
-	AC_DEFINE([FILE_FW_VTE_H_IS_OK], 1, [Define if you have vte.h in /usr/include/vte-2.90/vte/vte.h])
-fi
-
-# 
-# ? System info
-# 
-case $host in
-	*linux*)
-		HOST="Linux-based system"
-		;;
-	*openbsd*)
-		HOST="OpenBSD"
-		;;
-	*netbsd*)
-		HOST="NetBSD"
-		;;
-	*freebsd*)
-		HOST="FreeBSD"
-		;;
-	*mingw*)
-		HOST="Mingw"
-		;;
-	*solaris*)
-		HOST="Solaris"
-		;;
-	*)
-		HOST="Other"
-		;;
-esac
-
-AC_CONFIG_FILES([
-po/Makefile.in
-lib/Makefile
-Makefile
-src/Makefile
-man/Makefile
-pixmaps/Makefile
-menu/Makefile
-mime/Makefile
-glade/Makefile
-desktop/Makefile
-])
-
-AC_OUTPUT
-
-the_hostname=`hostname`
-pkg_config_modversion_gtk=`pkg-config --modversion gtk+-2.0`
-pkg_config_modversion_cairo=`pkg-config --modversion cairo`
-pkg_config_modversion_glib=`pkg-config --modversion glib-2.0`
-pkg_config_modversion_gthread=`pkg-config --modversion gthread-2.0`
-pkg_config_modversion_libcurl=`pkg-config --modversion libcurl`
-pkg_config_modversion_vte=`pkg-config --modversion vte`
-
-AC_MSG_NOTICE([
-=================================================================
-  Configuration for $PACKAGE $VERSION :
-=================================================================
-
-  Host System Type ................ : $host ( $HOST )
-  HosName ......................... : $the_hostname
-  Compiler ........................ : $CC $CPPFLAGS
-  Linker .......................... : $LDFLAGS $LIBS
-  NLS/gettext ..................... : $USE_NLS
-  ALL_LINGUAS ..................... : $ALL_LINGUAS
-  GTK+ version .................... : $pkg_config_modversion_gtk
-  CAIRO version ................... : $pkg_config_modversion_cairo 
-  GLIB version .................... : $pkg_config_modversion_glib
-  GTHREAD version ................. : $pkg_config_modversion_gthread
-  LIBCURL version ................. : $pkg_config_modversion_libcurl
-  VTE version ..................... : $pkg_config_modversion_vte
-  Debug mode g .................... : $enable_debug
-  Debug mode pg ................... : $enable_debug_pg
-  WITH ANSI COMPILATE ............. : $enable_ansi
-  CFLAGS .......................... : $CFLAGS
-  INSTALL ......................... : $prefix/bin/xcfa
-
-  Options parameters:
-  -------------------
-  by default:
-  	--disable-debug                             No debug support
-  	--disable-debug-pg                          No debug support with gprof
-  	--disable-ansi                              No define ansi for probleme compilate
-  Options is:
-  	--enable-debug      #define DEBUG 1         Define for debug: -g
-  	--enable-debug-pg   #define DEBUG_PG 1      Define for debug support with gprof: -pg
-  	--enable-ansi       #define ENABLE_ANSI 1   Define With ansi compilate
-
-  Now type 'make' to build $PACKAGE $VERSION,
-  and then type (under root) 'make install' for installation.
-])
-

xcfa-4.2.8.tar.gz/mime Deleted

xcfa-4.2.8.tar.gz/mime/Makefile.am Deleted

xcfa-4.2.8.tar.gz/mime/Makefile.in Deleted

@@ -1,416 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = mime
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(mimedir)"
-DATA = $(mime_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PREFIX = @INSTALL_PREFIX@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_CFLAGS = @PACKAGE_CFLAGS@
-PACKAGE_LIBS = @PACKAGE_LIBS@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-XMKMF = @XMKMF@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-#
-# mime/Makefile.am
-#
-AUTOMAKE_OPTIONS = gnu 
-EXTRA_DIST = xcfa
-mime_DATA = xcfa
-mimedir = $(libdir)/mime/packages
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mime/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu mime/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-mimeDATA: $(mime_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(mimedir)" || $(MKDIR_P) "$(DESTDIR)$(mimedir)"
-	@list='$(mime_DATA)'; test -n "$(mimedir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(mimedir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(mimedir)" || exit $$?; \
-	done
-
-uninstall-mimeDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(mime_DATA)'; test -n "$(mimedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(mimedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(mimedir)" && rm -f $$files
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(mimedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-mimeDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-mimeDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-mimeDATA install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-mimeDATA
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

xcfa-4.2.8.tar.gz/mime/xcfa Deleted

xcfa-4.2.8.tar.gz/src/popup_systray.c Deleted

@@ -1,205 +0,0 @@
- /*
- * file : popup_systray.c
- * project : xcfa
- * with : Gtk-2
- *
- * copyright : (C) 2003 - 2012 by Claude Bulin
- *
- * xcfa - GTK+ implementation of the GNU shell command
- * GNU General Public License
- *
- * This file is part of XCFA.
- * 
- * XCFA is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * at your option) any later version.
- * 
- * XCFA is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with XCFA. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-
-#ifdef HAVE_CONFIG_H
-	#include "../config.h"
-#endif
-
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
-#include <gtk/gtk.h>
-#include <glib.h>
-
-#ifdef ENABLE_STATIC_LIBRARY
-	#include "../lib/lib.h"
-#endif
-
-#include "global.h"
-#include "configuser.h"
-#include "popup_systray.h"
-
-
-
-// 
-// 
-// SYSTRAY: CREATION DE L'ICONE DE STATUS + INFO-BULLE
-// 
-// 
-typedef struct {
-	GtkStatusIcon	*p_status_icon;			// 
-	gboolean	 BoolMainShow;			// 
-	gboolean	 BoolMainAction;		// TRUE = Action ELSE FALSE
-} VAR_POPUP_SYSTRAY;
-
-VAR_POPUP_SYSTRAY	VarPopupSystray = {
-			NULL,		// p_status_icon
-			TRUE,		// BoolMainShow
-			FALSE		// BoolMainAction
-			};
-
-
-void on_quitter1_activate (GtkMenuItem *menuitem, gpointer user_data);
-
-
-
-// 
-// 
-void PopupSystray_set_BoolMainAction (gboolean p_BoolMainAction)
-{
-	VarPopupSystray.BoolMainAction = p_BoolMainAction;
-}
-// 
-// 
-void PopupSystray_show_hide (void)
-{
-	static GdkScreen *screen;
-
-	if( GTK_WIDGET_FLAGS(WindMain) & GTK_VISIBLE ){
-		gtk_window_get_position( GTK_WINDOW(WindMain), &Config.WinPos_X, &Config.WinPos_Y);
-		screen = gtk_window_get_screen( GTK_WINDOW(WindMain) );
-		gtk_widget_hide( GTK_WIDGET(WindMain) );
-		VarPopupSystray.BoolMainShow = FALSE;
-	} else {
-		gtk_window_set_screen( GTK_WINDOW(WindMain), screen);
-		gtk_window_move( GTK_WINDOW(WindMain), Config.WinPos_X, Config.WinPos_Y);
-		gtk_widget_show( GTK_WIDGET (WindMain) );
-		gtk_window_present( GTK_WINDOW(WindMain) );
-		gtk_window_deiconify( GTK_WINDOW(WindMain) );
-		VarPopupSystray.BoolMainShow = TRUE;
-	}
-}
-// 
-// 
-void PopupSystray_for_action (GtkMenuItem *menuitem, gpointer user_data)
-{
-	gint channel = GPOINTER_TO_INT(user_data);
-	
-	if (0 == channel) {
-		PopupSystray_show_hide ();
-	}
-	else if (2 == channel) {
-		on_quitter1_activate (NULL, NULL);
-	}
-}
-// 
-// 
-void PopupSystray_function (GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data)
-{
-	GtkWidget	*menu_systray;
-	GtkWidget	*menu_systray_hide;
-	GtkWidget	*menu_systray_quit;
-	GtkWidget	*sep;
-	GtkWidget	*Image = NULL;
-	GtkWidget	*ImageQuit = NULL;
-	
-	menu_systray = gtk_menu_new ();
-	gtk_widget_set_extension_events (menu_systray, GDK_EXTENSION_EVENTS_ALL);
-	
-	if (TRUE == VarPopupSystray.BoolMainShow) {
-		menu_systray_hide = gtk_image_menu_item_new_with_mnemonic (_(" Cacher Xcfa "));
-	}
-	else {
-		menu_systray_hide = gtk_image_menu_item_new_with_mnemonic (_(" Montrer Xcfa "));
-	}	
-	gtk_widget_show (menu_systray_hide);
-	gtk_container_add (GTK_CONTAINER (menu_systray), menu_systray_hide);
-	
-	// STOCK ITEMS
-	//
-	// http://gtk.developpez.com/doc/fr/gtk/gtk-Stock-Items.html
-	//
-	
-	// Image = gtk_image_new_from_pixbuf ( libutils_init_pixbufs ("xcfa/dbfs-no.png"));
-	// Image = gtk_image_new_from_pixbuf ( libutils_init_pixbufs ("xcfa.png"));
-	Image = gtk_image_new_from_stock (GTK_STOCK_REFRESH, GTK_ICON_SIZE_MENU);
-	gtk_widget_show (Image);
-	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_systray_hide), Image);
-		
-	sep = gtk_separator_menu_item_new ();
-	gtk_widget_show (sep);
-	gtk_container_add (GTK_CONTAINER (menu_systray), sep);
-
-	menu_systray_quit = gtk_image_menu_item_new_with_mnemonic (_(" Quitter Xcfa "));
-	gtk_widget_show (menu_systray_quit);
-	gtk_container_add (GTK_CONTAINER (menu_systray), menu_systray_quit);
-	
-	ImageQuit = gtk_image_new_from_stock (GTK_STOCK_QUIT, GTK_ICON_SIZE_MENU);
-	gtk_widget_show (ImageQuit);
-	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_systray_quit), ImageQuit);
-	
-	// FALSE:
-	// 	SI UNE ACTION EST EN COURS
-	// TRUE:
-	//	SINON
-	// gtk_widget_set_sensitive (menu_systray_quit, FALSE | TRUE);
-	gtk_widget_set_sensitive( menu_systray_quit, VarPopupSystray.BoolMainAction == TRUE ? FALSE : TRUE );
-
-	g_signal_connect ((gpointer) menu_systray_hide, "activate", G_CALLBACK (PopupSystray_for_action), (gpointer)0);
-	g_signal_connect ((gpointer) menu_systray_quit, "activate", G_CALLBACK (PopupSystray_for_action), (gpointer)2);
-	
-	// GLADE_HOOKUP_OBJECT_NO_REF (menu_systray, menu_systray, "menu_systray");
-	// GLADE_HOOKUP_OBJECT (menu_systray, menu_systray_hide, _(" Cacher Xcfa "));
-	// GLADE_HOOKUP_OBJECT (menu_systray, menu_systray_hide, _(" Montrer Xcfa "));
-	// GLADE_HOOKUP_OBJECT (menu_systray, menu_systray_quit, _(" Quitter Xcfa "));
-	gtk_widget_show_all (menu_systray);
-	
-	gtk_menu_popup (
-		GTK_MENU (menu_systray),
-		NULL,
-		NULL,
-		gtk_status_icon_position_menu,	// Menu sous la barre
-		VarPopupSystray.p_status_icon,
-		button,
-		activate_time);
-}
-// 
-// 
-void PopupSystray_activate (GtkMenuItem *menuitem, gpointer user_data)
-{
-	PopupSystray_show_hide ();
-}
-// 
-// 
-void PopupSystray_init (void)
-{
-	gchar		*Path = NULL;
-	GtkStatusIcon	*tray_icon = NULL;
-	
-	tray_icon = gtk_status_icon_new ();
-	gtk_status_icon_set_visible(tray_icon, TRUE);
-	Path = libutils_get_pathname_pixmaps ("xcfa.png");
-	VarPopupSystray.p_status_icon = gtk_status_icon_new_from_file (Path);
-	g_free (Path);	Path = NULL;
-	gtk_status_icon_set_tooltip (GTK_STATUS_ICON (VarPopupSystray.p_status_icon), _("XCFA\nProgramme pour convertir les fichiers audio."));
-	g_signal_connect (G_OBJECT (VarPopupSystray.p_status_icon), "popup-menu",G_CALLBACK (PopupSystray_function), WindMain);
-	g_signal_connect (G_OBJECT (VarPopupSystray.p_status_icon), "activate",G_CALLBACK (PopupSystray_activate), WindMain);
-}
-

xcfa-4.2.8.tar.gz/src/popup_systray.h Deleted

@@ -1,36 +0,0 @@
- /*
- * file : popup_systray.h
- * project : xcfa
- * with : Gtk-2
- *
- * copyright : (C) 2003 - 2012 by Claude Bulin
- *
- * xcfa - GTK+ implementation of the GNU shell command
- * GNU General Public License
- *
- * This file is part of XCFA.
- * 
- * XCFA is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * at your option) any later version.
- * 
- * XCFA is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with XCFA. If not, see <http://www.gnu.org/licenses/>.
- */
- 
- 
-#ifndef popup_systray_h
-#define popup_systray_h 1
-
-void	PopupSystray_init (void);
-void	PopupSystray_set_BoolMainAction (gboolean p_BoolMainAction);
-
-#endif
-
-

xcfa-4.2.8.tar.gz/src/process.c Deleted

@@ -1,153 +0,0 @@
- /*
- * file : process.c
- * project : xcfa
- * with : Gtk-2
- *
- * copyright : (C) 2003 - 2012 by Claude Bulin
- *
- * xcfa - GTK+ implementation of the GNU shell command
- * GNU General Public License
- *
- * This file is part of XCFA.
- * 
- * XCFA is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * at your option) any later version.
- * 
- * XCFA is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with XCFA. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifdef HAVE_CONFIG_H
-	#include "../config.h"
-#endif
-
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-#include <gtk/gtk.h>
-#include <pthread.h>
-#include <glib.h>
-#include <glib/gstdio.h>
-
-#include <stdlib.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <string.h>
- 
-#ifdef ENABLE_STATIC_LIBRARY
-	#include "../lib/lib.h"
-#endif
-
-#include "global.h"
-#include "file.h"
-#include "process.h"
-
-
-
-typedef struct {
-	guint	handler_timeout;
-	size_t	Size_XCFA_FILE_LOAD;
-	GSList	*gslist;
-	// GSList	*gslist_remove;
-	FILE	*fp;
-} VAR_PROCESS;
-
-VAR_PROCESS VarProcess = {
-			0,
-			-1,
-			NULL,
-			NULL
-			};
-
-
-
-// 
-// 
-void process_debug (gchar *p_trace)
-{
-	FILE	*fp = NULL;
-	
-	fp = fopen ("/tmp/xcfa_trace.txt", "a");
-	fprintf (fp, "%s\n", p_trace);
-	fclose (fp);
-}
-// 
-// 
-static gint process_level_timeout_do (gpointer data)
-{
-#define PROCESS_MAX_CARS 2048
-	
-	if (VarProcess.Size_XCFA_FILE_LOAD != libutils_get_size_file (XCFA_FILE_LOAD)) {
-		VarProcess.Size_XCFA_FILE_LOAD = libutils_get_size_file (XCFA_FILE_LOAD);
-		return (TRUE);
-	}
-		
-	// LECTURE DU FICHIER [ XCFA_FILE_LOAD ] ET CONSTRUCTION DU GSLIST
-	if (NULL != (VarProcess.fp = fopen (XCFA_FILE_LOAD, "r"))) {
-
-		gchar	buf [ PROCESS_MAX_CARS +1 ];
-		gchar	*ptr = NULL;
-		
-		while (fgets (buf, PROCESS_MAX_CARS, VarProcess.fp) != NULL) {
-			if ((ptr = strchr (buf, '\n'))) *ptr = '\0';
-			VarProcess.gslist = g_slist_append (VarProcess.gslist, g_strdup (buf));
-		}
-		fclose (VarProcess.fp);
-	
-		// ANALYSE DE LA LISTE
-		fileanalyze_add_file_to_treeview (_PATH_LOAD_FILE_ALL_, VarProcess.gslist);
-	}
-	
-	// DESTRUCTION DE LA LISTE
-	VarProcess.gslist = libutils_remove_gslist (VarProcess.gslist);
-	
-	// DESTRUCTION DU FICHIER [ XCFA_FILE_LOAD ]
-	g_unlink (XCFA_FILE_LOAD);
-	
-	// FIN DU TIMEOUT
-	gtk_timeout_remove (VarProcess.handler_timeout);
-	
-#undef PROCESS_MAX_CARS
-	return (TRUE);
-}
-// 
-// 
-void process_goto_timeout (void)
-{
-	if (TRUE == libutils_test_file_exist (XCFA_FILE_LOAD)) {
-		gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_general")), NOTEBOOK_FICHIERS);
-		gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_in_file")), NOTEBOOK_FICHIERS_CONVERSION);
-		g_usleep (20);
-		VarProcess.handler_timeout = gtk_timeout_add (400, process_level_timeout_do, 0);
-	}
-}
-// 
-// 
-gboolean process_exist_file (void)
-{
-	return (libutils_test_file_exist (XCFA_FILE_LOAD));
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

xcfa-4.2.8.tar.gz/src/process.h Deleted

@@ -1,37 +0,0 @@
- /*
- * file : process.h
- * project : xcfa
- * with : Gtk-2
- *
- * copyright : (C) 2003 - 2012 by Claude Bulin
- *
- * xcfa - GTK+ implementation of the GNU shell command
- * GNU General Public License
- *
- * This file is part of XCFA.
- * 
- * XCFA is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * at your option) any later version.
- * 
- * XCFA is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with XCFA. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef process_h
-#define process_h 1
-
-#define XCFA_FILE_LOAD		"/tmp/xcfa_file_load.txt"
-
-void		process_goto_timeout (void);
-gboolean	process_exist_file (void);
-
-#endif
-

xcfa-4.2.8.tar.gz/src/translate.c Deleted

@@ -1,475 +0,0 @@
- /*
- * file : translate.c
- * project : xcfa
- * with : Gtk-2
- *
- * copyright : (C) 2003 - 2012 by Claude Bulin
- *
- * xcfa - GTK+ implementation of the GNU shell command
- * GNU General Public License
- *
- * This file is part of XCFA.
- * 
- * XCFA is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * at your option) any later version.
- * 
- * XCFA is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with XCFA. If not, see <http://www.gnu.org/licenses/>.
- */
- 
- 
-#ifdef HAVE_CONFIG_H
-	#include "../config.h"
-#endif
-
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
-#include <gtk/gtk.h>
-#include <string.h>
-
-#ifdef ENABLE_STATIC_LIBRARY
-	#include "../lib/lib.h"
-#endif
-
-#include "global.h"
-
-
-
-void translate_xcfa (void)
-{
-	typedef struct {
-		gchar	*string;
-	} TRANS;
-TRANS trans[] = {
-
-{ _("Fichier") },
-{ _("Quitter") },
-{ _("Outils") },
-{ _("Visibilite des champs") },
-{ _("Aide") },
-{ _("A propos") },
-{ _("Lecture") },
-{ _(" Choix du peripherique / Lecture du DVD ") },
-{ _(" Destination des fichiers ") },
-{ _(" Eject ") },
-{ _(" Normaliser ") },
-{ _("Deplier") },
-{ _("Replier") },
-{ _(" Vers 2CH: Sub / Ambiance ") },
-{ _("Extraire") },
-{ _(" DVD ") },
-{ _("Lecture") },
-{ _(" Choix du peripherique / Lecture du CD ") },
-{ _(" Destination des fichiers ") },
-{ _(" Eject ") },
-{ _("Titre:") },
-{ _("Album:") },
-{ _("Artiste:") },
-{ _(" Annee:") },
-{ _(" Genre:") },
-{ _(" Piste:") },
-{ _(" *.m3u et xspf: ") },
-{ _("Commentaire:") },
-{ _(" Modification des tags Freedb ") },
-{ _("%a [ %a=\"Artist\" ]\n\n%b [ %b=\"Album\" ]\n\n%Tl - Tetsumaki lower\n\nTransforme la chaine en minuscule sauf le premier caractere.\n\nDans le champs 'Titre' depuis [ Modification des tags FreeDB ],\nle ou les caracteres devant etre conserves doivent etre precedes par le caractere %") },
-{ _("%a - artiste %b - titre de l'album %c - numero de la piste\n%d - titre de la chanson %e - annee %g - genre\n%f - creation d'un fichier *.m3u et *.xspf %na - no accent\n%u - remplacement de caracteres: %u(AB=C) %u( =_) %Tl - Tetsumaki lower") },
-{ _(" Arrangement des titres du CD ") },
-{ _("Creation d'un fichier unique au format: ") },
-{ _(" et dont le nom sera: ") },
-{ _("Ecriture du fichier cue") },
-{ _(" Au moins deux selections colonne Wav ") },
-{ _("Creation d'un fichier cue\nunique depuis une lecture\ndu cd audio") },
-{ _("Creation fichier cue uniquement") },
-{ _(" Creation Cue cd ") },
-{ _(" Creation d'un fichier unique ") },
-{ _("Gestion des tags, titres et fichiers cue") },
-{ _(" Normaliser ") },
-{ _("definit le serveur a contacter pour les recherches titre") },
-{ _("Parametres par defaut") },
-{ _(" Serveur ") },
-{ _("Choix parmis les differentes bases de donnees pour le CD.") },
-{ _("DiscId") },
-{ _("Extraire") },
-{ _(" CD ") },
-{ _(" Importer ") },
-{ _(" Destination des conversions ") },
-{ _(" Nettoyer ") },
-{ _("Appliquer les modifications") },
-{ _(" Normalise: ") },
-{ _(" Choix niveau dBFS: ") },
-{ _(" Fichiers ") },
-{ _("Quantification") },
-{ _("Voie") },
-{ _(" Frequence - Hertz ") },
-{ _("Appliquer les modifications") },
-{ _(" Wav ") },
-{ _(" Lame (fichier mp3): ") },
-{ _(" Oggenc (fichier ogg): ") },
-{ _("Appliquer") },
-{ _("Effacer") },
-{ _(" Mp3-Ogg ") },
-{ _("Titre:") },
-{ _("Album:") },
-{ _("Artiste:") },
-{ _("Commentaire:") },
-{ _(" Annee:") },
-{ _(" Genre:") },
-{ _(" Piste:") },
-{ _(" Modif.:") },
-{ _("0") },
-{ _("Appliquer") },
-{ _(" Tags ") },
-{ _(" Fichiers ") },
-{ _(" Importer ") },
-{ _(" Destination des fichiers ") },
-{ _("Lecture de 5 secondes apres le marqueur de debut") },
-{ _("Index de debut") },
-{ _("00h00m00s") },
-{ _("lecture") },
-{ _("Pause") },
-{ _("Index de lecture") },
-{ _("label") },
-{ _("Lecture de 5 secondes avant le marqueur de fin") },
-{ _("Index de fin") },
-{ _("00h00m00s") },
-{ _("Plage") },
-{ _("Duree de la plage active") },
-{ _("00h00m00s") },
-{ _("Suprimer tous les marqueurs pour les remplacer par un marqueur unique") },
-{ _("Le fichier CUE sera enregistre vers 'Destination des fichiers'.") },
-{ _("Production fichier Cue") },
-{ _("Le resultat du Split sera dirige vers 'Destination des fichiers'.") },
-{ _("Split") },
-{ _(" Split ") },
-{ _("Importation du titre du CD.") },
-{ _("Titre CD") },
-{ _("Choix d'une nouvelle police.") },
-{ _("Texte gras.") },
-{ _("Texte italique.") },
-{ _("Apres une lecture de CD et un ajout d'etiquette, ce menu permet la mise en forme des titres, auteurs ...") },
-{ _("Ajouter du texte editable.") },
-{ _("Texte") },
-{ _("Saisissez ici un critere de recherche d'images.") },
-{ _("Importation des images depuis le Web.") },
-{ _("Import images web") },
-{ _("Supprimer l'image en selection") },
-{ _("AJouter de nouvelles images.") },
-{ _("Ouvre un fichier") },
-{ _("Enregistrer la page au format png.") },
-{ _("Sauvegarde le fichier") },
-{ _("Diminution de l'echelle.") },
-{ _("Reduit l'agrandissement") },
-{ _("Echelle a 100%.") },
-{ _("Remet l'echelle a 100%") },
-{ _("Augmentation de l'echelle.") },
-{ _("Augmente l'agrandissement") },
-{ _("Echelle compatible avec la taille de la fenetre.") },
-{ _("Adapte l'echelle a la taille de la fenetre") },
-{ _("Emplacement de sauvegarde des fichiers.") },
-{ _("Nom (sans extention) du fichier a sauvegarder.") },
-{ _("label") },
-{ _(" Pochette ") },
-{ _("Nice") },
-{ _(" Priorite systeme ") },
-{ _("Indiquez ici le dossier sur votre systeme qui servira de lieu\nde stockage provisoire pendant les differentes conversions.\n") },
-{ _(" Dossier provisoire des conversions ") },
-{ _("button") },
-{ _(" Jouer une musique en fin de tache ") },
-{ _(" General ") },
-{ _("cdparanoia") },
-{ _("cdda2wav / icedax") },
-{ _("cdparanoia mode expert") },
-{ _(" Extraction cd-audio avec: ") },
-{ _("HomePage") },
-{ _("ManPage ") },
-{ _(" Web cdparanoia ") },
-{ _("%a - artiste %b - titre de l'album %c - numero de la piste\n%d - titre de la chanson %e - annee %g - genre\n%na - no accent %Tl - Tetsumaki lower\n%u - remplacement de caracteres: %u(AB=C) %u( =_)") },
-{ _(" Dossier de stockage ") },
-{ _(" CD ") },
-{ _("ABR / CBR / VBR / VBR-NEW") },
-{ _("Debit") },
-{ _("Mode") },
-{ _(" Lame (fichier mp3): ") },
-{ _("Par defaut") },
-{ _(" Options LAME ") },
-{ _("Site officiel") },
-{ _("Wiki mp3 ") },
-{ _("Wiki ") },
-{ _("ManPage ") },
-{ _(" Web Lame ") },
-{ _("[") },
-{ _("string option interne") },
-{ _("]") },
-{ _(" Options experts, definies par l'utilisateur - lame (wav -> mp3) ") },
-{ _(" Mp3 ") },
-{ _(" Mode") },
-{ _(" Mode flux (streaming)") },
-{ _(" Debit") },
-{ _(" Oggenc (fichier ogg): ") },
-{ _("Par defaut") },
-{ _(" Options OGGENC ") },
-{ _("Wiki ") },
-{ _("ManPage") },
-{ _(" Web Oggenc ") },
-{ _("[") },
-{ _("string option interne") },
-{ _("]") },
-{ _(" Options experts, definies par l'utilisateur - oggenc (wav -> ogg) ") },
-{ _(" Oggenc ") },
-{ _("Taux de compression") },
-{ _(" Flac (fichier flac): ") },
-{ _("Par defaut") },
-{ _(" Options FLAC ") },
-{ _("Site officiel") },
-{ _("Framasoft ") },
-{ _("ManPage ") },
-{ _(" Web Flac ") },
-{ _("[") },
-{ _("string option interne") },
-{ _("]") },
-{ _(" Options experts, definies par l'utilisateur - flac (wav -> flac) ") },
-{ _(" Flac ") },
-{ _(" Qualite") },
-{ _(" Mac (fichier ape): ") },
-{ _("Par defaut") },
-{ _(" Options MAC ") },
-{ _("Wiki") },
-{ _(" Web Mac ") },
-{ _("[") },
-{ _("string option interne") },
-{ _("]") },
-{ _(" Options experts, definies par l'utilisateur - mac (wav -> ape) ") },
-{ _(" Mac ") },
-{ _("Compression") },
-{ _("Son") },
-{ _("Mode hybride") },
-{ _("Fichier de correction") },
-{ _("Compression maximum") },
-{ _("Signature MD5") },
-{ _("Extra encode processing") },
-{ _(" WavPack (fichier wv): ") },
-{ _("Par defaut") },
-{ _(" Options WAVPACK ") },
-{ _("Wiki ") },
-{ _("ManPage") },
-{ _(" Web Wavpack ") },
-{ _("[") },
-{ _("string option interne") },
-{ _("]") },
-{ _(" Options experts, definies par l'utilisateur - wavpack (wav -> wv) ") },
-{ _(" Wavpack ") },
-{ _(" MusePack (fichier mpc): ") },
-{ _("Par defaut") },
-{ _(" Options MUSEPACK ") },
-{ _("Site officiel") },
-{ _("Framasoft ") },
-{ _(" Web Musepack ") },
-{ _("[") },
-{ _("string option interne") },
-{ _("]") },
-{ _(" Options experts, definies par l'utilisateur - musepack (wav -> mpc) ") },
-{ _(" Musepack ") },
-{ _(" Qualite VBR / Debit ABR") },
-{ _(" VBR / ABR") },
-{ _(" Conteneur") },
-{ _(" Faac (fichier .m4a): ") },
-{ _("Par defaut") },
-{ _(" Options FAAC ") },
-{ _("Site officiel ") },
-{ _("Web Info ") },
-{ _("ManPage") },
-{ _(" Web Faac ") },
-{ _("[") },
-{ _("string option interne") },
-{ _("]") },
-{ _(" Options experts, definies par l'utilisateur - faac (wav -> m4a) ") },
-{ _(" Faac ") },
-{ _(" Stereo: Qualite en kbit/s") },
-{ _(" Mono: Qualite en kbit/s") },
-{ _(" AacplusEnc (fichier .aac): ") },
-{ _("Par defaut") },
-{ _(" Options AacPlusEnc ") },
-{ _("Site officiel ") },
-{ _("Web Info ") },
-{ _("ManPage") },
-{ _(" Web AacPlusEnc ") },
-{ _(" AacplusEnc ") },
-{ _("Artiste") },
-{ _("Titre") },
-{ _("Album") },
-{ _("Numero") },
-{ _("Genre") },
-{ _("Annee") },
-{ _("Commentaire") },
-{ _(" Exportation de ") },
-{ _(" Tags ") },
-{ _(" Preferences ") },
-{ _("SCAN") },
-{ _(" Installation ") },
-{ _(" Votre systeme utilise ... ") },
-{ _("\nPour installer les programmes externes requis,\nveuillez utiliser l'installateur de votre distribution Gnu/Linux.\n") },
-{ _("Le programme XCFA_INSTALL_ALL ecrit en Perl vous sera utile en ligne de commande pour une installation des programmes complementaire.") },
-{ _(" Informations ") },
-{ _(" Application externes ") },
-{ _("parametres:") },
-{ _("Navigateur") },
-{ _("parametres:") },
-{ _("Lecteurs audio") },
-{ _(" Navigateurs / Lecteurs audio ") },
-{ _(" Applications externes ") },
-{ _("Scan en cours ...") },
-{ _("Scan du support en cours ...") },
-{ _("Detail extraction mode expert") },
-{ _("Modification des champs") },
-{ _("\nModification des champs\n") },
-{ _("Titre") },
-{ _("Play") },
-{ _("Temps") },
-{ _("Format") },
-{ _("Choix") },
-{ _("Normalise") },
-{ _("Nom") },
-{ _(" Visibilite ") },
-{ _("Nom a gauche") },
-{ _("Nom au centre") },
-{ _("Nom a droite") },
-{ _("DVD") },
-{ _("Play") },
-{ _("Wav") },
-{ _("Flac") },
-{ _("Ape") },
-{ _("Wavpack") },
-{ _("Ogg") },
-{ _("M4a") },
-{ _("Aac") },
-{ _("Musepack") },
-{ _("Mp3") },
-{ _("Num") },
-{ _("Time") },
-{ _("Normalise") },
-{ _("Nom") },
-{ _(" Visibilite ") },
-{ _("Nom a gauche") },
-{ _("Nom au centre") },
-{ _("Nom a droite") },
-{ _("CD") },
-{ _("Play") },
-{ _("Trash") },
-{ _("Type") },
-{ _("Wav") },
-{ _("Flac") },
-{ _("Ape") },
-{ _("Wavpack") },
-{ _("Ogg") },
-{ _("M4a") },
-{ _("Aac") },
-{ _("Musepack") },
-{ _("Mp3") },
-{ _("Time") },
-{ _("Normalise") },
-{ _("Replaygain") },
-{ _("Nom") },
-{ _(" Visibilite ") },
-{ _("Nom a gauche") },
-{ _("Nom au centre") },
-{ _("Nom a droite") },
-{ _("CONVERSIONS") },
-{ _("Hertz") },
-{ _("New Hertz") },
-{ _("Voie") },
-{ _("New Voie") },
-{ _("Bits") },
-{ _("New Bits") },
-{ _("Nom") },
-{ _(" Visibilite ") },
-{ _("Nom a gauche") },
-{ _("Nom au centre") },
-{ _("Nom a droite") },
-{ _("WAV") },
-{ _("Type") },
-{ _("Bitrate") },
-{ _("New Bitrate") },
-{ _("Size") },
-{ _("Time") },
-{ _("Nom") },
-{ _(" Visibilite ") },
-{ _("Nom a gauche") },
-{ _("Nom au centre") },
-{ _("Nom a droite") },
-{ _("MP3-OGG") },
-{ _("Type") },
-{ _("Time") },
-{ _("Nom") },
-{ _(" Visibilite ") },
-{ _("Nom a gauche") },
-{ _("Nom au centre") },
-{ _("Nom a droite") },
-{ _("TAGS") },
-{ _("Selection globale") },
-{ _("Deselection globale") },
-{ _("Retour") },
-{ _("About X Convert File Audio") },
-{ _("Author") },
-{ _("Licence") },
-{ _(" Informations ") },
-{ _(" Machine ") },
-{ _("Ingenieurs du son\n") },
-{ _("\nGraphisme\n") },
-{ _("Traduction Anglaise\n\n\n") },
-{ _("\nTraduction Allemande") },
-{ _("\nCodeur Xcfa") },
-{ _("\nElementSpeak pour Xcfa ") },
-{ _("\nCodeur pages Web") },
-{ _("\nTraduction Italienne") },
-{ _("\n\nPages a visiter\n") },
-{ _("Linux On The Root") },
-{ _("Frugalware") },
-{ _("Road2Mayotte") },
-{ _("La Linuxerie") },
-{ _("Audioptimisation by Dzef") },
-{ _("Tuxfamily") },
-{ _("Framasoft") },
-{ _("Ekd (EnKoDeur-Mixeur)") },
-{ _("Bishop's page") },
-{ _("Je suis libre") },
-{ _("Debian Multimedia") },
-{ _("\nForum\n") },
-{ _("XCFA Vorstellung ") },
-{ _("XCFA LinuxForen.de") },
-{ _("Forum Xcfa") },
-{ _("\nDocumentation\n") },
-{ _("Wiki Xcfa par Shankarius") },
-{ _("Doc Xcfa par Patachon") },
-{ _("Ogg Vorbis explique par Shankarius") },
-{ _("La normalisation expliquee par Dzef") },
-{ _("Xcfa sur Linux On The Root") },
-{ _(" Contributions ") },
-{ _(" License ") },
-{ _("OK") }
-
-};
-
-
-	if (*trans [ 0 ] . string);
-}
-
-
-
-
-
-
-
-
-
-
-

xcfa-4.2.8.tar.gz/src/treeview.c Deleted

@@ -1,525 +0,0 @@
- /*
- * file : treeview.c
- * project : xcfa
- * with : Gtk-2
- *
- * copyright : (C) 2003 - 2012 by Claude Bulin
- *
- * xcfa - GTK+ implementation of the GNU shell command
- * GNU General Public License
- *
- * This file is part of XCFA.
- * 
- * XCFA is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * at your option) any later version.
- * 
- * XCFA is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with XCFA. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifdef HAVE_CONFIG_H
-	#include "../config.h"
-#endif
-
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-#include <string.h>
-#include <stdlib.h>
-
-#ifdef ENABLE_STATIC_LIBRARY
-	#include "../lib/lib.h"
-#endif
-
-#include "global.h"
-#include "dvd.h"
-#include "cd_audio.h"
-#include "file.h"
-#include "configuser.h"
-#include "treeview.h"
-
-
-
-
-
-
-#define MAX_DATAS_STRUCT_RADIOBUTTONS 6
-
-typedef struct {
-	gchar			 *NameLeft;
-	gchar			 *NameCenter;
-	gchar			 *NameRight;
-	GtkCellRenderer		**AdrRenderer;
-	GtkTreeViewColumn	**AdrTreeViewColumn;
-	gint			 Pos;
-} TAB_POSNAME;
-
-TAB_POSNAME TabPosName [ MAX_DATAS_STRUCT_RADIOBUTTONS ] = {
-	{"radiobutton_nameleft_dvd", "radiobutton_namecenter_dvd", "radiobutton_nameright_dvd",
-	&var_dvd.Renderer, &var_dvd.Adr_Column_Nom,
-	1},
-	{"radiobutton_nameleft_cd", "radiobutton_namecenter_cd", "radiobutton_nameright_cd",
-	&var_cd.Renderer, &var_cd.Adr_Column_Nom,
-	1},
-	{"radiobutton_nameleft_allfile", "radiobutton_namecenter_allfile", "radiobutton_nameright_allfile",
-	&var_file.Renderer, &var_file.Adr_ColumnFileName,
-	1},
-	{"radiobutton_nameleft_wav", "radiobutton_namecenter_wav", "radiobutton_nameright_wav",
-	&var_file_wav.Renderer, &var_file_wav.Adr_ColumnFileWavName,
-	1},
-	{"radiobutton_nameleft_mp3ogg", "radiobutton_namecenter_mp3ogg", "radiobutton_nameright_mp3ogg",
-	&var_file_mp3ogg.Renderer, &var_file_mp3ogg.Adr_ColumnFileMp3OggName,
-	1},
-	{"radiobutton_nameleft_tags", "radiobutton_namecenter_tags", "radiobutton_nameright_tags",
-	&var_file_tags.Renderer, &var_file_tags.Adr_ColumnFileTagsName,
-	1}
-	} ;
-
-
-
-
-#define POS_STRUCT_DVD			00
-#define POS_STRUCT_CD			07
-#define POS_STRUCT_CONVERSIONS		21
-#define POS_STRUCT_WAV			37
-#define POS_STRUCT_MP3OGG		44
-#define POS_STRUCT_TAGS			50
-#define MAX_DATAS_STRUCT_TREEVIEW	53
-
-typedef struct {
-
-	GtkWidget	*AdrWin;
-	gboolean	IsShow;
-	gboolean	BoolNoEnter;
-	gint		PageNotebook;
-
-} VAR_TREEVIEW;
-
-VAR_TREEVIEW VarTreeView = {
-	NULL,
-	FALSE,
-	TRUE,
-	0
-};
-
-typedef struct {
-	gchar			 *Name;
-	gboolean		 BoolIsVisible;
-	GtkTreeViewColumn	**AdrTreeViewColumn;
-} TAB_SHOWHIDE;
-
-TAB_SHOWHIDE TabShowHide [ MAX_DATAS_STRUCT_TREEVIEW ] = {
-// 	
-// 	Name					BoolIsVisible: DVD, CD, FILE, WAV, MP3OGG, TAGS
-// 						| AdrTreeViewColumn
-// 	 POS_STRUCT_DVD = 0 | | 
-	{"checkbutton_titre_dvd",		TRUE, &var_dvd.Adr_Column_Titres},
-	{"checkbutton_play_dvd",		TRUE, &var_dvd.Adr_Column_Play},
-	{"checkbutton_temps_dvd",		TRUE, &var_dvd.Adr_Column_Temps},
-	{"checkbutton_format_dvd",		TRUE, &var_dvd.Adr_Column_Format},
-	{"checkbutton_choix_dvd",		TRUE, &var_dvd.Adr_Column_Choix},
-	{"checkbutton_normalise_dvd",		TRUE, &var_dvd.Adr_Column_Normalise},
-	{"checkbutton_nom_dvd",			TRUE, &var_dvd.Adr_Column_Nom},
-	// POS_STRUCT_CD = 7
-	{"checkbutton_play_cd",			TRUE, &var_cd.Adr_Column_Play},
-	{"checkbutton_wav_cd",			TRUE, &var_cd.Adr_Column_Wav},
-	{"checkbutton_flac_cd",			TRUE, &var_cd.Adr_Column_Flac},
-	{"checkbutton_ape_cd",			TRUE, &var_cd.Adr_Column_Ape},
-	{"checkbutton_wavpack_cd",		TRUE, &var_cd.Adr_Column_Wavpack},
-	{"checkbutton_ogg_cd",			TRUE, &var_cd.Adr_Column_Ogg},
-	{"checkbutton_m4a_cd",			TRUE, &var_cd.Adr_Column_M4a},
-	{"checkbutton_aac_cd",			TRUE, &var_cd.Adr_Column_Aac},
-	{"checkbutton_musepack_cd",		TRUE, &var_cd.Adr_Column_Mpc},
-	{"checkbutton_mp3_cd",			TRUE, &var_cd.Adr_Column_Mp3},
-	{"checkbutton_num_cd",			TRUE, &var_cd.Adr_Column_Num},
-	{"checkbutton_time_cd",			TRUE, &var_cd.Adr_Column_Time},
-	{"checkbutton_normalise_cd",		TRUE, &var_cd.Adr_Column_Normalise},
-	{"checkbutton_nom_cd",			TRUE, &var_cd.Adr_Column_Nom},
-	// POS_STRUCT_CONVERSIONS = 21
-	{"checkbutton_play_allfile",		TRUE, &var_file.Adr_ColumnFilePlay},
-	{"checkbutton_trash_allfile",		TRUE, &var_file.Adr_ColumnFileTrash},
-	{"checkbutton_type_allfile",		TRUE, &var_file.Adr_ColumnFileType},
-	{"checkbutton_wav_allfile",		TRUE, &var_file.Adr_ColumnFileWav},
-	{"checkbutton_flac_allfile",		TRUE, &var_file.Adr_ColumnFileFlac},
-	{"checkbutton_ape_allfile",		TRUE, &var_file.Adr_ColumnFileApe},
-	{"checkbutton_wavpack_allfile",		TRUE, &var_file.Adr_ColumnFileWavPack},
-	{"checkbutton_ogg_allfile",		TRUE, &var_file.Adr_ColumnFileOgg},
-	{"checkbutton_m4a_allfile",		TRUE, &var_file.Adr_ColumnFileM4a},
-	{"checkbutton_aac_allfile",		TRUE, &var_file.Adr_ColumnFileAac},
-	{"checkbutton_musepack_allfile",	TRUE, &var_file.Adr_ColumnFileMpc},
-	{"checkbutton_mp3_allfile",		TRUE, &var_file.Adr_ColumnFileMp3},
-	{"checkbutton_time_allfile",		TRUE, &var_file.Adr_ColumnFileTime},
-	{"checkbutton_normalise_allfile",	TRUE, &var_file.Adr_ColumnFileNormalize},
-	{"checkbutton_replaygain_allfile",	TRUE, &var_file.Adr_ColumnFileReplayGain},
-	{"checkbutton_nom_allfile",		TRUE, &var_file.Adr_ColumnFileName},
-	// POS_STRUCT_WAV = 37
-	{"checkbutton_hertz_wav",		TRUE, &var_file_wav.Adr_ColumnFileWavHertz},
-	{"checkbutton_newhertz_wav",		TRUE, &var_file_wav.Adr_ColumnFileWavNewHertz},
-	{"checkbutton_voie_wav",		TRUE, &var_file_wav.Adr_ColumnFileWavVoie},
-	{"checkbutton_newvoie_wav",		TRUE, &var_file_wav.Adr_ColumnFileWavNewVoie},
-	{"checkbutton_bits_wav",		TRUE, &var_file_wav.Adr_ColumnFileWavBits},
-	{"checkbutton_newbits_wav",		TRUE, &var_file_wav.Adr_ColumnFileWavNewBits},
-	{"checkbutton_nom_wav",			TRUE, &var_file_wav.Adr_ColumnFileWavName},
-	// POS_STRUCT_MP3OGG = 44
-	{"checkbutton_type_mp3ogg",		TRUE, &var_file_mp3ogg.Adr_ColumnFileMp3OggType},
-	{"checkbutton_bitrate_mp3ogg",		TRUE, &var_file_mp3ogg.Adr_ColumnFileMp3OggBitrate},
-	{"checkbutton_nexbitrate_mp3ogg",	TRUE, &var_file_mp3ogg.Adr_ColumnFileMp3OggNewBitrate},
-	{"checkbutton_size_mp3ogg",		TRUE, &var_file_mp3ogg.Adr_ColumnFileMp3OggSize},
-	{"checkbutton_time_mp3ogg",		TRUE, &var_file_mp3ogg.Adr_ColumnFileMp3OggTime},
-	{"checkbutton_nom_mp3ogg",		TRUE, &var_file_mp3ogg.Adr_ColumnFileMp3OggName},
-	// POS_STRUCT_TAGS = 50
-	{"checkbutton_type_tags",		TRUE, &var_file_tags.Adr_ColumnFileTagsType},
-	{"checkbutton_time_tags",		TRUE, &var_file_tags.Adr_ColumnFileTagsTime},
-	{"checkbutton_nom_tags",		TRUE, &var_file_tags.Adr_ColumnFileTagsName}
-	};
-
-
-
-// SET ETAT FIELDS TO STRING-ETAT FOR SAVE CONFIG
-// 
-void treeview_get_etat_fields (void)
-{
-	gint cpt;
-	
-	VarTreeView.BoolNoEnter = TRUE;
-	
-	// Remove string
-	if (NULL != Config.StringBoolFieldsIsVisible) {
-		g_free (Config.StringBoolFieldsIsVisible);
-		Config.StringBoolFieldsIsVisible = NULL;
-	}
-	// Allocate string
-	Config.StringBoolFieldsIsVisible = g_strnfill (MAX_DATAS_STRUCT_TREEVIEW +4, '1');
-
-	// Set 1 (TRUE) is visible else set 0 (FALSE)
-	for (cpt = POS_STRUCT_DVD; cpt < MAX_DATAS_STRUCT_TREEVIEW; cpt ++) {
-		Config.StringBoolFieldsIsVisible [ cpt ] = (TabShowHide [ cpt ].BoolIsVisible == FALSE) ? '0' : '1';
-	}
-	Config.StringBoolFieldsIsVisible [ cpt ] = '\0';
-	
-	VarTreeView.BoolNoEnter = FALSE;
-}
-// CALL FROM MAIN.C
-// 
-void treeview_set_etat_fields (void)
-{
-	gint cpt;
-	
-	if (NULL == Config.StringBoolFieldsIsVisible) {
-		treeview_get_etat_fields ();
-	}
-	
-	VarTreeView.BoolNoEnter = TRUE;
-	
-	// Set 1 (TRUE) is visible else set 0 (FALSE)
-	for (cpt = POS_STRUCT_DVD; cpt < MAX_DATAS_STRUCT_TREEVIEW; cpt ++) {
-		TabShowHide [ cpt ].BoolIsVisible = (Config.StringBoolFieldsIsVisible [ cpt ] == '0') ? FALSE : TRUE;
-		// Place le CheckButton avec cet etat
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GLADE_GET_OBJECT(TabShowHide [ cpt ].Name)), TabShowHide [ cpt ].BoolIsVisible);
-		gtk_tree_view_column_set_visible (GTK_TREE_VIEW_COLUMN (*TabShowHide [ cpt ].AdrTreeViewColumn), TabShowHide [ cpt ].BoolIsVisible);
-	}
-	
-	VarTreeView.BoolNoEnter = FALSE;
-}
-// 
-// 
-gboolean on_wind_treeview_delete_event (GtkWidget *widget, GdkEvent *event, gpointer user_data)
-{
-	treeview_get_etat_fields ();
-	VarTreeView.IsShow = FALSE;
-	gtk_widget_hide (VarTreeView.AdrWin);
-	return TRUE;
-}
-// 
-// 
-gboolean on_wind_treeview_destroy_event (GtkWidget *widget, GdkEvent *event, gpointer user_data)
-{
-	treeview_get_etat_fields ();
-	VarTreeView.IsShow = FALSE;
-	gtk_widget_hide (VarTreeView.AdrWin);
-	return TRUE;
-}
-// 
-// 
-void on_button_quit_windtreeview_clicked (GtkButton *button, gpointer user_data)
-{
-	treeview_get_etat_fields ();
-	VarTreeView.IsShow = FALSE;
-	gtk_widget_hide (VarTreeView.AdrWin);
-}
-// 
-// 
-void treeview_SetGlobal (gboolean BoolVisible)
-{
-	gint	cpt;
-
-	VarTreeView.BoolNoEnter = TRUE;
-
-	switch(VarTreeView.PageNotebook) {
-	case 0 :
-		for (cpt = POS_STRUCT_DVD; cpt < POS_STRUCT_CD; cpt ++) {
-			TabShowHide [ cpt ].BoolIsVisible = BoolVisible;
-			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GLADE_GET_OBJECT(TabShowHide [ cpt ].Name)), TabShowHide [ cpt ].BoolIsVisible);
-			gtk_tree_view_column_set_visible (GTK_TREE_VIEW_COLUMN (*TabShowHide [ cpt ].AdrTreeViewColumn), TabShowHide [ cpt ].BoolIsVisible);
-		}
-		break;
-	case 1 :
-		for (cpt = POS_STRUCT_CD; cpt < POS_STRUCT_CONVERSIONS; cpt ++) {
-			TabShowHide [ cpt ].BoolIsVisible = BoolVisible;
-			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GLADE_GET_OBJECT(TabShowHide [ cpt ].Name)), TabShowHide [ cpt ].BoolIsVisible);
-			gtk_tree_view_column_set_visible (GTK_TREE_VIEW_COLUMN (*TabShowHide [ cpt ].AdrTreeViewColumn), TabShowHide [ cpt ].BoolIsVisible);
-		}
-		break;
-	case 2 :
-		for (cpt = POS_STRUCT_CONVERSIONS; cpt < POS_STRUCT_WAV; cpt ++) {
-			TabShowHide [ cpt ].BoolIsVisible = BoolVisible;
-			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GLADE_GET_OBJECT(TabShowHide [ cpt ].Name)), TabShowHide [ cpt ].BoolIsVisible);
-			gtk_tree_view_column_set_visible (GTK_TREE_VIEW_COLUMN (*TabShowHide [ cpt ].AdrTreeViewColumn), TabShowHide [ cpt ].BoolIsVisible);
-		}
-		break;
-	case 3 :
-		for (cpt = POS_STRUCT_WAV; cpt < POS_STRUCT_MP3OGG; cpt ++) {
-			TabShowHide [ cpt ].BoolIsVisible = BoolVisible;
-			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GLADE_GET_OBJECT(TabShowHide [ cpt ].Name)), TabShowHide [ cpt ].BoolIsVisible);
-			gtk_tree_view_column_set_visible (GTK_TREE_VIEW_COLUMN (*TabShowHide [ cpt ].AdrTreeViewColumn), TabShowHide [ cpt ].BoolIsVisible);
-		}
-		break;
-	case 4 :
-		for (cpt = POS_STRUCT_MP3OGG; cpt < MAX_DATAS_STRUCT_TREEVIEW; cpt ++) {
-			TabShowHide [ cpt ].BoolIsVisible = BoolVisible;
-			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GLADE_GET_OBJECT(TabShowHide [ cpt ].Name)), TabShowHide [ cpt ].BoolIsVisible);
-			gtk_tree_view_column_set_visible (GTK_TREE_VIEW_COLUMN (*TabShowHide [ cpt ].AdrTreeViewColumn), TabShowHide [ cpt ].BoolIsVisible);
-		}
-		break;
-	case 5 :
-		for (cpt = POS_STRUCT_TAGS; cpt < MAX_DATAS_STRUCT_TREEVIEW; cpt ++) {
-			TabShowHide [ cpt ].BoolIsVisible = BoolVisible;
-			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GLADE_GET_OBJECT(TabShowHide [ cpt ].Name)), TabShowHide [ cpt ].BoolIsVisible);
-			gtk_tree_view_column_set_visible (GTK_TREE_VIEW_COLUMN (*TabShowHide [ cpt ].AdrTreeViewColumn), TabShowHide [ cpt ].BoolIsVisible);
-		}
-		break;
-	}
-	treeview_get_etat_fields ();
-	VarTreeView.BoolNoEnter = FALSE;
-}
-// 
-// 
-void on_button_deselect_global_windtreeview_clicked (GtkButton *button, gpointer user_data)
-{
-	treeview_SetGlobal (FALSE);
-}
-// 
-// 
-void on_button_select_global_windtreeview_clicked (GtkButton *button, gpointer user_data)
-{
-	treeview_SetGlobal (TRUE);
-}
-// 
-// 
-void treeview_set_pos_fields_name (void)
-{
-	if (NULL != Config.StringPosFieldsName && *Config.StringPosFieldsName == '\0') {	
-		g_free (Config.StringPosFieldsName);	Config.StringPosFieldsName = NULL;
-	}
-	
-	if (NULL == Config.StringPosFieldsName) {
-		// Allocate string with datas
-		Config.StringPosFieldsName = g_strnfill (MAX_DATAS_STRUCT_RADIOBUTTONS +4, '1');
-	}
-}
-// 
-// 
-void on_radiobutton_modif_treeview_clicked (GtkButton *button, gpointer user_data)
-{
-	gint cpt;
-
-	if (TRUE == VarTreeView.BoolNoEnter) return;
-	
-	treeview_set_pos_fields_name ();
-	
-	for (cpt = POS_STRUCT_DVD; cpt < MAX_DATAS_STRUCT_RADIOBUTTONS; cpt ++) {
-		if (GTK_BUTTON (button) == GTK_BUTTON (GTK_WIDGET (GLADE_GET_OBJECT(TabPosName [ cpt ].NameLeft)))) {
-			Config.StringPosFieldsName [ cpt ] = '0';
-			TabPosName [ cpt ].Pos = 0;
-			gtk_tree_view_column_set_alignment (GTK_TREE_VIEW_COLUMN (*TabPosName [ cpt ].AdrTreeViewColumn), 0.0);
-			g_object_set (*TabPosName [ cpt ].AdrRenderer, "xalign", 0.0, NULL);
-			break;
-		}
-		if (GTK_BUTTON (button) == GTK_BUTTON (GTK_WIDGET (GLADE_GET_OBJECT(TabPosName [ cpt ].NameCenter)))) {
-			Config.StringPosFieldsName [ cpt ] = '1';
-			TabPosName [ cpt ].Pos = 1;
-			gtk_tree_view_column_set_alignment (GTK_TREE_VIEW_COLUMN (*TabPosName [ cpt ].AdrTreeViewColumn), 0.5);
-			g_object_set (*TabPosName [ cpt ].AdrRenderer, "xalign", 0.5, NULL);
-			break;
-		}
-		if (GTK_BUTTON (button) == GTK_BUTTON (GTK_WIDGET (GLADE_GET_OBJECT(TabPosName [ cpt ].NameRight)))) {
-			Config.StringPosFieldsName [ cpt ] = '2';
-			TabPosName [ cpt ].Pos = 2;
-			gtk_tree_view_column_set_alignment (GTK_TREE_VIEW_COLUMN (*TabPosName [ cpt ].AdrTreeViewColumn), 1.0);
-			g_object_set (*TabPosName [ cpt ].AdrRenderer, "xalign", 1.0, NULL);
-			break;
-		}
-	}
-}
-// 
-// 
-void treeview_radiobutton_set_PosFieldsName (void)
-{
-	gint cpt;
-
-	treeview_set_pos_fields_name ();
-	
-	VarTreeView.BoolNoEnter = TRUE;
-	
-	for (cpt = POS_STRUCT_DVD; cpt < MAX_DATAS_STRUCT_RADIOBUTTONS; cpt ++) {
-		if (Config.StringPosFieldsName [ cpt ] == '0') {
-			TabPosName [ cpt ].Pos = 0;
-			gtk_tree_view_column_set_alignment (GTK_TREE_VIEW_COLUMN (*TabPosName [ cpt ].AdrTreeViewColumn), 0.0);
-			g_object_set (*TabPosName [ cpt ].AdrRenderer, "xalign", 0.0, NULL);
-			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GLADE_GET_OBJECT(TabPosName [ cpt ].NameLeft)), TRUE);
-		}
-		else if (Config.StringPosFieldsName [ cpt ] == '1') {
-			TabPosName [ cpt ].Pos = 1;
-			gtk_tree_view_column_set_alignment (GTK_TREE_VIEW_COLUMN (*TabPosName [ cpt ].AdrTreeViewColumn), 0.5);
-			g_object_set (*TabPosName [ cpt ].AdrRenderer, "xalign", 0.5, NULL);
-			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GLADE_GET_OBJECT(TabPosName [ cpt ].NameCenter)), TRUE);
-		}
-		else if (Config.StringPosFieldsName [ cpt ] == '2') {
-			TabPosName [ cpt ].Pos = 2;
-			gtk_tree_view_column_set_alignment (GTK_TREE_VIEW_COLUMN (*TabPosName [ cpt ].AdrTreeViewColumn), 1.0);
-			g_object_set (*TabPosName [ cpt ].AdrRenderer, "xalign", 1.0, NULL);
-			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GLADE_GET_OBJECT(TabPosName [ cpt ].NameRight)), TRUE);
-		}
-	}
-	VarTreeView.BoolNoEnter = FALSE;
-}
-// ACTIVE OU DESACTIVE LA VISIBILITE DU CHAMPS SUITE A CLICK BUTTON
-// 
-void on_checkbutton_modif_treeview_clicked (GtkButton *button, gpointer user_data)
-{
-	gint cpt;
-	
-	if (TRUE == VarTreeView.BoolNoEnter) return;
-	
-	for (cpt = POS_STRUCT_DVD; cpt < MAX_DATAS_STRUCT_TREEVIEW; cpt ++) {
-		if (GTK_BUTTON (button) == GTK_BUTTON (GLADE_GET_OBJECT(TabShowHide [ cpt ].Name))) {
-			// g_print("cpt = %d\n", cpt);
-			TabShowHide [ cpt ].BoolIsVisible = (TabShowHide [ cpt ].BoolIsVisible == TRUE) ? FALSE : TRUE;
-			// Show / Hide la colonne du TreeView
-			gtk_tree_view_column_set_visible (GTK_TREE_VIEW_COLUMN (*TabShowHide [ cpt ].AdrTreeViewColumn), TabShowHide [ cpt ].BoolIsVisible);
-			// sortie
-			break;
-		}
-	}
-}
-// 
-// 
-void on_notebook_windtreeview_switch_page (GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, gpointer user_data)
-{
-	VarTreeView.PageNotebook = page_num;
-
-	switch(VarTreeView.PageNotebook) {
-	case 0 :
-		gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_general")), NOTEBOOK_DVD_AUDIO);
-		break;
-	case 1 :
-		gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_general")), NOTEBOOK_CD_AUDIO);
-		break;
-	case 2 :
-		gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_general")), NOTEBOOK_FICHIERS);
-			gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_in_file")), NOTEBOOK_FICHIERS_CONVERSION);
-		break;
-	case 3 :
-		gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_general")), NOTEBOOK_FICHIERS);
-			gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_in_file")), NOTEBOOK_FICHIERS_WAV);
-		break;
-	case 4 :
-		gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_general")), NOTEBOOK_FICHIERS);
-			gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_in_file")), NOTEBOOK_FICHIERS_MP3OGG);
-		break;
-	case 5 :
-		gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_general")), NOTEBOOK_FICHIERS);
-			gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_in_file")), NOTEBOOK_FICHIERS_TAGS);
-		
-		break;
-	}
-}
-// 
-// 
-void treeview_open_window (void)
-{
-	if (TRUE == VarTreeView.IsShow) {
-		gdk_window_raise (VarTreeView.AdrWin->window);
-	}
-	else {	
-		if (NULL == VarTreeView.AdrWin) {
-			VarTreeView.AdrWin = GTK_WIDGET (GLADE_GET_OBJECT("wind_treeview"));
-			gtk_builder_connect_signals (GtkXcfaProjet, NULL);
-		}
-		gtk_window_set_transient_for (GTK_WINDOW(VarTreeView.AdrWin), GTK_WINDOW(WindMain));
-		gtk_window_set_modal (GTK_WINDOW (VarTreeView.AdrWin), TRUE);
-		libutils_set_default_icone_to_win (VarTreeView.AdrWin);
-
-		gtk_widget_show (VarTreeView.AdrWin);
-	}
-	VarTreeView.IsShow = TRUE;
-	gtk_window_set_title (GTK_WINDOW (VarTreeView.AdrWin), "Modification des champs");
-
-	treeview_set_etat_fields ();
-		
-	switch (Config.NotebookGeneral) {
-	case NOTEBOOK_DVD_AUDIO :
-		gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_windtreeview")), 0);
-		break;
-	case NOTEBOOK_CD_AUDIO :
-		gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_windtreeview")), 1);
-		break;
-	case NOTEBOOK_FICHIERS :
-		switch (Config.NotebookFile) {
-		case NOTEBOOK_FICHIERS_CONVERSION :
-			gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_windtreeview")), 2);
-			break;
-		case NOTEBOOK_FICHIERS_WAV :
-			gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_windtreeview")), 3);
-			break;
-		case NOTEBOOK_FICHIERS_MP3OGG :	
-			gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_windtreeview")), 4);
-			break;
-		case NOTEBOOK_FICHIERS_TAGS :
-			gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_windtreeview")), 5);
-			break;
-		}
-		break;
-	default :
-		gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_general")), NOTEBOOK_DVD_AUDIO);
-	}
-}
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-

xcfa-4.2.8.tar.gz/src/treeview.h Deleted

@@ -1,38 +0,0 @@
- /*
- * file : treeview.h
- * project : xcfa
- * with : Gtk-2
- *
- * copyright : (C) 2003 - 2012 by Claude Bulin
- *
- * xcfa - GTK+ implementation of the GNU shell command
- * GNU General Public License
- *
- * This file is part of XCFA.
- * 
- * XCFA is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * at your option) any later version.
- * 
- * XCFA is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with XCFA. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef treeview_h
-#define treeview_h 1
-
-
-void		treeview_open_window (void);
-void		treeview_set_etat_fields (void);
-void		treeview_radiobutton_set_PosFieldsName (void);
-
-
-#endif
-

xcfa-4.2.8.tar.gz/AUTHORS -> xcfa-5.0.2.tar.gz/AUTHORS Changed

xcfa-4.2.8.tar.gz/ChangeLog -> xcfa-5.0.2.tar.gz/ChangeLog Changed

@@ -1,4 +1,11 @@
 
+ __ __ ___ _ ___ _ _ _ _ _
+ \ \/ / / __|___ _ ___ _____ _ _| |_ | __(_) |___ /_\ _ _ __| (_)___
+ > < | (__/ _ \ ' \ V / -_) '_| _| | _|| | / -_) / _ \ || / _` | / _ \
+ /_/\_\ \___\___/_||_\_/\___|_| \__| |_| |_|_\___| /_/ \_\_,_\__,_|_\___/
+
+
+
 	========================================
 	 | |
 	 | Changelog |
@@ -6,4 +13,537 @@
 	========================================
 
 
-	Read TODO file.
+	========================================
+	 | 5.0.2 |
+	========================================
+	- Correction sox options
+	- Remove bacon module
+	- Correction [ Debian Bug report logs - # 784937 ]
+		o https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=784937
+	
+	========================================
+	 | 5.0.1 |
+	========================================
+	- re-encoding unit [ poche_web.c ] function [ void pocheweb_analyze_file_html( void ) ]
+		o Image search option on the Web
+	- re-encoding unit dvd*
+	- Correction [ Debian Bug report logs - # 756600 ]
+		o https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=756600
+		
+	========================================
+	 | 5.0.0 |
+	========================================
+	- Recoding xcfa with gtk-3
+	- Xcfa exist in command line under the name: XCFA_CLI
+	
+	========================================
+	 | 4.3.8 |
+	 | 4.3.8~beta0 .. 4.3.8~beta2 |
+	========================================
+	- At the request of Isaak Babaev
+		o A wav file from mp3 to wav must be 16 bits
+			- The problem was encountered in Ununtu with mplayer2 !
+			- The tests are done under Debian and Manjaro.
+	- Deposit of XCFA: 4.3.8~beta0
+	- Plusieurs instances de XCFA peuvent être activées sans risque de collision pour les conversions et extractions
+	- Deposit of XCFA: 4.3.8~beta1
+
+	========================================
+	 | 4.3.7 |
+	 | 4.3.7~beta0 |
+	========================================
+	- Prise en compte des fichiers:
+		o ISO Media, MPEG v4 system, iTunes AAC-LC
+
+	========================================
+	 | 4.3.6 |
+	 | 4.3.6~beta0 |
+	========================================
+	- Corrections signalees par Christian Marillat:
+		o configure.ac
+			- LDFLAGS="-lm$LDFLAGS"
+			+ LDFLAGS="-lm $LDFLAGS"
+		o mime/Makefile.am
+			- mimedir = $(libdir)/mime/packages
+			+ mimedir = $(prefix)/lib/mime/packages
+	- Deposit of XCFA: 4.3.6~beta0
+	- Deposit of XCFA: 4.3.6
+
+	========================================
+	 | 4.3.5 |
+	 | 4.3.5~beta0 .. 4.3.5~beta3 |
+	========================================
+	- Recodage de file_conv.c
+	- Finalisation de l'import des fichiers BWF
+	- Debug import drag-and-drop
+	- Deposit of XCFA: 4.3.5~beta2
+	- Deposit of XCFA: 4.3.5~beta3
+	- Deposit of XCFA: 4.3.5
+
+	========================================
+	 | 4.3.4 |
+	 | 4.3.4~beta0 .. 4.3.4~beta4 |
+	========================================
+	- Demande de Christian Marillat
+		o Gestion de Broadcast Wave Format
+		 http://fr.wikipedia.org/wiki/Broadcast_Wave_Format
+		 Les fichiers BWF sont des fichiers wave. Il n'est pas necessaire de les convertir.
+		 Ce qui rend un BWF special est tout simplement l'ajout de meta-informations dans le fichier.
+		 Recherche des tags [ 'bext' | 'qlty' | 'levl' | 'link' | 'axml' ]
+		 Les tags [ 'fmt ' ] et [ 'data' ] devront etre presents pour valider l'importation du fichier wav
+	- Deposit of XCFA: 4.3.4~beta0
+	- Deposit of XCFA: 4.3.4~beta1
+	- Deposit of XCFA: 4.3.4~beta2
+	- Deposit of XCFA: 4.3.4
+
+	========================================
+	 | 4.3.3 |
+	 | 4.3.3~beta0 .. 4.3.3~beta4 |
+	========================================
+	- [ External Applications -> Browsers ]
+		o Prise en compte du parametre pour le navigateur
+		o Taking into account the parameter for the browser
+	- SOLVED Bug in function: SplitCue_read_cue_file( ... )
+	- RENAME: configure.in -> configure.ac
+	- RENAME: in configure.ac
+		AM_CONFIG_HEADER([config.h]) -> AC_CONFIG_HEADERS([config.h])
+	- RENAME: in src/makefile.am and lib/makefile.am
+		INCLUDES -> AM_CPPFLAGS
+	- Deposit of XCFA: 4.3.3~beta1
+	- REPLACE: gtk_set_locale() has been deprecated : use setlocale( LC_ALL, "" )
+	- SOLVED Replacement correct de la ligne en selection lors d'une suppression dans le GtkTree
+	- Deposit of XCFA: 4.3.3~beta2
+	- Deposit of XCFA: 4.3.3~beta3
+	- Deposit of XCFA: 4.3.3~beta4
+	- Deposit of XCFA: 4.3.3
+
+	========================================
+	 | 4.3.2 |
+	 | 4.3.2~beta0 .. 4.3.2~beta3 |
+	========================================
+	- TODO: CAIRO library integration for the tab Split
+		o See: http://www.xcfa.tuxfamily.org/index.php?article8/coder-avec-cairo
+	- Systray management was removed
+	- Italian translation by Vincenzo Romano
+	- SOLVED Bug de maximisation sous Unity signalé par @Gounlaf
+	- [ Fichiers -> Mp3-Ogg ]: Application complete depuis une action popup sur une selection multiple
+	- Deposit of XCFA: 4.3.2~beta1
+	- Colorized field names GtkTree
+	- [ Fichiers -> Wav ]: Application complete depuis une action popup sur une selection multiple
+	- Deposit of XCFA: 4.3.2~beta2
+	- Correction URL
+	- Modification fichier glade + code associe
+	- Deposit of XCFA: 4.3.2~beta3
+	- Deposit of XCFA: 4.3.2
+
+	========================================
+	 | 4.3.1 |
+	 | 4.3.1~beta0 .. 4.3.1~beta2 |
+	========================================
+	- SOLVED Bug#673641: xcfa: Wrong file directory
+		o http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673641
+		o Complement coding
+	- SOLVED Bug#673640: xcfa: XCFA crashes when the CD is ejected
+		o http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673640
+		o The eject buttons CD / DVD are not accessible if no drives are found
+		o New option command line: -systray
+		o The tests are ok under sawfish window manager
+	- Deposit of XCFA: 4.3.1~beta0
+	- SOLVED Bug in ArchLinux with the operation of link with error:
+		o https://aur.archlinux.org/packages.php?ID=15386
+		o 'roundf@@GLIBC_2.2.5' is defined in DSO /lib/libm.so.6 so try adding it to the linker command line
+		o File modification [ src/Makefile.am ] in xcfa-4.3.1~beta1
+		o Confirmed by 'Skunnyk', the build of XCFA under ArchLinux is ok
+	- Deposit of XCFA: 4.3.1~beta2
+	- Deposit of XCFA: 4.3.1
+
+	========================================
+	 | 4.3.0 |
+	 | 4.3.0~beta0 .. 4.3.0~beta1 |
+	========================================
+	- Deposit of XCFA: 4.3.0~beta0
+	- Deposit of XCFA: 4.3.0
+
+	========================================
+	 | 4.2.9 |
+	 | 4.2.9~beta0 .. 4.2.9~beta9 |
+	========================================
+	- Cleaning code with unused variables
+	- Use: IO Channels
+	- Validation of the variable 'StartupNotify' File 'xcfa.desktop' with value FALSE
+	- Deposit of XCFA: 4.2.9~beta1
+	- Gestion d'erreurs produites par mplayer et/ou sox:
+		o mplayer: Symbol `ff_codec_bmp_tags' has different size in shared object, consider re-linking
+		o Cette erreur signifie que les versions de librairies de mplayer et/ou sox sont inadéquates :/
+	- Correction d'un bug de réaffichage depuis: file_mp3ogg.c
+	- Modification onglet Fichiers->Mp3-Ogg :
+ 		o L'accès aux différentes sélections fonctionne via un menu popup.
+	- Possibilité de generation d'un rapport pour une extraction en mode expert avec cdparanoia
+	- Deposit of XCFA: 4.2.9~beta3
+	- Deposit of XCFA: 4.2.9~beta4
+	- Deposit of XCFA: 4.2.9~beta5
+	- Deposit of XCFA: 4.2.9~beta6
+	- Merci a @TICROB pour:
+		o Recuperation complete d"une ligne TTITLE partagee sur plusieures lignes
+		o Suppression du caractere '/' pour le fichier CUE
+	- Deposit of XCFA: 4.2.9~beta7
+	- Un CD qui possede des piste DATA/BONUS pose un probleme a cdparanoia !
+		o Extraction avec cdparanoia mode expert et une seule passe prend du temps mais est fiable
+	- Deposit of XCFA: 4.2.9~beta8
+	- Nouveaux modes pour l'extraction des cd-audio:
+		o cdparanoia: mode normal
+		o cdparanoia: mode expert
+		o cdparanoia: mode expert multi passes
+		o cdda2wav / icedax
+	- Deposit of XCFA: 4.2.9~beta9
+
+	========================================
+	 | 4.2.8 |
+	 | 4.2.8~beta0 .. 4.2.8~beta4 |
+	========================================
+	- xcfa: Please Recommend ghostscript instead of gs-common
+ 		o Supression de gs-common de la ligne Recommends : de mes paquets tandis que Alessio Treglia a déjà
+ 		 contourné le problème différemment chez Debian:
+			o http://anonscm.debian.org/gitweb/?p=pkg-multimedia/xcfa.git;a=commitdiff;h=9d980a02
+			o http://anonscm.debian.org/gitweb/?p=pkg-multimedia/xcfa.git;a=commitdiff;h=679cc525
+ 		Vraiment très fort chez Debian : Thank you to the Team ;-)
+	- At the request of Giannis Servetas, Removal of WAVSPLIT who is not any more maintained.
+		o http://packages.qa.debian.org/w/wavsplit.html
+		o http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=489456
+	 The WavSplit operation is now encoded from XCFA.
+	- Deposit of XCFA: 4.2.8~beta1
+	- Deposit of XCFA: 4.2.8~beta2
+	- Removing the slash character from a title on a CD.
+	- Deposit of XCFA: 4.2.8~beta3
+	- Deposit of XCFA: 4.2.8~beta4
+	- Deposit of XCFA: 4.2.8
+
+	========================================
+	 | 4.2.7 |
+	 | 4.2.7~beta0 .. 4.2.7~beta3 |
+	========================================
+	- Intégration des spécifications Freedesktop.
+		o http://doc.ubuntu-fr.org/variables_d_environnement
+		o http://packages.debian.org/fr/lenny/xdg-user-dirs
+		o http://fr.wikipedia.org/wiki/Freedesktop.org
+		o http://www.planet-libre.org/index.php?post_id=3340
+		o http://www.ziki.com/en/linuxerie+128366/post/xdg-base-directory-specification-french-traduction-francaise+11044640
+		o http://linuxerie.midiblogs.com/tag/freedesktop
+	- Update for bitrate parameter from APE to MP3
+	- Deposit of XCFA: 4.2.7~beta1
+	- Après une discussion avec Jérôme, re-codage du parsing pour prise
+	 en compte des différentes fonctions disponibles depuis
+		o CD->Arrangement des titres du CD
+		o Préférences->CD->Dossier de stockage
+	- Deposit of XCFA: 4.2.7~beta2
+	- Deposit of XCFA: 4.2.7~beta3
+	- Deposit of XCFA: 4.2.7
+
+	========================================
+	 | 4.2.6 |
+	 | 4.2.6~beta0 |
+	========================================
+	- Update algorithm for recovering image files on the Net
+	- Deposit of XCFA: 4.2.6~beta0
+	- Deposit of XCFA: 4.2.6
+
+	========================================
+	 | 4.2.5 |
+	 | 4.2.5~beta0 .. 4.2.5~beta3 |
+	========================================
+	- Update cue file with PERFORMER
+	- @Jerome:
+		o Test libcurl + cd-discid: ok
+		o "Preferences" -> onglet "CD" -> "Dossier de stockage"
+		 Les caracteres espace ne sont plus remplaces par un underline
+		 Les caracteres accentues sont acceptes
+		o Onglet "CD" -> "Album"
+		 le champ "Album" ne concatene plus "Artist + Album" mais uniquement "Album"
+		o Onglet "CD" -> "Modification des tags Freedb" -> "Commentaires"
+		 Conserver le champ "Commentaire" d'une fois sur l'autre (meme vide)
+		o Onglet "CD" -> "Modification des tags Freedb" -> "Genre"
+		 Saisie possible d'une categorie
+		 Completion de la saisie clavier
+		o Onglet "CD" -> "DiscId"
+		 Disponible uniquement si plusieurs choix
+		o Ajouts d'options en ligne de commande:
+			 o -Version : active le mode 'bavard' pour ne pas surcharger $HOME/.xsession-errors
+			 o -Verbose : affiche le numero de version et quitte xcfa
+	- Deposit of XCFA: 4.2.5~beta0
+	- Deposit of XCFA: 4.2.5~beta1
+	- Deposit of XCFA: 4.2.5~beta2
+	- Deposit of XCFA: 4.2.5
+	- Deposit of XCFA: 4.2.5~beta3
+
+	========================================
+	 | 4.2.4 |
+	 | 4.2.4~beta0 .. 4.2.4~beta1 |
+	========================================
+	- Probleme resolu sous frugalware avec le lieu de stockage de vte.h
+		o Success of compilate by @Devil505: xcfa-4.2.4~beta0
+	- Deposit of XCFA: 4.2.4~beta1
+	- Deposit of XCFA: 4.2.4
+
+	========================================
+	 | 4.2.3 |
+	 | 4.2.3~beta0 .. 4.2.3~beta2 |
+	========================================
+	- Correctif Gestion Proxy:
+		o Suppression des librairies LibCDIO et LibCDDB
+		o Utilisation de LibCURL et de cd-discid
+		o Tests by @Gounlaf
+	- Deposit of XCFA: 4.2.3~beta0
+	- Correctif module cd_curl.c
+	- Deposit of XCFA: 4.2.3~beta1
+	- Update es.po
+	- Add VTE terminal for expert extraction
+	- Deposit of XCFA: 4.2.3~beta2
+	- Deposit of XCFA: 4.2.3
+
+	========================================
+	 | 4.2.2 |
+	 | 4.2.2~beta0 .. 4.2.2~beta11 |
+	========================================
+	- Alexandre Fromion: Intégration de l'extraction de la partie musicale de fichiers VIDEO M4A
+	- Correction avancement barre de progression
+	- Deposit of XCFA: 4.2.2~beta1
+	- @Gounlaf: Plantage suite à connexion à travers un proxy
+		o Codage pour une connexion via un proxy
+	- Deposit of XCFA: 4.2.2~beta2
+	- Codage reaffichage du spectre en mode play : gain de temps pour le CPU
+	- Modification codage Gestion Proxy. Tests by @Gounlaf
+	- Deposit of XCFA: 4.2.2~beta3
+	- Deposit of XCFA: 4.2.2~beta4
+	- Modification codage affichage du spectre en mode play : gain de temps pour le CPU
+	- Deposit of XCFA: 4.2.2~beta5
+	- Modification codage Gestion Proxy. Tests by @Gounlaf
+	- Deposit of XCFA: 4.2.2~beta6
+	- Correctif Gestion Proxy
+	- Deposit of XCFA: 4.2.2~beta7
+	- Correctif Gestion Proxy. Tests by @Gounlaf
+	- Correctif rafraichissement curseur lecture du spectre
+	- Deposit of XCFA: 4.2.2~beta8
+	- Ajout dans onglet CD du choix parmis les differentes bases de donnees pour le CD.
+	- Deposit of XCFA: 4.2.2~beta9
+	- Correctif module cddb.c
+	- Deposit of XCFA: 4.2.2~beta11
+
+	========================================
+	 | 4.2.1 |
+	 | 4.2.1~beta0 .. 4.2.1~beta1 |
+	========================================
+	- Nettoyage structures fichiers H et C
+	- @LeDub: Depuis "CD->Gestion des tags...": Resolution d'une insertion d'une eperluette ( & )
+	- Correction eperluette ( & ) File->modification_nom_fichier
+	- Deposit of XCFA: 4.2.1~beta0
+	- recodage de configuser.c
+	- Deposit of XCFA: 4.2.1~beta1
+	- Deposit of XCFA: 4.2.1
+
+	========================================
+	 | 4.2.0 |
+	 | 4.2.0~beta0 .. 4.2.0~beta5 |
+	========================================
+	- CAIRO library integration for the tab Pocket
+		o See: http://www.xcfa.tuxfamily.org/index.php?article8/coder-avec-cairo
+	- Deposit of XCFA: 4.2.0~beta1
+	- Roland: Intégration d'une possibilité de jouer une musique en fin de tâche
+	- Deposit of XCFA: 4.2.0~beta2
+	- correctif pour l'internationalisation
+	- Deposit of XCFA: 4.2.0~beta3
+	- la reconnaissance des entetes de fichiers ne fait (presque) plus appel a la commande 'file'
+		qui est capricieuse suivant les distributions Gnu/Linux :/
+	- Deposit of XCFA: 4.2.0~beta4
+	- correctif ReplayGain et extraction-cd
+	- Deposit of XCFA: 4.2.0~beta5
+	- Deposit of XCFA: 4.2.0
+
+	========================================
+	 | 4.1.0 |
+	 | 4.1.0~beta0 |
+	========================================
+	- rewrite of the module popup_systray.c
+	- @gounlaf: Restitution correcte du parametre de debit des preferences pour le format mp3
+	- Fixed Drag & Drop from the File tab to export files
+	- @soupaloignon: modification de 'License' en 'Licence' dans fr.po
+	- Deposit of XCFA: 4.1.0~beta0
+	- Deposit of XCFA: 4.1.0
+
+	========================================
+	 | 4.0.9 |
+	 | 4.0.9~beta0 |
+	========================================
+	- Modification sur le test de presence de [ icedax et/ou cdda2wav ] pour les distribution n'incluant pas icedax
+	- Deposit of XCFA: 4.0.9 et 4.0.9~beta0
+
+	========================================
+	 | 4.0.8 |
+	 | 4.0.8~beta0 .. 4.0.8~beta1 |
+	========================================
+	- In split: Added refresh after a zoom with [ Crtl + Scroll ]
+	- Deposit of XCFA: 4.0.8~beta0
+	- Deposit of XCFA: 4.0.8 et 4.0.8~beta1
+
+	========================================
+	 | 4.0.7 |
+	 | 4.0.7~beta0 .. 4.0.7~beta4 |
+	========================================
+	- Complete rewrite of the module split: synchronization scroll and display
+	- Codage messages de la StatusBar
+	- Debug combobox choix dvd
+	- Deposit of XCFA: 4.0.7~beta2
+	- Correction utf8 module file.c
+	- Deposit of XCFA: 4.0.7~beta3
+	- Ajout importation du format WMA dans l'onglet Split
+	- Deposit of XCFA: 4.0.7 et 4.0.7~beta4
+
+	========================================
+	 | 4.0.6 |
+	 | 4.0.6~beta0 .. 4.0.6~beta1 |
+	========================================
+	- Fabrice: Récupération correcte des information du CD lors d'une non connexion ou si aucune base n'existe.
+	- Brett Cornwall
+		o Reecriture du manpage
+	- [ Hurd ] Problème avec ESTRPIPE qui n'existe pas sous hurd !
+		o solved with code [ #ifdef ESTRPIPE ]
+	- Deposit of XCFA
+
+	========================================
+	 | 4.0.5 |
+	 | 4.0.5~beta0 .. 4.0.5~beta3 |
+	========================================
+	- Creation des fichiers de traduction en_GB.po et nl.po
+	- Acces correct à la lecture d'un fichier contenant une structure de type dvd
+	- BUG: Debian Bug report logs - #618972 [ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=618972 ]
+		o kfreebsd: module [ cd_cddb.c ]
+			o Abandon de ioctl.h et cdrom.h qui sont remplaces par LIBCDIO
+		o hurd: module [ alsa_audio.c ]
+			o Ajout de errno.h qui définit la variable ESTRPIPE
+	- Deposit of XCFA
+
+	========================================
+	 | 4.0.4 |
+	 | 4.0.4~beta1 .. 4.0.4~beta9 |
+	========================================
+	- Ajout d'une icône dans la barre de tâche:
+		o popup_systray.c -> PopupSystray_init ()
+	- Adaptation de xcfa.glade sous Debian Squeeze avec glade 3.6.7 : l'utilisation de gtk-builder-convert n'est plus necessaire
+	- @Tetsumaki : Ajout fonction depuis [ CD->Arrangement des titres du CD ]
+		o %Tl ( Tetsumaki lower ): Toutes les lettres du titres CD en minuscule sauf la premiere.
+		o Le ou les caracteres devant être conserves doivent être precedes par %
+	- @marnux : Correction suite a plantage lecture cd-audio
+	- @marnux : Correction de l'analyse de l'entree AUTEUR / TITRE_ALBUM avec suppression du slash.
+	- Depuis [ CD->Arrangement des titres du CD ], possibilite de redefinition des tags %a et %b
+ 		%a ou %a="Artiste"
+ 		%b ou %a="Album"
+	- @Gounlaf : extraction wav -> mp3 -> fail (fichiers trop petits en faits)
+		o Il s'agissait simplement d'un temps d'attente obligatoire juste apres une operation de [ NORMALISE_EXEC Wav -> PEAK/GROUP ]
+		qui etait sense etre prit en compte par la fonction g_usleep() que j'ai tres simplement remplace par sleep() qui fait
+		nettement mieux son boulot.
+	- Suppression de l'alerte indiquant l'absence du paquet LIBNOTIFY-BIN
+	- @manuker: Correction suite à lecture de mauvais entête de fichier wav. C'est ici ...
+	- Correction de l'appel de mpcenc pour une conversion de format
+	- Amelioration de la reconnaissance de l'entête de fichier au format mpc
+	- @zzero79 : Possibilte d'insertion de caracteres accentues dans un nom de dossiers pour une extraction.
+	- Remplacement partiel de Icedax par LIBCURL
+		o Correspondance correcte des genres de l'onglet CD
+		o Ajout d'un menu de selection par genre (folk, rock, ...)
+		o Depuis la version 4.0.4~beta6, le fichier modifie de icedax n'est plus necessaire.
+	- Remplacement de LIBCURL par LIBCDDB
+	- Correction de la lecture du DataTrack depuis icedax
+	- A la demande de @mdos, creation d'une nouvelle fonction permettant de supprimer tous les accents dans les
+		titres de fichiers depuis l'onglet CD. Je me suis inspire le l'algo.: Ignorer les diacritiques de FreetuxTV.
+	- Deposit of XCFA
+
+	========================================
+	 | 4.0.3 |
+	 | 4.0.3~beta1 .. 4.0.3~beta2 |
+	========================================
+	- Reconnaissance de yaourt et pacman sous ArchLinux pour affichage type de paquet depuis l'onglet > Applications Externes
+	- @Didier : Choix des parametres:
+		o cddbp-server=servername : definit le serveur a contacter pour les recherches titre
+		o cddbp-port=portnumber : definit le nombre de port a utiliser pour les recherches titre
+	- @Leonux: l'utilitaire txt2html n'est pas present sous FrugalWare :/
+		o Suppression de l'utilisation de l'utilitaire txt2html qui est remplace par quelques lignes de codes en C.
+	- Avertissement si xcfa est utilise sous root
+	- Deposit of XCFA
+
+	========================================
+	 | 4.0.2 |
+	 | 4.0.2~beta1 |
+	========================================
+	- @Tetsumaki : demande de modification de: [ $HOME/.config/xcfa_new/ ] en [ $HOME/.config/xcfa/ ]
+	- Debug correct du freeze sous ArchLinux
+	- Debug d'un mauvais type depuis file_analyse.c
+	- Deposit of XCFA
+
+	========================================
+	 | 4.0.1 |
+	 | 4.0.1~beta3 |
+	========================================
+	- @Marillat_Christian: Probleme de compil sous KFreeBSD
+		#ifdef __FreeBSD_kernel__
+			#include <bsm/audit_errno.h>
+			if( err == -BSM_ERRNO_ESTRPIPE) {
+		#else
+			if( err == -ESTRPIPE) {
+		#endif
+	- Suppression de l'utilisation des wXXcodecs pour mplayer
+	- Debug (temporaire/passif) d'un freeze sous ARCHLINUX avec @Tetsumaki
+	- Deposit of XCFA
+
+	========================================
+	 | 4.0.0 |
+	 | 4.0.0~beta1 .. 4.0.0~beta22 |
+	========================================
+	- creation d'un nouveau squelette avec 'basebuild'
+	- redefinition integrale du fichier glade
+	- .
+	- ..
+	- ...
+	- les conversions sont ok avec le trash
+	- popup ajoutes
+	- traduction FR ok
+	- TST: @zarer: tests paquet deb
+	- mise a jour de configure.in via autoscan
+	- @zarer: ajout d'une selection automatique de lignes apres un chargement de fichiers
+	- affichage des images dans le selecteur d'images depuis onglet pochette
+	- remplacement de TIME SIZE par Temps Taille
+	- Les modifications de noms dvd et fichiers sont indiques en couleur rouge
+	- integration d'une lecture de plusieurs fichiers depuis le bureau
+	- correction reconnaissance mp3 avec: MP3 file OU MPEG ADTS, layer III OU MP3 encoding OU XWD X Window Dump image dat
+	- correction code DragAndDop avec une liberation correcte de chaine precedemment allouee
+	- TST: @leonux: tests paquet rpm apres conversion avec alien
+	- Indication du nombre maximal de normalisations possibles depuis Fichiers->Conversions
+		o La taille du buffer statique de pointeurs est actuellement egal a 200
+	- Bascule dans l'onglet Fichiers->Conversions si un download de fichiers est fait depuis le bureau
+	- @zarer: completer le manpage qui est vide
+	- Laurent : gestion utf8 a completer fichier 'file_tags.c"
+	- Modification url pour le site de Christophe:
+		o http://www.road2mayotte.org/blook/
+	- @zarer: bug conversion ogg vers mp3 resolu
+	- @patachonf : reconnaissance fichier APE
+	- amelioration reconnaissance fichiers MP3
+	- Modification de l'url pour Frugalware a la demande de @Devil505
+	- @Hizoka: Inclusion du format AC3 en decompression depuis l'onglet 'Fichiers' : Ok dans la b21
+	- Gestion des accents dans l'onglet Pochette pour le PostScript: Ok dans la b22
+	- @leonux : codage de bulles d'aide
+	- Guillaume : s'occupe de la traduction en Italien
+ 	o it.po - OK - Merci Guillaume :D
+	- completer les traductions: en.po et de.po puis passer le relais
+		o en.po - OK - Thank you very much Gerry Butlter :D
+		o de.po - OK
+	- TODO: completer parametres pour le navigateur
+	- TODO: codage onglet Split
+		o Alsa est utilise pour la lecture
+		o Conversion vers WAV suite a importation de WAV FLAC OGG MP3 APE
+		o Adaptation du code de lecture de fichier wav trouve depuis high-geek.com
+		 Mon ajout de modification du code est en rapport avec la partie “data subchunk” qui n’est pas forcement tout de suite derriere le “fmt subchunk” :/
+		 Ref: tags.h et tags_wav.c
+		o Rectification erreur de chevauchement de plage: Ok dans la b21
+		o Probleme de conversion sous Squeeze avec SOX: Ok dans la b20
+		o Reconnaissance des fichiers AC3 pour ne plus interferer avec les MP3: Ok dans la b21
+		o TODO: Undo
+		o TODO: Importation de formats supplementaires (en cours ...)
+	- Deposit of XCFA
+

xcfa-4.2.8.tar.gz/Makefile.am -> xcfa-5.0.2.tar.gz/Makefile.am Changed

xcfa-4.2.8.tar.gz/Makefile.in -> xcfa-5.0.2.tar.gz/Makefile.in Changed

xcfa-4.2.8.tar.gz/NEWS -> xcfa-5.0.2.tar.gz/NEWS Changed

xcfa-4.2.8.tar.gz/TODO -> xcfa-5.0.2.tar.gz/TODO Changed

@@ -1,364 +1,14 @@
 
- __ __ ___ _ ___ _ _ _ _ _ 
- \ \/ / / __|___ _ ___ _____ _ _| |_ | __(_) |___ /_\ _ _ __| (_)___ 
- > < | (__/ _ \ ' \ V / -_) '_| _| | _|| | / -_) / _ \ || / _` | / _ \
- /_/\_\ \___\___/_||_\_/\___|_| \__| |_| |_|_\___| /_/ \_\_,_\__,_|_\___/
- 
- __ __ 
- / /____ ___/ /__ 
- / __/ _ \/ _ / _ \
- \__/\___/\_,_/\___/
- 
+ __ __ ___ _ ___ _ _ _ _ _
+ \ \/ / / __|___ _ ___ _____ _ _| |_ | __(_) |___ /_\ _ _ __| (_)___
+ > < | (__/ _ \ ' \ V / -_) '_| _| | _|| | / -_) / _ \ || / _` | / _ \
+ /_/\_\ \___\___/_||_\_/\___|_| \__| |_| |_|_\___| /_/ \_\_,_\__,_|_\___/
 
-	========================================
-	 | 4.2.8 |	
-	 | 4.2.8~beta0 .. 4.2.8~beta4 |
-	========================================
-	- TODO: CAIRO library integration for the tab Split
-		o See: http://www.xcfa.tuxfamily.org/index.php?article8/coder-avec-cairo
-	- xcfa: Please Recommend ghostscript instead of gs-common
- 		o Supression de gs-common de la ligne Recommends : de mes paquets tandis que Alessio Treglia a déjà
- 		 contourné le problème différemment chez Debian:
-			o http://anonscm.debian.org/gitweb/?p=pkg-multimedia/xcfa.git;a=commitdiff;h=9d980a02
-			o http://anonscm.debian.org/gitweb/?p=pkg-multimedia/xcfa.git;a=commitdiff;h=679cc525
- 		Vraiment très fort chez Debian : Thank you to the Team ;-) 
-	- At the request of Giannis Servetas, Removal of WAVSPLIT who is not any more maintained.
-		o http://packages.qa.debian.org/w/wavsplit.html
-		o http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=489456
-	 The WavSplit operation is now encoded from XCFA.
-	- Deposit of XCFA: 4.2.8~beta1
-	- Deposit of XCFA: 4.2.8~beta2
-	- Removing the slash character from a title on a CD.
-	- Deposit of XCFA: 4.2.8~beta3
-	- Deposit of XCFA: 4.2.8~beta4
-	- Deposit of XCFA: 4.2.8
-	
-	========================================
-	 | 4.2.7 |	
-	 | 4.2.7~beta0 .. 4.2.7~beta3 |
-	========================================
-	- Intégration des spécifications Freedesktop.
-		o http://doc.ubuntu-fr.org/variables_d_environnement
-		o http://packages.debian.org/fr/lenny/xdg-user-dirs
-		o http://fr.wikipedia.org/wiki/Freedesktop.org 
-		o http://www.planet-libre.org/index.php?post_id=3340 
-		o http://www.ziki.com/en/linuxerie+128366/post/xdg-base-directory-specification-french-traduction-francaise+11044640
-		o http://linuxerie.midiblogs.com/tag/freedesktop
-	- Update for bitrate parameter from APE to MP3
-	- Deposit of XCFA: 4.2.7~beta1
-	- Après une discussion avec Jérôme, re-codage du parsing pour prise
-	 en compte des différentes fonctions disponibles depuis
-		o CD->Arrangement des titres du CD
-		o Préférences->CD->Dossier de stockage
-	- Deposit of XCFA: 4.2.7~beta2
-	- Deposit of XCFA: 4.2.7~beta3
-	- Deposit of XCFA: 4.2.7
 
-	========================================
-	 | 4.2.6 |	
-	 | 4.2.6~beta0 |
-	========================================
-	- Update algorithm for recovering image files on the Net
-	- Deposit of XCFA: 4.2.6~beta0
-	- Deposit of XCFA: 4.2.6
-	
-	========================================
-	 | 4.2.5 |	
-	 | 4.2.5~beta0 .. 4.2.5~beta3 |
-	========================================
-	- Update cue file with PERFORMER
-	- @Jerome:
-		o Test libcurl + cd-discid: ok
-		o "Preferences" -> onglet "CD" -> "Dossier de stockage"
-		 Les caracteres espace ne sont plus remplaces par un underline
-		 Les caracteres accentues sont acceptes
-		o Onglet "CD" -> "Album"
-		 le champ "Album" ne concatene plus "Artist + Album" mais uniquement "Album"
-		o Onglet "CD" -> "Modification des tags Freedb" -> "Commentaires"
-		 Conserver le champ "Commentaire" d'une fois sur l'autre (meme vide)
-		o Onglet "CD" -> "Modification des tags Freedb" -> "Genre"
-		 Saisie possible d'une categorie
-		 Completion de la saisie clavier
-		o Onglet "CD" -> "DiscId"
-		 Disponible uniquement si plusieurs choix
-		o Ajouts d'options en ligne de commande:
-			 o -Version : active le mode 'bavard' pour ne pas surcharger $HOME/.xsession-errors
-			 o -Verbose : affiche le numero de version et quitte xcfa
-	- Deposit of XCFA: 4.2.5~beta0
-	- Deposit of XCFA: 4.2.5~beta1
-	- Deposit of XCFA: 4.2.5~beta2
-	- Deposit of XCFA: 4.2.5
-	- Deposit of XCFA: 4.2.5~beta3
-		
-	========================================
-	 | 4.2.4 |	
-	 | 4.2.4~beta0 .. 4.2.4~beta1 |
-	========================================
-	- Probleme resolu sous frugalware avec le lieu de stockage de vte.h
-		o Success of compilate by @Devil505: xcfa-4.2.4~beta0
-	- Deposit of XCFA: 4.2.4~beta1
-	- Deposit of XCFA: 4.2.4
-	
-	========================================
-	 | 4.2.3 |	
-	 | 4.2.3~beta0 .. 4.2.3~beta2 |
-	========================================
-	- Correctif Gestion Proxy:
-		o Suppression des librairies LibCDIO et LibCDDB
-		o Utilisation de LibCURL et de cd-discid
-		o Tests by @Gounlaf
-	- Deposit of XCFA: 4.2.3~beta0
-	- Correctif module cd_curl.c
-	- Deposit of XCFA: 4.2.3~beta1
-	- Update es.po
-	- Add VTE terminal for expert extraction
-	- Deposit of XCFA: 4.2.3~beta2
-	- Deposit of XCFA: 4.2.3
-	
-	========================================
-	 | 4.2.2 |	
-	 | 4.2.2~beta0 .. 4.2.2~beta11 |
-	========================================
-	- Alexandre Fromion: Intégration de l'extraction de la partie musicale de fichiers VIDEO M4A
-	- Correction avancement barre de progression
-	- Deposit of XCFA: 4.2.2~beta1
-	- @Gounlaf: Plantage suite à connexion à travers un proxy
-		o Codage pour une connexion via un proxy
-	- Deposit of XCFA: 4.2.2~beta2
-	- Codage reaffichage du spectre en mode play : gain de temps pour le CPU
-	- Modification codage Gestion Proxy. Tests by @Gounlaf
-	- Deposit of XCFA: 4.2.2~beta3
-	- Deposit of XCFA: 4.2.2~beta4
-	- Modification codage affichage du spectre en mode play : gain de temps pour le CPU
-	- Deposit of XCFA: 4.2.2~beta5
-	- Modification codage Gestion Proxy. Tests by @Gounlaf
-	- Deposit of XCFA: 4.2.2~beta6
-	- Correctif Gestion Proxy
-	- Deposit of XCFA: 4.2.2~beta7
-	- Correctif Gestion Proxy. Tests by @Gounlaf
-	- Correctif rafraichissement curseur lecture du spectre
-	- Deposit of XCFA: 4.2.2~beta8
-	- Ajout dans onglet CD du choix parmis les differentes bases de donnees pour le CD.
-	- Deposit of XCFA: 4.2.2~beta9
-	- Correctif module cddb.c
-	- Deposit of XCFA: 4.2.2~beta11
-	
-	========================================
-	 | 4.2.1 |	
-	 | 4.2.1~beta0 .. 4.2.1~beta1 |
-	========================================
-	- Nettoyage structures fichiers H et C
-	- @LeDub: Depuis "CD->Gestion des tags...": Resolution d'une insertion d'une eperluette ( & )
-	- Correction eperluette ( & ) File->modification_nom_fichier
-	- Deposit of XCFA: 4.2.1~beta0
-	- recodage de configuser.c
-	- Deposit of XCFA: 4.2.1~beta1
-	- Deposit of XCFA: 4.2.1	
-
-	========================================
-	 | 4.2.0 |	
-	 | 4.2.0~beta0 .. 4.2.0~beta5 |
-	========================================
-	- CAIRO library integration for the tab Pocket
-		o See: http://www.xcfa.tuxfamily.org/index.php?article8/coder-avec-cairo
-	- Deposit of XCFA: 4.2.0~beta1
-	- Roland: Intégration d'une possibilité de jouer une musique en fin de tâche
-	- Deposit of XCFA: 4.2.0~beta2
-	- correctif pour l'internationalisation
-	- Deposit of XCFA: 4.2.0~beta3
-	- la reconnaissance des entetes de fichiers ne fait (presque) plus appel a la commande 'file'
-		qui est capricieuse suivant les distributions Gnu/Linux :/
-	- Deposit of XCFA: 4.2.0~beta4
-	- correctif ReplayGain et extraction-cd
-	- Deposit of XCFA: 4.2.0~beta5
-	- Deposit of XCFA: 4.2.0
-	
-	========================================
-	 | 4.1.0 |	
-	 | 4.1.0~beta0 |
-	========================================
-	- rewrite of the module popup_systray.c
-	- @gounlaf: Restitution correcte du parametre de debit des preferences pour le format mp3
-	- Fixed Drag & Drop from the File tab to export files
-	- @soupaloignon: modification de 'License' en 'Licence' dans fr.po
-	- Deposit of XCFA: 4.1.0~beta0
-	- Deposit of XCFA: 4.1.0
-
-	========================================
-	 | 4.0.9 |	
-	 | 4.0.9~beta0 |
-	========================================
-	- Modification sur le test de presence de [ icedax et/ou cdda2wav ] pour les distribution n'incluant pas icedax
-	- Deposit of XCFA: 4.0.9 et 4.0.9~beta0
 
 	========================================
-	 | 4.0.8 |	
-	 | 4.0.8~beta0 .. 4.0.8~beta1 |
+	 | |
+	 | TODO |
+	 | |
 	========================================
-	- In split: Added refresh after a zoom with [ Crtl + Scroll ]
-	- Deposit of XCFA: 4.0.8~beta0
-	- Deposit of XCFA: 4.0.8 et 4.0.8~beta1
-
-	========================================
-	 | 4.0.7 |	
-	 | 4.0.7~beta0 .. 4.0.7~beta4 |
-	========================================
-	- Complete rewrite of the module split: synchronization scroll and display
-	- Codage messages de la StatusBar
-	- Debug combobox choix dvd
-	- Deposit of XCFA: 4.0.7~beta2
-	- Correction utf8 module file.c
-	- Deposit of XCFA: 4.0.7~beta3
-	- Ajout importation du format WMA dans l'onglet Split
-	- Deposit of XCFA: 4.0.7 et 4.0.7~beta4
-
-	========================================
-	 | 4.0.6 |	
-	 | 4.0.6~beta0 .. 4.0.6~beta1 |
-	========================================
-	- Fabrice: Récupération correcte des information du CD lors d'une non connexion ou si aucune base n'existe.
-	- Brett Cornwall
-		o Reecriture du manpage
-	- [ Hurd ] Problème avec ESTRPIPE qui n'existe pas sous hurd !
-		o solved with code [ #ifdef ESTRPIPE ]
-	- Deposit of XCFA
-
-	========================================
-	 | 4.0.5 |	
-	 | 4.0.5~beta0 .. 4.0.5~beta3 |
-	========================================
-	- Creation des fichiers de traduction en_GB.po et nl.po
-	- Acces correct à la lecture d'un fichier contenant une structure de type dvd
-	- BUG: Debian Bug report logs - #618972 [ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=618972 ]
-		o kfreebsd: module [ cd_cddb.c ]
-			o Abandon de ioctl.h et cdrom.h qui sont remplaces par LIBCDIO
-		o hurd: module [ alsa_audio.c ]
-			o Ajout de errno.h qui définit la variable ESTRPIPE
-	- Deposit of XCFA
-
-	========================================
-	 | 4.0.4 |	
-	 | 4.0.4~beta1 .. 4.0.4~beta9 |
-	========================================
-	- Ajout d'une icône dans la barre de tâche:
-		o popup_systray.c -> PopupSystray_init ()
-	- Adaptation de xcfa.glade sous Debian Squeeze avec glade 3.6.7 : l'utilisation de gtk-builder-convert n'est plus necessaire
-	- @Tetsumaki : Ajout fonction depuis [ CD->Arrangement des titres du CD ]
-		o %Tl ( Tetsumaki lower ): Toutes les lettres du titres CD en minuscule sauf la premiere.
-		o Le ou les caracteres devant être conserves doivent être precedes par %
-	- @marnux : Correction suite a plantage lecture cd-audio
-	- @marnux : Correction de l'analyse de l'entree AUTEUR / TITRE_ALBUM avec suppression du slash.
-	- Depuis [ CD->Arrangement des titres du CD ], possibilite de redefinition des tags %a et %b
- 		%a ou %a="Artiste"
- 		%b ou %a="Album"
-	- @Gounlaf : extraction wav -> mp3 -> fail (fichiers trop petits en faits)
-		o Il s'agissait simplement d'un temps d'attente obligatoire juste apres une operation de [ NORMALISE_EXEC Wav -> PEAK/GROUP ]
-		qui etait sense etre prit en compte par la fonction g_usleep() que j'ai tres simplement remplace par sleep() qui fait
-		nettement mieux son boulot.
-	- Suppression de l'alerte indiquant l'absence du paquet LIBNOTIFY-BIN
-	- @manuker: Correction suite à lecture de mauvais entête de fichier wav. C'est ici ...
-	- Correction de l'appel de mpcenc pour une conversion de format
-	- Amelioration de la reconnaissance de l'entête de fichier au format mpc
-	- @zzero79 : Possibilte d'insertion de caracteres accentues dans un nom de dossiers pour une extraction.
-	- Remplacement partiel de Icedax par LIBCURL
-		o Correspondance correcte des genres de l'onglet CD
-		o Ajout d'un menu de selection par genre (folk, rock, ...)
-		o Depuis la version 4.0.4~beta6, le fichier modifie de icedax n'est plus necessaire.
-	- Remplacement de LIBCURL par LIBCDDB
-	- Correction de la lecture du DataTrack depuis icedax
-	- A la demande de @mdos, creation d'une nouvelle fonction permettant de supprimer tous les accents dans les
-		titres de fichiers depuis l'onglet CD. Je me suis inspire le l'algo.: Ignorer les diacritiques de FreetuxTV.
-	- Deposit of XCFA
-
-	========================================
-	 | 4.0.3 |	
-	 | 4.0.3~beta1 .. 4.0.3~beta2 |
-	========================================
-	- Reconnaissance de yaourt et pacman sous ArchLinux pour affichage type de paquet depuis l'onglet > Applications Externes
-	- @Didier : Choix des parametres:
-		o cddbp-server=servername : definit le serveur a contacter pour les recherches titre
-		o cddbp-port=portnumber : definit le nombre de port a utiliser pour les recherches titre
-	- @Leonux: l'utilitaire txt2html n'est pas present sous FrugalWare :/
-		o Suppression de l'utilisation de l'utilitaire txt2html qui est remplace par quelques lignes de codes en C.
-	- Avertissement si xcfa est utilise sous root
-	- Deposit of XCFA
-
-	========================================
-	 | 4.0.2 |	
-	 | 4.0.2~beta1 |
-	========================================
-	- @Tetsumaki : demande de modification de: [ $HOME/.config/xcfa_new/ ] en [ $HOME/.config/xcfa/ ]
-	- Debug correct du freeze sous ArchLinux
-	- Debug d'un mauvais type depuis file_analyse.c
-	- Deposit of XCFA
-
-	========================================
-	 | 4.0.1 |	
-	 | 4.0.1~beta3 |
-	========================================
-	- @Marillat_Christian: Probleme de compil sous KFreeBSD
-		#ifdef __FreeBSD_kernel__
-			#include <bsm/audit_errno.h>
-			if( err == -BSM_ERRNO_ESTRPIPE) {
-		#else
-			if( err == -ESTRPIPE) {
-		#endif
-	- Suppression de l'utilisation des wXXcodecs pour mplayer
-	- Debug (temporaire/passif) d'un freeze sous ARCHLINUX avec @Tetsumaki
-	- Deposit of XCFA
-
-	========================================
-	 | 4.0.0 |	
-	 | 4.0.0~beta1 .. 4.0.0~beta22 |
-	========================================
-	- creation d'un nouveau squelette avec 'basebuild'
-	- redefinition integrale du fichier glade
-	- .
-	- ..
-	- ...
-	- les conversions sont ok avec le trash
-	- popup ajoutes
-	- traduction FR ok
-	- TST: @zarer: tests paquet deb
-	- mise a jour de configure.in via autoscan
-	- @zarer: ajout d'une selection automatique de lignes apres un chargement de fichiers
-	- affichage des images dans le selecteur d'images depuis onglet pochette
-	- remplacement de TIME SIZE par Temps Taille
-	- Les modifications de noms dvd et fichiers sont indiques en couleur rouge	
-	- integration d'une lecture de plusieurs fichiers depuis le bureau
-	- correction reconnaissance mp3 avec: MP3 file OU MPEG ADTS, layer III OU MP3 encoding OU XWD X Window Dump image dat
-	- correction code DragAndDop avec une liberation correcte de chaine precedemment allouee
-	- TST: @leonux: tests paquet rpm apres conversion avec alien
-	- Indication du nombre maximal de normalisations possibles depuis Fichiers->Conversions
-		o La taille du buffer statique de pointeurs est actuellement egal a 200
-	- Bascule dans l'onglet Fichiers->Conversions si un download de fichiers est fait depuis le bureau
-	- @zarer: completer le manpage qui est vide
-	- Laurent : gestion utf8 a completer fichier 'file_tags.c"
-	- Modification url pour le site de Christophe:
-		o http://www.road2mayotte.org/blook/
-	- @zarer: bug conversion ogg vers mp3 resolu
-	- @patachonf : reconnaissance fichier APE
-	- amelioration reconnaissance fichiers MP3
-	- Modification de l'url pour Frugalware a la demande de @Devil505
-	- @Hizoka: Inclusion du format AC3 en decompression depuis l'onglet 'Fichiers' : Ok dans la b21
-	- Gestion des accents dans l'onglet Pochette pour le PostScript: Ok dans la b22
-	- @leonux : codage de bulles d'aide
-	- Guillaume : s'occupe de la traduction en Italien
- 	o it.po - OK - Merci Guillaume :D
-	- completer les traductions: en.po et de.po puis passer le relais
-		o en.po - OK - Thank you very much Gerry Butlter :D
-		o de.po - OK 
-	- TODO: completer parametres pour le navigateur
-	- TODO: codage onglet Split
-		o Alsa est utilise pour la lecture
-		o Conversion vers WAV suite a importation de WAV FLAC OGG MP3 APE
-		o Adaptation du code de lecture de fichier wav trouve depuis high-geek.com
-		 Mon ajout de modification du code est en rapport avec la partie “data subchunk” qui n’est pas forcement tout de suite derriere le “fmt subchunk” :/
-		 Ref: tags.h et tags_wav.c
-		o Rectification erreur de chevauchement de plage: Ok dans la b21
-		o Probleme de conversion sous Squeeze avec SOX: Ok dans la b20
-		o Reconnaissance des fichiers AC3 pour ne plus interferer avec les MP3: Ok dans la b21
-		o TODO: Undo
-		o TODO: Importation de formats supplementaires (en cours ...)
-	- Deposit of XCFA
-
+	see: Changelog

xcfa-4.2.8.tar.gz/aclocal.m4 -> xcfa-5.0.2.tar.gz/aclocal.m4 Changed

@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
+
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,16 +11,17 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
-[m4_warning([this file was generated for autoconf 2.67.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
 You have another version of autoconf. It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# gettext.m4 serial 63 (gettext-0.18)
-dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
+# gettext.m4 serial 66 (gettext-0.18.2)
+dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -56,7 +57,7 @@
 dnl 'need-formatstring-macros', then GNU gettext implementations that don't
 dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
 dnl INTLDIR is used to find the intl libraries. If empty,
-dnl the value `$(top_builddir)/intl/' is used.
+dnl the value '$(top_builddir)/intl/' is used.
 dnl
 dnl The result of the configuration is one of three cases:
 dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
@@ -118,7 +119,7 @@
 AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
 ])
 
- dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
+ dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
 gt_INTL_MACOSX
 
 dnl Set USE_NLS.
@@ -178,12 +179,18 @@
 fi
 
 AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
- [AC_TRY_LINK([#include <libintl.h>
+ [AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+#include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;],
- [bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],
+extern int *_nl_domain_bindings;
+ ]],
+ [[
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+ ]])],
 [eval "$gt_func_gnugettext_libc=yes"],
 [eval "$gt_func_gnugettext_libc=no"])])
 
@@ -204,35 +211,47 @@
 gt_save_LIBS="$LIBS"
 LIBS="$LIBS $LIBINTL"
 dnl Now see whether libintl exists and does not depend on libiconv.
- AC_TRY_LINK([#include <libintl.h>
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+#include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
-const char *_nl_expand_alias (const char *);],
- [bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+const char *_nl_expand_alias (const char *);
+ ]],
+ [[
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+ ]])],
 [eval "$gt_func_gnugettext_libintl=yes"],
 [eval "$gt_func_gnugettext_libintl=no"])
 dnl Now see whether libintl exists and depends on libiconv.
 if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
 LIBS="$LIBS $LIBICONV"
- AC_TRY_LINK([#include <libintl.h>
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+#include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
-const char *_nl_expand_alias (const char *);],
- [bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
- [LIBINTL="$LIBINTL $LIBICONV"
- LTLIBINTL="$LTLIBINTL $LTLIBICONV"
- eval "$gt_func_gnugettext_libintl=yes"
- ])
+const char *_nl_expand_alias (const char *);
+ ]],
+ [[
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+ ]])],
+ [LIBINTL="$LIBINTL $LIBICONV"
+ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+ eval "$gt_func_gnugettext_libintl=yes"
+ ])
 fi
 CPPFLAGS="$gt_save_CPPFLAGS"
 LIBS="$gt_save_LIBS"])
@@ -403,8 +422,8 @@
 dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
 AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
 
-# iconv.m4 serial 11 (gettext-0.18.1)
-dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
+# iconv.m4 serial 19 (gettext-0.18.2)
+dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -435,27 +454,35 @@
 dnl Add $INCICONV to CPPFLAGS before performing the following checks,
 dnl because if the user has installed libiconv and not disabled its use
 dnl via --without-libiconv-prefix, he wants to use it. The first
- dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
+ dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
 am_save_CPPFLAGS="$CPPFLAGS"
 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
 
 AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
 am_cv_func_iconv="no, consider installing GNU libiconv"
 am_cv_lib_iconv=no
- AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
- [iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);],
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+#include <stdlib.h>
+#include <iconv.h>
+ ]],
+ [[iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);]])],
 [am_cv_func_iconv=yes])
 if test "$am_cv_func_iconv" != yes; then
 am_save_LIBS="$LIBS"
 LIBS="$LIBS $LIBICONV"
- AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
- [iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);],
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+#include <stdlib.h>
+#include <iconv.h>
+ ]],
+ [[iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);]])],
 [am_cv_lib_iconv=yes]
 [am_cv_func_iconv=yes])
 LIBS="$am_save_LIBS"
@@ -463,33 +490,43 @@
 ])
 if test "$am_cv_func_iconv" = yes; then
 AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
- dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
+ dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
+ dnl Solaris 10.
 am_save_LIBS="$LIBS"
 if test $am_cv_lib_iconv = yes; then
 LIBS="$LIBS $LIBICONV"
 fi
- AC_TRY_RUN([
+ am_cv_func_iconv_works=no
+ for ac_iconv_const in '' 'const'; do
+ AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
 #include <iconv.h>
 #include <string.h>
-int main ()
-{
+
+#ifndef ICONV_CONST
+# define ICONV_CONST $ac_iconv_const
+#endif
+ ]],
+ [[int result = 0;
 /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
 returns. */
 {
 iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
 if (cd_utf8_to_88591 != (iconv_t)(-1))
 {
- static const char input[] = "\342\202\254"; /* EURO SIGN */
+ static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
 char buf[10];
- const char *inptr = input;
+ ICONV_CONST char *inptr = input;
 size_t inbytesleft = strlen (input);
 char *outptr = buf;
 size_t outbytesleft = sizeof (buf);
 size_t res = iconv (cd_utf8_to_88591,
- (char **) &inptr, &inbytesleft,
+ &inptr, &inbytesleft,
 &outptr, &outbytesleft);
 if (res == 0)
- return 1;
+ result |= 1;
+ iconv_close (cd_utf8_to_88591);
 }
 }
 /* Test against Solaris 10 bug: Failures are not distinguishable from
@@ -498,17 +535,37 @@
 iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
 if (cd_ascii_to_88591 != (iconv_t)(-1))
 {
- static const char input[] = "\263";
+ static ICONV_CONST char input[] = "\263";
 char buf[10];
- const char *inptr = input;
+ ICONV_CONST char *inptr = input;
 size_t inbytesleft = strlen (input);
 char *outptr = buf;
 size_t outbytesleft = sizeof (buf);
 size_t res = iconv (cd_ascii_to_88591,
- (char **) &inptr, &inbytesleft,
+ &inptr, &inbytesleft,
 &outptr, &outbytesleft);
 if (res == 0)
- return 1;
+ result |= 2;
+ iconv_close (cd_ascii_to_88591);
+ }
+ }
+ /* Test against AIX 6.1..7.1 bug: Buffer overrun. */
+ {
+ iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
+ if (cd_88591_to_utf8 != (iconv_t)(-1))
+ {
+ static ICONV_CONST char input[] = "\304";
+ static char buf[2] = { (char)0xDE, (char)0xAD };
+ ICONV_CONST char *inptr = input;
+ size_t inbytesleft = 1;
+ char *outptr = buf;
+ size_t outbytesleft = 1;
+ size_t res = iconv (cd_88591_to_utf8,
+ &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
+ result |= 4;
+ iconv_close (cd_88591_to_utf8);
 }
 }
 #if 0 /* This bug could be worked around by the caller. */
@@ -517,17 +574,18 @@
 iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
 if (cd_88591_to_utf8 != (iconv_t)(-1))
 {
- static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+ static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
 char buf[50];
- const char *inptr = input;
+ ICONV_CONST char *inptr = input;
 size_t inbytesleft = strlen (input);
 char *outptr = buf;
 size_t outbytesleft = sizeof (buf);
 size_t res = iconv (cd_88591_to_utf8,
- (char **) &inptr, &inbytesleft,
+ &inptr, &inbytesleft,
 &outptr, &outbytesleft);
 if ((int)res > 0)
- return 1;
+ result |= 8;
+ iconv_close (cd_88591_to_utf8);
 }
 }
 #endif
@@ -541,13 +599,16 @@
 && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
 /* Try HP-UX names. */
 && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
- return 1;
- return 0;
-}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
- [case "$host_os" in
- aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
- *) am_cv_func_iconv_works="guessing yes" ;;
- esac])
+ result |= 16;
+ return result;
+]])],
+ [am_cv_func_iconv_works=yes], ,
+ [case "$host_os" in
+ aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+ *) am_cv_func_iconv_works="guessing yes" ;;
+ esac])
+ test "$am_cv_func_iconv_works" = no || break
+ done
 LIBS="$am_save_LIBS"
 ])
 case "$am_cv_func_iconv_works" in
@@ -588,38 +649,53 @@
 m4_version_prereq([2.64],
 [[AC_DEFUN_ONCE(
 [$1], [$2])]],
- [[AC_DEFUN(
- [$1], [$2])]]))
+ [m4_ifdef([gl_00GNULIB],
+ [[AC_DEFUN_ONCE(
+ [$1], [$2])]],
+ [[AC_DEFUN(
+ [$1], [$2])]])]))
 gl_iconv_AC_DEFUN([AM_ICONV],
 [
 AM_ICONV_LINK
 if test "$am_cv_func_iconv" = yes; then
 AC_MSG_CHECKING([for iconv declaration])
 AC_CACHE_VAL([am_cv_proto_iconv], [
- AC_TRY_COMPILE([
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
 #include <stdlib.h>
 #include <iconv.h>
 extern
 #ifdef __cplusplus
 "C"
 #endif
-#if defined(__STDC__) || defined(__cplusplus)
+#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
 size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
 #else
 size_t iconv();
 #endif
-], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
+ ]],
+ [[]])],
+ [am_cv_proto_iconv_arg1=""],
+ [am_cv_proto_iconv_arg1="const"])
 am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
 am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
 AC_MSG_RESULT([
 $am_cv_proto_iconv])
 AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
 [Define as const if the declaration of iconv() needs const.])
+ dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
+ m4_ifdef([gl_ICONV_H_DEFAULTS],
+ [AC_REQUIRE([gl_ICONV_H_DEFAULTS])
+ if test -n "$am_cv_proto_iconv_arg1"; then
+ ICONV_CONST="const"
+ fi
+ ])
 fi
 ])
 
-# intlmacosx.m4 serial 3 (gettext-0.18)
-dnl Copyright (C) 2004-2010 Free Software Foundation, Inc.
+# intlmacosx.m4 serial 5 (gettext-0.18.2)
+dnl Copyright (C) 2004-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -633,35 +709,40 @@
 dnl gettext package package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
-dnl Checks for special options needed on MacOS X.
+dnl Checks for special options needed on Mac OS X.
 dnl Defines INTL_MACOSX_LIBS.
 AC_DEFUN([gt_INTL_MACOSX],
 [
- dnl Check for API introduced in MacOS X 10.2.
+ dnl Check for API introduced in Mac OS X 10.2.
 AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
 [gt_cv_func_CFPreferencesCopyAppValue],
 [gt_save_LIBS="$LIBS"
 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
- AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
- [CFPreferencesCopyAppValue(NULL, NULL)],
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <CoreFoundation/CFPreferences.h>]],
+ [[CFPreferencesCopyAppValue(NULL, NULL)]])],
 [gt_cv_func_CFPreferencesCopyAppValue=yes],
 [gt_cv_func_CFPreferencesCopyAppValue=no])
 LIBS="$gt_save_LIBS"])
 if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
 AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
- [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
+ [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
 fi
- dnl Check for API introduced in MacOS X 10.3.
+ dnl Check for API introduced in Mac OS X 10.3.
 AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
 [gt_save_LIBS="$LIBS"
 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
- AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <CoreFoundation/CFLocale.h>]],
+ [[CFLocaleCopyCurrent();]])],
 [gt_cv_func_CFLocaleCopyCurrent=yes],
 [gt_cv_func_CFLocaleCopyCurrent=no])
 LIBS="$gt_save_LIBS"])
 if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
 AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
- [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
+ [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
 fi
 INTL_MACOSX_LIBS=
 if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
@@ -670,53 +751,59 @@
 AC_SUBST([INTL_MACOSX_LIBS])
 ])
 
-# lib-ld.m4 serial 4 (gettext-0.18)
-dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
+# lib-ld.m4 serial 6
+dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl Subroutines of libtool.m4,
-dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
-dnl with libtool.m4.
+dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid
+dnl collision with libtool.m4.
 
-dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
+dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no.
 AC_DEFUN([AC_LIB_PROG_LD_GNU],
 [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
- acl_cv_prog_gnu_ld=yes ;;
+ acl_cv_prog_gnu_ld=yes
+ ;;
 *)
- acl_cv_prog_gnu_ld=no ;;
+ acl_cv_prog_gnu_ld=no
+ ;;
 esac])
 with_gnu_ld=$acl_cv_prog_gnu_ld
 ])
 
-dnl From libtool-1.4. Sets the variable LD.
+dnl From libtool-2.4. Sets the variable LD.
 AC_DEFUN([AC_LIB_PROG_LD],
-[AC_ARG_WITH([gnu-ld],
-[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
+[AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
+
+AC_ARG_WITH([gnu-ld],
+ [AS_HELP_STRING([--with-gnu-ld],
+ [assume the C compiler uses GNU ld [default=no]])],
+ [test "$withval" = no || with_gnu_ld=yes],
+ [with_gnu_ld=no])dnl
+
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
+ # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+ # contains only /bin. Note that ksh looks also at the FPATH variable,
+ # so we have to set that as well for the test.
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+ && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+ || PATH_SEPARATOR=';'
+ }
 fi
+
 ac_prog=ld
 if test "$GCC" = yes; then
 # Check if gcc -print-prog-name=ld gives a path.
- AC_MSG_CHECKING([for ld used by GCC])
+ AC_MSG_CHECKING([for ld used by $CC])
 case $host in
 *-*-mingw*)
 # gcc leaves a trailing carriage return which upsets mingw
@@ -726,11 +813,11 @@
 esac
 case $ac_prog in
 # Accept absolute paths.
- [[\\/]* | [A-Za-z]:[\\/]*)]
- [re_direlt='/[^/][^/]*/\.\./']
- # Canonicalize the path of ld
- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ [[\\/]]* | ?:[[\\/]]*)
+ re_direlt='/[[^/]][[^/]]*/\.\./'
+ # Canonicalize the pathname of ld
+ ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
+ while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
 ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
 done
 test -z "$LD" && LD="$ac_prog"
@@ -751,23 +838,26 @@
 fi
 AC_CACHE_VAL([acl_cv_path_LD],
 [if test -z "$LD"; then
- IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
 for ac_dir in $PATH; do
+ IFS="$acl_save_ifs"
 test -z "$ac_dir" && ac_dir=.
 if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
 acl_cv_path_LD="$ac_dir/$ac_prog"
 # Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some GNU ld's only accept -v.
+ # but apparently some variants of GNU ld only accept -v.
 # Break only if it was the GNU/non-GNU ld that we prefer.
- case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+ case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break ;;
+ test "$with_gnu_ld" != no && break
+ ;;
 *)
- test "$with_gnu_ld" != yes && break ;;
+ test "$with_gnu_ld" != yes && break
+ ;;
 esac
 fi
 done
- IFS="$ac_save_ifs"
+ IFS="$acl_save_ifs"
 else
 acl_cv_path_LD="$LD" # Let the user override the test with a path.
 fi])
@@ -781,8 +871,8 @@
 AC_LIB_PROG_LD_GNU
 ])
 
-# lib-link.m4 serial 21 (gettext-0.18)
-dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
+# lib-link.m4 serial 26 (gettext-0.18.2)
+dnl Copyright (C) 2001-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -801,9 +891,9 @@
 [
 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
 AC_REQUIRE([AC_LIB_RPATH])
- pushdef([Name],[translit([$1],[./-], [___])])
- pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+ pushdef([Name],[m4_translit([$1],[./+-], [____])])
+ pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
 AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
 AC_LIB_LINKFLAGS_BODY([$1], [$2])
 ac_cv_lib[]Name[]_libs="$LIB[]NAME"
@@ -841,9 +931,9 @@
 [
 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
 AC_REQUIRE([AC_LIB_RPATH])
- pushdef([Name],[translit([$1],[./-], [___])])
- pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+ pushdef([Name],[m4_translit([$1],[./+-], [____])])
+ pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
 
 dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
 dnl accordingly.
@@ -868,7 +958,8 @@
 *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
 *) LIBS="$LIB[]NAME $LIBS" ;;
 esac
- AC_TRY_LINK([$3], [$4],
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[$3]], [[$4]])],
 [ac_cv_lib[]Name=yes],
 [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
 LIBS="$ac_save_LIBS"
@@ -898,6 +989,8 @@
 dnl Determine the platform dependent parameters needed to use rpath:
 dnl acl_libext,
 dnl acl_shlibext,
+dnl acl_libname_spec,
+dnl acl_library_names_spec,
 dnl acl_hardcode_libdir_flag_spec,
 dnl acl_hardcode_libdir_separator,
 dnl acl_hardcode_direct,
@@ -940,15 +1033,15 @@
 dnl macro call that searches for libname.
 AC_DEFUN([AC_LIB_FROMPACKAGE],
 [
- pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+ pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
 define([acl_frompackage_]NAME, [$2])
 popdef([NAME])
 pushdef([PACK],[$2])
- pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+ pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
 define([acl_libsinpackage_]PACKUP,
- m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
+ m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1])
 popdef([PACKUP])
 popdef([PACK])
 ])
@@ -961,14 +1054,14 @@
 AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
 [
 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
- pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+ pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
 pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
- pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+ pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
 pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
 dnl Autoconf >= 2.61 supports dots in --with options.
- pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
+ pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)])
 dnl By default, look in $includedir and $libdir.
 use_additional=yes
 AC_LIB_WITH_FINAL_PREFIX([
@@ -1025,7 +1118,7 @@
 names_already_handled="$names_already_handled $name"
 dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
 dnl or AC_LIB_HAVE_LINKFLAGS call.
- uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
 eval value=\"\$HAVE_LIB$uppername\"
 if test -n "$value"; then
 if test "$value" = yes; then
@@ -1557,7 +1650,7 @@
 ])
 
 # lib-prefix.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2005, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -1782,7 +1875,7 @@
 ])
 
 # nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -1842,7 +1935,8 @@
 # ----------------------------------
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
 AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
 AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
 AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
@@ -1888,7 +1982,8 @@
 pkg_cv_[]$1="$$1"
 elif test -n "$PKG_CONFIG"; then
 PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes ],
 		 [pkg_failed=yes])
 else
 pkg_failed=untried
@@ -1936,9 +2031,9 @@
 	AC_MSG_RESULT([no])
 _PKG_SHORT_ERRORS_SUPPORTED
 if test $_pkg_short_errors_supported = yes; then
-	 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+	 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
 else 
-	 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+	 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -1972,8 +2067,63 @@
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-# po.m4 serial 17 (gettext-0.18)
-dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+ [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+ [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
+
+
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# -------------------------------------------
+# Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])# PKG_CHECK_VAR
+
+# po.m4 serial 24 (gettext-0.19)
+dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -1991,19 +2141,20 @@
 dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
 dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
 
-AC_PREREQ([2.50])
+AC_PREREQ([2.60])
 
 dnl Checks for all prerequisites of the po subdirectory.
 AC_DEFUN([AM_PO_SUBDIRS],
 [
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AC_PROG_INSTALL])dnl
- AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+ AC_REQUIRE([AC_PROG_SED])dnl
 AC_REQUIRE([AM_NLS])dnl
 
 dnl Release version of the gettext macros. This is used to ensure that
 dnl the gettext macros and po/Makefile.in.in are in sync.
- AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.19])
 
 dnl Perform the following tests also if --disable-nls has been given,
 dnl because they are needed for "make dist" to work.
@@ -2076,7 +2227,7 @@
 case "$ac_file" in */Makefile.in)
 # Adjust a relative srcdir.
 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
- ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+ ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
 # In autoconf-2.13 it is called $ac_given_srcdir.
 # In autoconf-2.50 it is called $srcdir.
@@ -2092,7 +2243,8 @@
 if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
 rm -f "$ac_dir/POTFILES"
 test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
- cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/$.*$ \\\\/\1/" > "$ac_dir/POTFILES"
+ gt_tab=`printf '\t'`
+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/$.*$ \\\\/\1/" > "$ac_dir/POTFILES"
 POMAKEFILEDEPS="POTFILES.in"
 # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
 # on $ac_dir but don't depend on user-specified configuration
@@ -2103,12 +2255,12 @@
 test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
 fi
 ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
- # Hide the ALL_LINGUAS assigment from automake < 1.5.
+ # Hide the ALL_LINGUAS assignment from automake < 1.5.
 eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
 else
 # The set of available languages was given in configure.in.
- # Hide the ALL_LINGUAS assigment from automake < 1.5.
+ # Hide the ALL_LINGUAS assignment from automake < 1.5.
 eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
 fi
 # Compute POFILES
@@ -2200,7 +2352,7 @@
 changequote(,)dnl
 # Adjust a relative srcdir.
 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
- ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+ ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
 # In autoconf-2.13 it is called $ac_given_srcdir.
 # In autoconf-2.50 it is called $srcdir.
@@ -2228,6 +2380,7 @@
 fi
 
 # A sed script that extracts the value of VARIABLE from a Makefile.
+ tab=`printf '\t'`
 sed_x_variable='
 # Test if the hold space is empty.
 x
@@ -2235,9 +2388,9 @@
 x
 ta
 # Yes it was empty. Look if we have the expected variable definition.
-/^[	 ]*VARIABLE[	 ]*=/{
+/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
 # Seen the first line of the variable definition.
- s/^[	 ]*VARIABLE[	 ]*=//
+ s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
 ba
 }
 bd
@@ -2289,7 +2442,7 @@
 sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
 ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
 fi
- # Hide the ALL_LINGUAS assigment from automake < 1.5.
+ # Hide the ALL_LINGUAS assignment from automake < 1.5.
 eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
 # Compute POFILES
 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
@@ -2379,14 +2532,15 @@
 fi
 
 sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
+ tab=`printf '\t'`
 if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
 # Add dependencies that cannot be formulated as a simple suffix rule.
 for lang in $ALL_LINGUAS; do
 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
 cat >> "$ac_file.tmp" <<EOF
 $frobbedlang.msg: $lang.po
-	@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
-	\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
+${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
 EOF
 done
 fi
@@ -2396,8 +2550,8 @@
 frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
 cat >> "$ac_file.tmp" <<EOF
 $frobbedlang/\$(DOMAIN).resources.dll: $lang.po
-	@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
-	\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
+${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
 EOF
 done
 fi
@@ -2422,8 +2576,8 @@
 XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
 ])
 
-# progtest.m4 serial 6 (gettext-0.18)
-dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc.
+# progtest.m4 serial 7 (gettext-0.18.2)
+dnl Copyright (C) 1996-2003, 2005, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -2451,15 +2605,14 @@
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
+ # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+ # contains only /bin. Note that ksh looks also at the FPATH variable,
+ # so we have to set that as well for the test.
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+ && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+ || PATH_SEPARATOR=';'
+ }
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -2515,7 +2668,7 @@
 AC_SUBST([$1])dnl
 ])
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2527,10 +2680,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
+[am__api_version='1.15'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11.1], [],
+m4_if([$1], [1.15], [],
 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -2546,22 +2699,22 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory. The problem is that $srcdir (and
@@ -2580,7 +2733,7 @@
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir. In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -2598,30 +2751,26 @@
 # configured tree to be moved without reconfiguration.
 
 AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 ])
 
 # AM_CONDITIONAL -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 9
-
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 AC_SUBST([$1_TRUE])dnl
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -2640,16 +2789,14 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 10
 
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery. Also note that it means that autoscan, seeing
@@ -2659,7 +2806,7 @@
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -2672,12 +2819,13 @@
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
 
-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], UPC, [depcc="$UPC" am_compiler_list=],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
+m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
+ [$1], [CXX], [depcc="$CXX" am_compiler_list=],
+ [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+ [$1], [UPC], [depcc="$UPC" am_compiler_list=],
+ [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
 
 AC_CACHE_CHECK([dependency style of $depcc],
 [am_cv_$1_dependencies_compiler_type],
@@ -2685,8 +2833,9 @@
 # We make a subdir and do the tests there. Otherwise we can end up
 # making bogus files that we don't know about and never remove. For
 # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
+ rm -rf conftest.dir
 mkdir conftest.dir
 # Copy depcomp to subdir because otherwise we won't find it if we're
 # using a relative directory.
@@ -2725,16 +2874,16 @@
 : > sub/conftest.c
 for i in 1 2 3 4 5 6; do
 echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
 done
 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
 # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
 am__obj=sub/conftest.${OBJEXT-o}
 am__minus_obj="-o $am__obj"
 case $depmode in
@@ -2743,16 +2892,16 @@
 test "$am__universal" = false || continue
 ;;
 nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
 if test "x$enable_dependency_tracking" = xyes; then
 	continue
 else
 	break
 fi
 ;;
- msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ # This compiler won't grok '-c -o', but also, the minuso test has
 # not run yet. These depmodes are late enough in the game, and
 # so weak that their functioning should not be impacted.
 am__obj=conftest.${OBJEXT-o}
@@ -2800,7 +2949,7 @@
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
 AC_DEFUN([AM_SET_DEPDIR],
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -2810,34 +2959,39 @@
 # AM_DEP_TRACK
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[ --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors])
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+ [--enable-dependency-tracking],
+ [do not reject slow dependency extractors])
+AS_HELP_STRING(
+ [--disable-dependency-tracking],
+ [speeds up one-time build])])
 if test "x$enable_dependency_tracking" != xno; then
 am_depcomp="$ac_aux_dir/depcomp"
 AMDEPBACKSLASH='\'
+ am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
 # Generate code to set up dependency tracking. -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [{
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # Older Autoconf quotes --file arguments for eval, but not when files
 # are listed without --file. Let's play safe and only enable the eval
 # if we detect the quoting.
 case $CONFIG_FILES in
@@ -2850,7 +3004,7 @@
 # Strip MF so we end up with the name of the file.
 mf=`echo "$mf" | sed -e 's/:.*$//'`
 # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
+ # We used to match only the files named 'Makefile.in', but
 # some people rename them; so instead we look at the file content.
 # Grep'ing the first line is not enough: some people post-process
 # each Makefile.in and add a new line on top of each file to say so.
@@ -2862,21 +3016,19 @@
 continue
 fi
 # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ # from the Makefile without running 'make'.
 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
 test -z "$DEPDIR" && continue
 am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
+ test -z "$am__include" && continue
 am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
 # Find all dependency output files, they are included files with
 # $(DEPDIR) in their names. We invoke sed twice because it is the
 # simplest approach to changing $(DEPDIR) to its actual value in the
 # expansion.
 for file in `sed -n "
 s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
 # Make sure the directory exists.
 test -f "$dirpart/$file" && continue
 fdir=`AS_DIRNAME(["$file"])`
@@ -2894,7 +3046,7 @@
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
 # This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each `.P' file that we will
+# is enabled. FIXME. This creates each '.P' file that we will
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
@@ -2902,32 +3054,23 @@
 [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
 # Do all the work for Automake. -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 16
-
 # This macro actually does too much. Some checks are only needed if
 # your package does certain things. But this isn't really a big deal.
 
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -2940,7 +3083,7 @@
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
+[AC_PREREQ([2.65])dnl
 dnl Autoconf wants to disallow AM_ names. We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -2969,33 +3112,42 @@
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[AC_DIAGNOSE([obsolete],
+ [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
 AC_SUBST([PACKAGE], [$1])dnl
 AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+m4_if(
+ m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+ [ok:ok],,
 [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
 AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
 _AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
 
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility. To be removed once Automake 1.9.x
+# dies out for good. For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -3004,34 +3156,82 @@
 			 [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-		 [_AM_DEPENDENCIES(CC)],
-		 [define([AC_PROG_CC],
-			 defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+		 [_AM_DEPENDENCIES([CC])],
+		 [m4_define([AC_PROG_CC],
+			 m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		 [_AM_DEPENDENCIES(CXX)],
-		 [define([AC_PROG_CXX],
-			 defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+		 [_AM_DEPENDENCIES([CXX])],
+		 [m4_define([AC_PROG_CXX],
+			 m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		 [_AM_DEPENDENCIES(OBJC)],
-		 [define([AC_PROG_OBJC],
-			 defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+		 [_AM_DEPENDENCIES([OBJC])],
+		 [m4_define([AC_PROG_OBJC],
+			 m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+		 [_AM_DEPENDENCIES([OBJCXX])],
+		 [m4_define([AC_PROG_OBJCXX],
+			 m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
+])
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
 [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes. So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+ cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present. This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message. This
+can help us improve future automake versions.
+
+END
+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+ echo 'Configuration will proceed anyway, since you have set the' >&2
+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+ echo >&2
+ else
+ cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+ AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+ fi
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
 ])
 
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
-
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated. The stamp files are numbered to have different names.
@@ -3053,7 +3253,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3064,7 +3264,7 @@
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
 case $am_aux_dir in
 *\ * | *\	*)
 install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -3072,16 +3272,14 @@
 install_sh="\${SHELL} $am_aux_dir/install-sh"
 esac
 fi
-AC_SUBST(install_sh)])
+AC_SUBST([install_sh])])
 
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # Check whether the underlying file-system supports filenames
 # with a leading dot. For instance MS-DOS doesn't.
 AC_DEFUN([AM_SET_LEADING_DOT],
@@ -3097,14 +3295,12 @@
 
 # Check to see how 'make' treats includes.	 -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
-
 # AM_MAKE_INCLUDE()
 # -----------------
 # Check to see how make treats includes.
@@ -3122,7 +3318,7 @@
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
 am__include=include
@@ -3147,52 +3343,14 @@
 rm -f confinc confmf
 ])
 
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 6
-
-# AM_PROG_CC_C_O
-# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
-AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
- # Losing compiler, so override with the script.
- # FIXME: It is wrong to rewrite CC.
- # But if we don't then we get into trouble of one sort or another.
- # A longer-term fix would be to have automake use am__CC in this case,
- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
- CC="$am_aux_dir/compile $CC"
-fi
-dnl Make sure AC_PROG_CC is never called again, or it will override our
-dnl setting of CC.
-m4_define([AC_PROG_CC],
- [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
-])
-
 # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 6
-
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
 AC_DEFUN([AM_MISSING_PROG],
@@ -3200,11 +3358,10 @@
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
-
 # AM_MISSING_HAS_RUN
 # ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
@@ -3217,63 +3374,35 @@
 esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+ am_missing_run="$MISSING "
 else
 am_missing_run=
- AC_MSG_WARN([`missing' script is too old or missing])
+ AC_MSG_WARN(['missing' script is too old or missing])
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
- [[\\/$]]* | ?:[[\\/]]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
 # Helper functions for option handling. -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
-
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
 AC_DEFUN([_AM_MANGLE_OPTION],
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME. Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -3284,24 +3413,82 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Check to make sure that the build environment is sane. -*- Autoconf -*-
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+ [whether $CC understands -c and -o together],
+ [am_cv_prog_cc_c_o],
+ [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+ # Make sure it works both with $CC and with simple cc.
+ # Following AC_PROG_CC_C_O, we do the test twice because some
+ # compilers refuse to overwrite an existing .o file with -o,
+ # though they will create one.
+ am_cv_prog_cc_c_o=yes
+ for am_i in 1 2; do
+ if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+ && test -f conftest2.$ac_objext; then
+ : OK
+ else
+ am_cv_prog_cc_c_o=no
+ break
+ fi
+ done
+ rm -f core conftest*
+ unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ (exit $ac_status); }])
+
+# Check to make sure that the build environment is sane. -*- Autoconf -*-
+
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name. Accept space and tab only in the latter.
 am_lf='
@@ -3312,32 +3499,40 @@
 esac
 case $srcdir in
 *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+ AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments. Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-alias in your environment])
- fi
-
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[*]" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls. This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment. This has actually
+	# happened. Such a system could not be considered "sane".
+	AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+ alias in your environment])
+ fi
+ if test "$[2]" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
 test "$[2]" = conftest.file
 )
 then
@@ -3347,36 +3542,85 @@
 AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-AC_MSG_RESULT(yes)])
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
+ am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+ [AC_MSG_CHECKING([that generated files are newer than configure])
+ if test -n "$am_sleep_pid"; then
+ # Hide warnings about reused PIDs.
+ wait $am_sleep_pid 2>/dev/null
+ fi
+ AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
 
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_SILENT_RULES([DEFAULT])
 # --------------------------
 # Enable less verbose build rules; with the default set to DEFAULT
-# (`yes' being less verbose, `no' or empty being verbose).
+# ("yes" being less verbose, "no" or empty being verbose).
 AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules],
-[ --enable-silent-rules less verbose build output (undo: `make V=1')
- --disable-silent-rules verbose build output (undo: `make V=0')])
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no) AM_DEFAULT_VERBOSITY=1;;
-*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+ [--enable-silent-rules],
+ [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+ [--disable-silent-rules],
+ [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
 esac
+dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+ [am_cv_make_support_nested_variables],
+ [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+ dnl Using '$V' instead of '$(V)' breaks IRIX make.
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
 AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
 AM_BACKSLASH='\'
 AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3384,34 +3628,32 @@
 
 # AM_PROG_INSTALL_STRIP
 # ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
+# One issue with vendor 'install' (even GNU) is that you can't
 # specify the program used to strip binaries. This is especially
 # annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
 # Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
+# always use install-sh in "make install-strip", and initialize
 # STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip". However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
 if test "$cross_compiling" != no; then
 AC_CHECK_TOOL([STRIP], [strip], :)
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -3419,24 +3661,22 @@
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball. -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
 #
 # Substitute a variable $(am__tar) that is a command
 # writing to stdout a FORMAT-tarball containing the directory
@@ -3446,75 +3686,114 @@
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 # $(am__untar) < result.tar
+#
 AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
- [m4_case([$1], [ustar],, [pax],,
- [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
+[# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
+
+# We'll loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
- case $_am_tool in
- gnutar)
- for _am_tar in tar gnutar gtar;
- do
- AM_RUN_LOG([$_am_tar --version]) && break
- done
- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
- am__untar="$_am_tar -xf -"
- ;;
- plaintar)
- # Must skip GNU tar: if it does not support --format= it doesn't create
- # ustar tarball either.
- (tar --version) >/dev/null 2>&1 && continue
- am__tar='tar chf - "$$tardir"'
- am__tar_='tar chf - "$tardir"'
- am__untar='tar xf -'
- ;;
- pax)
- am__tar='pax -L -x $1 -w "$$tardir"'
- am__tar_='pax -L -x $1 -w "$tardir"'
- am__untar='pax -r'
- ;;
- cpio)
- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
- am__untar='cpio -i -H $1 -d'
- ;;
- none)
- am__tar=false
- am__tar_=false
- am__untar=false
- ;;
- esac
 
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_$1}" && break
+m4_if([$1], [v7],
+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
 
- # tar/untar a dummy directory, and stop if the command works
- rm -rf conftest.dir
- mkdir conftest.dir
- echo GrepMe > conftest.dir/file
- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ [m4_case([$1],
+ [ustar],
+ [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+ # There is notably a 21 bits limit for the UID and the GID. In fact,
+ # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+ # and bug#13588).
+ am_max_uid=2097151 # 2^21 - 1
+ am_max_gid=$am_max_uid
+ # The $UID and $GID variables are not portable, so we need to resort
+ # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
+ # below are definitely unexpected, so allow the users to see them
+ # (that is, avoid stderr redirection).
+ am_uid=`id -u || echo unknown`
+ am_gid=`id -g || echo unknown`
+ AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+ if test $am_uid -le $am_max_uid; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ _am_tools=none
+ fi
+ AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+ if test $am_gid -le $am_max_gid; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ _am_tools=none
+ fi],
+
+ [pax],
+ [],
+
+ [m4_fatal([Unknown tar format])])
+
+ AC_MSG_CHECKING([how to create a $1 tar archive])
+
+ # Go ahead even if we have the value already cached. We do so because we
+ # need to set the values for the 'am__tar' and 'am__untar' variables.
+ _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+ for _am_tool in $_am_tools; do
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar; do
+ AM_RUN_LOG([$_am_tar --version]) && break
+ done
+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+ am__untar="$_am_tar -xf -"
+ ;;
+ plaintar)
+ # Must skip GNU tar: if it does not support --format= it doesn't create
+ # ustar tarball either.
+ (tar --version) >/dev/null 2>&1 && continue
+ am__tar='tar chf - "$$tardir"'
+ am__tar_='tar chf - "$tardir"'
+ am__untar='tar xf -'
+ ;;
+ pax)
+ am__tar='pax -L -x $1 -w "$$tardir"'
+ am__tar_='pax -L -x $1 -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+ am__untar='cpio -i -H $1 -d'
+ ;;
+ none)
+ am__tar=false
+ am__tar_=false
+ am__untar=false
+ ;;
+ esac
+
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_$1}" && break
+
+ # tar/untar a dummy directory, and stop if the command works.
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ AM_RUN_LOG([$am__untar <conftest.tar])
+ AM_RUN_LOG([cat conftest.dir/file])
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+ done
 rm -rf conftest.dir
- if test -s conftest.tar; then
- AM_RUN_LOG([$am__untar <conftest.tar])
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
- fi
-done
-rm -rf conftest.dir
 
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+ AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+ AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR

xcfa-4.2.8.tar.gz/autogen.sh -> xcfa-5.0.2.tar.gz/autogen.sh Changed

xcfa-4.2.8.tar.gz/config.h.in -> xcfa-5.0.2.tar.gz/config.h.in Changed

@@ -1,4 +1,4 @@
-/* config.h.in. Generated from configure.in by autoheader. */
+/* config.h.in. Generated from configure.ac by autoheader. */
 
 /* Define to 1 if the `closedir' function returns void instead of `int'. */
 #undef CLOSEDIR_VOID
@@ -18,7 +18,7 @@
 /* Define for enable static libarry */
 #undef ENABLE_STATIC_LIBRARY
 
-/* Define if you have vte.h in /usr/include/vte-0.0/vte/vte.h */
+/* Define if you have vte.h in /usr/include/vte-2.91/vte/vte.h */
 #undef FILE_ARCH_VTE_H_IS_OK
 
 /* Define if you have vte.h in /usr/include/vte/vte.h */
@@ -33,11 +33,11 @@
 /* Define if you have ALSA installed */
 #undef HAVE_ALSA
 
-/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
+/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
 CoreFoundation framework. */
 #undef HAVE_CFLOCALECOPYCURRENT
 
-/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
+/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
 the CoreFoundation framework. */
 #undef HAVE_CFPREFERENCESCOPYAPPVALUE
 
@@ -88,17 +88,17 @@
 /* Define to 1 if you have the `lib' library (-llib). */
 #undef HAVE_LIBLIB
 
-/* Define to 1 if you have the `m' library (-lm). */
-#undef HAVE_LIBM
-
 /* Define to 1 if you have the `pthread' library (-lpthread). */
 #undef HAVE_LIBPTHREAD
 
 /* Define to 1 if you have the `tag_c' library (-ltag_c). */
 #undef HAVE_LIBTAG_C
 
-/* Define to 1 if you have the `vte' library (-lvte). */
-#undef HAVE_LIBVTE
+/* Define to 1 if you have the `vte-2.91' library (-lvte-2.91). */
+#undef HAVE_LIBVTE_2_91
+
+/* Define to 1 if you have the <locale.h> header file. */
+#undef HAVE_LOCALE_H
 
 /* Define to 1 if `lstat' has the bug that it succeeds when given the
 zero-length file name argument. */
@@ -126,6 +126,9 @@
 /* Define to 1 if you have the `setlocale' function. */
 #undef HAVE_SETLOCALE
 
+/* Define to 1 if you have the `socket' function. */
+#undef HAVE_SOCKET
+
 /* Define to 1 if stdbool.h conforms to C99. */
 #undef HAVE_STDBOOL_H
 
@@ -170,6 +173,9 @@
 */
 #undef HAVE_SYS_NDIR_H
 
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#undef HAVE_SYS_SOCKET_H
+
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
@@ -216,9 +222,6 @@
 slash. */
 #undef LSTAT_FOLLOWS_SLASHED_SYMLINK
 
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
 /* Name of package */
 #undef PACKAGE

xcfa-4.2.8.tar.gz/configure -> xcfa-5.0.2.tar.gz/configure Changed

@@ -1,13 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for xcfa 4.2.8.
+# Generated by GNU Autoconf 2.69 for xcfa 5.0.2.
 #
 # Report bugs to <http://www.xcfa.tuxfamily.org/>.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -91,6 +89,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are. Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
 *[\\/]* ) as_myself=$0 ;;
 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -135,6 +134,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
 as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
 emulate sh
@@ -168,7 +192,8 @@
 else
 exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
 as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
 as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
 eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -213,14 +238,25 @@
 
 
 if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
 if test x$as_have_required = xno; then :
@@ -323,6 +359,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -444,6 +488,10 @@
 chmod +x "$as_me.lineno" ||
 { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
 # Don't try to exec as it changes $[0], causing all sort of problems
 # (the dirname of $[0] is not the place where we might find the
 # original and so on. Autoconf is especially sensitive to this).
@@ -478,16 +526,16 @@
 # ... but there are two gotchas:
 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 elif ln conf$$.file conf$$ 2>/dev/null; then
 as_ln_s=ln
 else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 fi
 else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -499,28 +547,8 @@
 as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
-	test -d "$1/.";
- else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -552,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='xcfa'
 PACKAGE_TARNAME='xcfa'
-PACKAGE_VERSION='4.2.8'
-PACKAGE_STRING='xcfa 4.2.8'
+PACKAGE_VERSION='5.0.2'
+PACKAGE_STRING='xcfa 5.0.2'
 PACKAGE_BUGREPORT='http://www.xcfa.tuxfamily.org/'
 PACKAGE_URL='http://www.xcfa.tuxfamily.org/'
 
@@ -633,6 +661,7 @@
 MSGFMT
 GETTEXT_MACRO_VERSION
 USE_NLS
+SED
 INSTALL_PREFIX
 RANLIB
 XMKMF
@@ -646,6 +675,7 @@
 am__fastdepCXX_FALSE
 am__fastdepCXX_TRUE
 CXXDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -661,6 +691,8 @@
 CXX
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 am__untar
 am__tar
 AMTAR
@@ -1159,7 +1191,7 @@
 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
 $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
 ;;
 
 esac
@@ -1210,8 +1242,6 @@
 if test "x$host_alias" != x; then
 if test "x$build_alias" = x; then
 cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
 elif test "x$build_alias" != "x$host_alias"; then
 cross_compiling=yes
 fi
@@ -1297,7 +1327,7 @@
 # Omit some internal or obsolete options to make the list less imposing.
 # This message is too long to be a string in the A/UX 3.1 sh.
 cat <<_ACEOF
-\`configure' configures xcfa 4.2.8 to adapt to many kinds of systems.
+\`configure' configures xcfa 5.0.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1371,7 +1401,7 @@
 
 if test -n "$ac_init_help"; then
 case $ac_init_help in
- short | recursive ) echo "Configuration of xcfa 4.2.8:";;
+ short | recursive ) echo "Configuration of xcfa 5.0.2:";;
 esac
 cat <<\_ACEOF
 
@@ -1379,10 +1409,12 @@
 --disable-option-checking ignore unrecognized --enable/--with options
 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-silent-rules less verbose build output (undo: `make V=1')
- --disable-silent-rules verbose build output (undo: `make V=0')
- --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors
+ --enable-silent-rules less verbose build output (undo: "make V=1")
+ --disable-silent-rules verbose build output (undo: "make V=0")
+ --enable-dependency-tracking
+ do not reject slow dependency extractors
+ --disable-dependency-tracking
+ speeds up one-time build
 
 --disable-nls do not use Native Language Support
 --disable-rpath do not hardcode runtime library paths
@@ -1394,7 +1426,7 @@
 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
 --with-x use the X Window System
- --with-gnu-ld assume the C compiler uses GNU ld default=no
+ --with-gnu-ld assume the C compiler uses GNU ld [default=no]
 --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
 --without-libiconv-prefix don't search for libiconv in includedir and libdir
 --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
@@ -1489,10 +1521,10 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
-xcfa configure 4.2.8
-generated by GNU Autoconf 2.67
+xcfa configure 5.0.2
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1536,7 +1568,7 @@
 
 	ac_retval=1
 fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_compile
@@ -1574,7 +1606,7 @@
 
 	ac_retval=1
 fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
@@ -1611,7 +1643,7 @@
 
 ac_retval=1
 fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
@@ -1643,7 +1675,7 @@
 	 test ! -s conftest.err
 } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
 }; then :
 ac_retval=0
 else
@@ -1657,7 +1689,7 @@
 # interfere with the next link command; also delete a directory that is
 # left behind by Apple's compiler. We do this before executing the actions.
 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
@@ -1699,7 +1731,7 @@
 ac_retval=$ac_status
 fi
 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
@@ -1712,10 +1744,10 @@
 ac_fn_c_check_header_mongrel ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if eval "test \"\${$3+set}\"" = set; then :
+ if eval \${$3+:} false; then :
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
 $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -1782,7 +1814,7 @@
 esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 eval "$3=\$ac_header_compiler"
@@ -1791,7 +1823,7 @@
 	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_mongrel
 
@@ -1804,7 +1836,7 @@
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1822,7 +1854,7 @@
 eval ac_res=\$$3
 	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
 
@@ -1835,7 +1867,7 @@
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 eval "$3=no"
@@ -1876,7 +1908,7 @@
 eval ac_res=\$$3
 	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_type
 
@@ -1889,7 +1921,7 @@
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5
 $as_echo_n "checking for int$2_t... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 eval "$3=no"
@@ -1905,7 +1937,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
 ;
 return 0;
@@ -1921,7 +1954,8 @@
 {
 static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
 		 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
 ;
 return 0;
@@ -1950,7 +1984,7 @@
 eval ac_res=\$$3
 	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_find_intX_t
 
@@ -1962,7 +1996,7 @@
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2017,15 +2051,15 @@
 eval ac_res=\$$3
 	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xcfa $as_me 4.2.8, which was
-generated by GNU Autoconf 2.67. Invocation command line was
+It was created by xcfa $as_me 5.0.2, which was
+generated by GNU Autoconf 2.69. Invocation command line was
 
 $ $0 $@
 
@@ -2283,7 +2317,7 @@
 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 done
 
@@ -2374,7 +2408,7 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-am__api_version='1.11'
+am__api_version='1.15'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2422,7 +2456,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2442,7 +2476,7 @@
 # by default.
 for ac_prog in ginstall scoinst install; do
 for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	 if test $ac_prog = install &&
 	 grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	 # AIX install. It has an incompatible calling convention.
@@ -2500,45 +2534,50 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name. Accept space and tab only in the latter.
 am_lf='
 '
 case `pwd` in
 *[\\\"\#\$\&\'\`$am_lf]*)
- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
 *[\\\"\#\$\&\'\`$am_lf\ \	]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+ as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments. Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
-alias in your environment" "$LINENO" 5
- fi
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ if test "$*" != "X $srcdir/configure conftest.file" \
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
 
+	# If neither matched, then we have a broken ls. This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment. This has actually
+	# happened. Such a system could not be considered "sane".
+	as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+ alias in your environment" "$LINENO" 5
+ fi
+ if test "$2" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
 test "$2" = conftest.file
 )
 then
@@ -2550,6 +2589,16 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
+ am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
 test "$program_prefix" != NONE &&
 program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -2560,8 +2609,8 @@
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 if test x"${MISSING+set}" != xset; then
 case $am_aux_dir in
@@ -2572,15 +2621,15 @@
 esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+ am_missing_run="$MISSING "
 else
 am_missing_run=
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
 case $am_aux_dir in
 *\ * | *\	*)
 install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -2589,17 +2638,17 @@
 esac
 fi
 
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip". However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
+# will honor the 'STRIP' environment variable to overrule this program.
 if test "$cross_compiling" != no; then
 if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_STRIP+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$STRIP"; then
@@ -2611,7 +2660,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -2639,7 +2688,7 @@
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$ac_ct_STRIP"; then
@@ -2651,7 +2700,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_STRIP="strip"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -2692,7 +2741,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
- if test "${ac_cv_path_mkdir+set}" = set; then :
+ if ${ac_cv_path_mkdir+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2702,7 +2751,7 @@
 test -z "$as_dir" && as_dir=.
 for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	 { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	 as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
 	 case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	 'mkdir (GNU coreutils) '* | \
 	 'mkdir (coreutils) '* | \
@@ -2731,19 +2780,13 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
- [\\/$]* | ?:[\\/]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
 for ac_prog in gawk mawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
+if ${ac_cv_prog_AWK+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$AWK"; then
@@ -2755,7 +2798,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_AWK="$ac_prog"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -2783,7 +2826,7 @@
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat >conftest.make <<\_ACEOF
@@ -2819,6 +2862,45 @@
 fi
 rmdir .tst 2>/dev/null
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+ enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
 # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
 # is not polluted with repeated "-I."
@@ -2841,7 +2923,7 @@
 
 # Define the identity of the package.
 PACKAGE='xcfa'
- VERSION='4.2.8'
+ VERSION='5.0.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2869,17 +2951,70 @@
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
+# For better backward compatibility. To be removed once Automake 1.9.x
+# dies out for good. For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
+# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
+
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar pax cpio none'
+
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
-AMTAR=${AMTAR-"${am_missing_run}tar"}
 
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
 
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes. So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+ cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present. This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message. This
+can help us improve future automake versions.
+
+END
+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+ echo 'Configuration will proceed anyway, since you have set the' >&2
+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+ echo >&2
+ else
+ cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+ fi
+fi
 
 
 ac_config_headers="$ac_config_headers config.h"
@@ -2891,11 +3026,38 @@
 enableval=$enable_silent_rules;
 fi
 
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no) AM_DEFAULT_VERBOSITY=1;;
-*) AM_DEFAULT_VERBOSITY=0;;
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=0;;
 esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
 AM_BACKSLASH='\'
 
 
@@ -2916,7 +3078,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
+if ${ac_cv_prog_CXX+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$CXX"; then
@@ -2928,7 +3090,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -2960,7 +3122,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$ac_ct_CXX"; then
@@ -2972,7 +3134,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_CXX="$ac_prog"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -3124,7 +3286,7 @@
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C++ compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -3167,7 +3329,7 @@
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3226,7 +3388,7 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run C++ compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 fi
 fi
@@ -3237,7 +3399,7 @@
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3278,7 +3440,7 @@
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -3288,7 +3450,7 @@
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3325,7 +3487,7 @@
 ac_save_CXXFLAGS=$CXXFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then :
+if ${ac_cv_prog_cxx_g+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -3425,7 +3587,7 @@
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
 am__include=include
@@ -3458,6 +3620,7 @@
 if test "x$enable_dependency_tracking" != xno; then
 am_depcomp="$ac_aux_dir/depcomp"
 AMDEPBACKSLASH='\'
+ am__nodep='_no'
 fi
 if test "x$enable_dependency_tracking" != xno; then
 AMDEP_TRUE=
@@ -3473,15 +3636,16 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
 # We make a subdir and do the tests there. Otherwise we can end up
 # making bogus files that we don't know about and never remove. For
 # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
+ rm -rf conftest.dir
 mkdir conftest.dir
 # Copy depcomp to subdir because otherwise we won't find it if we're
 # using a relative directory.
@@ -3515,16 +3679,16 @@
 : > sub/conftest.c
 for i in 1 2 3 4 5 6; do
 echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
 done
 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
 # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
 am__obj=sub/conftest.${OBJEXT-o}
 am__minus_obj="-o $am__obj"
 case $depmode in
@@ -3533,16 +3697,16 @@
 test "$am__universal" = false || continue
 ;;
 nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
 if test "x$enable_dependency_tracking" = xyes; then
 	continue
 else
 	break
 fi
 ;;
- msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ # This compiler won't grok '-c -o', but also, the minuso test has
 # not run yet. These depmodes are late enough in the game, and
 # so weak that their functioning should not be impacted.
 am__obj=conftest.${OBJEXT-o}
@@ -3606,7 +3770,7 @@
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$CC"; then
@@ -3618,7 +3782,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -3646,7 +3810,7 @@
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$ac_ct_CC"; then
@@ -3658,7 +3822,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_CC="gcc"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -3699,7 +3863,7 @@
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$CC"; then
@@ -3711,7 +3875,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_CC="${ac_tool_prefix}cc"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -3739,7 +3903,7 @@
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$CC"; then
@@ -3752,7 +3916,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
 ac_prog_rejected=yes
 continue
@@ -3798,7 +3962,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$CC"; then
@@ -3810,7 +3974,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -3842,7 +4006,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$ac_ct_CC"; then
@@ -3854,7 +4018,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_CC="$ac_prog"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -3897,7 +4061,7 @@
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3926,7 +4090,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3963,7 +4127,7 @@
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_save_c_werror_flag=$ac_c_werror_flag
@@ -4041,7 +4205,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_cv_prog_cc_c89=no
@@ -4050,8 +4214,7 @@
 /* end confdefs.h. */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4136,19 +4299,79 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+ # Make sure it works both with $CC and with simple cc.
+ # Following AC_PROG_CC_C_O, we do the test twice because some
+ # compilers refuse to overwrite an existing .o file with -o,
+ # though they will create one.
+ am_cv_prog_cc_c_o=yes
+ for am_i in 1 2; do
+ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } \
+ && test -f conftest2.$ac_objext; then
+ : OK
+ else
+ am_cv_prog_cc_c_o=no
+ break
+ fi
+ done
+ rm -f core conftest*
+ unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC" am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
 # We make a subdir and do the tests there. Otherwise we can end up
 # making bogus files that we don't know about and never remove. For
 # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
+ rm -rf conftest.dir
 mkdir conftest.dir
 # Copy depcomp to subdir because otherwise we won't find it if we're
 # using a relative directory.
@@ -4182,16 +4405,16 @@
 : > sub/conftest.c
 for i in 1 2 3 4 5 6; do
 echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
 done
 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
 # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
 am__obj=sub/conftest.${OBJEXT-o}
 am__minus_obj="-o $am__obj"
 case $depmode in
@@ -4200,16 +4423,16 @@
 test "$am__universal" = false || continue
 ;;
 nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
 if test "x$enable_dependency_tracking" = xyes; then
 	continue
 else
 	break
 fi
 ;;
- msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ # This compiler won't grok '-c -o', but also, the minuso test has
 # not run yet. These depmodes are late enough in the game, and
 # so weak that their functioning should not be impacted.
 am__obj=conftest.${OBJEXT-o}
@@ -4275,7 +4498,7 @@
 CPP=
 fi
 if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then :
+ if ${ac_cv_prog_CPP+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 # Double quotes because CPP needs to be expanded
@@ -4391,7 +4614,7 @@
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -4405,7 +4628,7 @@
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat >conftest.make <<\_ACEOF
@@ -4449,8 +4672,8 @@
 have_x=disabled
 else
 case $x_includes,$x_libraries in #(
- *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
- *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
+ *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
+ *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 # One or both of the vars are not set, and there is no cached value.
@@ -4632,7 +4855,7 @@
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
+if ${ac_cv_prog_RANLIB+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$RANLIB"; then
@@ -4644,7 +4867,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -4672,7 +4895,7 @@
 set dummy ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$ac_ct_RANLIB"; then
@@ -4684,7 +4907,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_RANLIB="ranlib"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -4719,131 +4942,6 @@
 RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-if test "x$CC" != xcc; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
-$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
-fi
-set dummy $CC; ac_cc=`$as_echo "$2" |
-		 sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } &&
- test -f conftest2.$ac_objext && { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; };
-then
- eval ac_cv_prog_cc_${ac_cc}_c_o=yes
- if test "x$CC" != xcc; then
- # Test first that cc exists at all.
- if { ac_try='cc -c conftest.$ac_ext >&5'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then
- ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
- rm -f conftest2.*
- if { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } &&
-	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; };
- then
-	# cc works too.
-	:
- else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
- fi
- fi
- fi
-else
- eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
- # Losing compiler, so override with the script.
- # FIXME: It is wrong to rewrite CC.
- # But if we don't then we get into trouble of one sort or another.
- # A longer-term fix would be to have automake use am__CC in this case,
- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
- CC="$am_aux_dir/compile $CC"
-fi
-
 
 
 
@@ -4876,6 +4974,75 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nls mode support" >&5
 $as_echo_n "checking for nls mode support... " >&6; }
 XCFA_LANG="en en_GB es fr de it nl"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+ for ac_i in 1 2 3 4 5 6 7; do
+ ac_script="$ac_script$as_nl$ac_script"
+ done
+ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+ { ac_script=; unset ac_script;}
+ if test -z "$SED"; then
+ ac_path_SED_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+ # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+ ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo '' >> "conftest.nl"
+ "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_SED_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_SED="$ac_path_SED"
+ ac_path_SED_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+ $ac_path_SED_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_SED"; then
+ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+ fi
+else
+ ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+ rm -f conftest.sed
+
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 $as_echo_n "checking whether NLS is requested... " >&6; }
@@ -4892,7 +5059,7 @@
 
 
 
- GETTEXT_MACRO_VERSION=0.18
+ GETTEXT_MACRO_VERSION=0.19
 
 
 
@@ -4900,15 +5067,14 @@
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
+ # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+ # contains only /bin. Note that ksh looks also at the FPATH variable,
+ # so we have to set that as well for the test.
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+ && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+ || PATH_SEPARATOR=';'
+ }
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -4929,7 +5095,7 @@
 set dummy msgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then :
+if ${ac_cv_path_MSGFMT+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 case "$MSGFMT" in
@@ -4970,7 +5136,7 @@
 set dummy gmsgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+if ${ac_cv_path_GMSGFMT+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 case $GMSGFMT in
@@ -4984,7 +5150,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -5023,15 +5189,14 @@
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
+ # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+ # contains only /bin. Note that ksh looks also at the FPATH variable,
+ # so we have to set that as well for the test.
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+ && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+ || PATH_SEPARATOR=';'
+ }
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -5052,7 +5217,7 @@
 set dummy xgettext; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+if ${ac_cv_path_XGETTEXT+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 case "$XGETTEXT" in
@@ -5101,15 +5266,14 @@
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
+ # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+ # contains only /bin. Note that ksh looks also at the FPATH variable,
+ # so we have to set that as well for the test.
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+ && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+ || PATH_SEPARATOR=';'
+ }
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -5130,7 +5294,7 @@
 set dummy msgmerge; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGMERGE+set}" = set; then :
+if ${ac_cv_path_MSGMERGE+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 case "$MSGMERGE" in
@@ -5198,7 +5362,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
+if ${ac_cv_build+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_build_alias=$build_alias
@@ -5214,7 +5378,7 @@
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -5232,7 +5396,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
+if ${ac_cv_host+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test "x$host_alias" = x; then
@@ -5247,7 +5411,7 @@
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -5264,6 +5428,7 @@
 
 
 
+
 # Check whether --with-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then :
 withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
@@ -5274,21 +5439,21 @@
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
+ # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+ # contains only /bin. Note that ksh looks also at the FPATH variable,
+ # so we have to set that as well for the test.
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+ && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+ || PATH_SEPARATOR=';'
+ }
 fi
+
 ac_prog=ld
 if test "$GCC" = yes; then
 # Check if gcc -print-prog-name=ld gives a path.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
-$as_echo_n "checking for ld used by GCC... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
 case $host in
 *-*-mingw*)
 # gcc leaves a trailing carriage return which upsets mingw
@@ -5298,11 +5463,11 @@
 esac
 case $ac_prog in
 # Accept absolute paths.
- [\\/]* | [A-Za-z]:[\\/]*)
+ [\\/]* | ?:[\\/]*)
 re_direlt='/[^/][^/]*/\.\./'
- # Canonicalize the path of ld
- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ # Canonicalize the pathname of ld
+ ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
+ while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
 ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
 done
 test -z "$LD" && LD="$ac_prog"
@@ -5323,27 +5488,30 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if test "${acl_cv_path_LD+set}" = set; then :
+if ${acl_cv_path_LD+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -z "$LD"; then
- IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
 for ac_dir in $PATH; do
+ IFS="$acl_save_ifs"
 test -z "$ac_dir" && ac_dir=.
 if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
 acl_cv_path_LD="$ac_dir/$ac_prog"
 # Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some GNU ld's only accept -v.
+ # but apparently some variants of GNU ld only accept -v.
 # Break only if it was the GNU/non-GNU ld that we prefer.
- case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+ case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break ;;
+ test "$with_gnu_ld" != no && break
+ ;;
 *)
- test "$with_gnu_ld" != yes && break ;;
+ test "$with_gnu_ld" != yes && break
+ ;;
 esac
 fi
 done
- IFS="$ac_save_ifs"
+ IFS="$acl_save_ifs"
 else
 acl_cv_path_LD="$LD" # Let the user override the test with a path.
 fi
@@ -5360,15 +5528,17 @@
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${acl_cv_prog_gnu_ld+set}" = set; then :
+if ${acl_cv_prog_gnu_ld+:} false; then :
 $as_echo_n "(cached) " >&6
 else
- # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+ # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
- acl_cv_prog_gnu_ld=yes ;;
+ acl_cv_prog_gnu_ld=yes
+ ;;
 *)
- acl_cv_prog_gnu_ld=no ;;
+ acl_cv_prog_gnu_ld=no
+ ;;
 esac
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
@@ -5380,7 +5550,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
 $as_echo_n "checking for shared library run path origin... " >&6; }
-if test "${acl_cv_rpath+set}" = set; then :
+if ${acl_cv_rpath+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 
@@ -5412,7 +5582,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -z "$GREP"; then
@@ -5426,7 +5596,7 @@
 for ac_prog in grep ggrep; do
 for ac_exec_ext in '' $ac_executable_extensions; do
 ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
 # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -5475,7 +5645,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -5492,7 +5662,7 @@
 for ac_prog in egrep; do
 for ac_exec_ext in '' $ac_executable_extensions; do
 ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
 # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -5548,7 +5718,7 @@
 solaris*)
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
 $as_echo_n "checking for 64-bit host... " >&6; }
-if test "${gl_cv_solaris_64bit+set}" = set; then :
+if ${gl_cv_solaris_64bit+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5681,7 +5851,7 @@
 done
 if test -z "$already_handled"; then
 names_already_handled="$names_already_handled $name"
- uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
 eval value=\"\$HAVE_LIB$uppername\"
 if test -n "$value"; then
 if test "$value" = yes; then
@@ -6102,7 +6272,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
 $as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
-if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then :
+if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 gt_save_LIBS="$LIBS"
@@ -6136,7 +6306,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
 $as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
-if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then :
+if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 gt_save_LIBS="$LIBS"
@@ -6212,20 +6382,24 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
 $as_echo_n "checking for GNU gettext in libc... " >&6; }
-if eval "test \"\${$gt_func_gnugettext_libc+set}\"" = set; then :
+if eval \${$gt_func_gnugettext_libc+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
+
 #include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
+
 int
 main ()
 {
+
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+
 ;
 return 0;
 }
@@ -6275,7 +6449,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
 $as_echo_n "checking for iconv... " >&6; }
-if test "${am_cv_func_iconv+set}" = set; then :
+if ${am_cv_func_iconv+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 
@@ -6283,14 +6457,16 @@
 am_cv_lib_iconv=no
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
+
 #include <stdlib.h>
 #include <iconv.h>
+
 int
 main ()
 {
 iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
 ;
 return 0;
 }
@@ -6305,14 +6481,16 @@
 LIBS="$LIBS $LIBICONV"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
+
 #include <stdlib.h>
 #include <iconv.h>
+
 int
 main ()
 {
 iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
 ;
 return 0;
 }
@@ -6332,44 +6510,54 @@
 if test "$am_cv_func_iconv" = yes; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
 $as_echo_n "checking for working iconv... " >&6; }
-if test "${am_cv_func_iconv_works+set}" = set; then :
+if ${am_cv_func_iconv_works+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 
- am_save_LIBS="$LIBS"
+ am_save_LIBS="$LIBS"
 if test $am_cv_lib_iconv = yes; then
 LIBS="$LIBS $LIBICONV"
 fi
- if test "$cross_compiling" = yes; then :
+ am_cv_func_iconv_works=no
+ for ac_iconv_const in '' 'const'; do
+ if test "$cross_compiling" = yes; then :
 case "$host_os" in
- aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
- *) am_cv_func_iconv_works="guessing yes" ;;
- esac
+ aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+ *) am_cv_func_iconv_works="guessing yes" ;;
+ esac
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 #include <iconv.h>
 #include <string.h>
-int main ()
+
+#ifndef ICONV_CONST
+# define ICONV_CONST $ac_iconv_const
+#endif
+
+int
+main ()
 {
+int result = 0;
 /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
 returns. */
 {
 iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
 if (cd_utf8_to_88591 != (iconv_t)(-1))
 {
- static const char input[] = "\342\202\254"; /* EURO SIGN */
+ static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
 char buf[10];
- const char *inptr = input;
+ ICONV_CONST char *inptr = input;
 size_t inbytesleft = strlen (input);
 char *outptr = buf;
 size_t outbytesleft = sizeof (buf);
 size_t res = iconv (cd_utf8_to_88591,
- (char **) &inptr, &inbytesleft,
+ &inptr, &inbytesleft,
 &outptr, &outbytesleft);
 if (res == 0)
- return 1;
+ result |= 1;
+ iconv_close (cd_utf8_to_88591);
 }
 }
 /* Test against Solaris 10 bug: Failures are not distinguishable from
@@ -6378,17 +6566,37 @@
 iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
 if (cd_ascii_to_88591 != (iconv_t)(-1))
 {
- static const char input[] = "\263";
+ static ICONV_CONST char input[] = "\263";
 char buf[10];
- const char *inptr = input;
+ ICONV_CONST char *inptr = input;
 size_t inbytesleft = strlen (input);
 char *outptr = buf;
 size_t outbytesleft = sizeof (buf);
 size_t res = iconv (cd_ascii_to_88591,
- (char **) &inptr, &inbytesleft,
+ &inptr, &inbytesleft,
 &outptr, &outbytesleft);
 if (res == 0)
- return 1;
+ result |= 2;
+ iconv_close (cd_ascii_to_88591);
+ }
+ }
+ /* Test against AIX 6.1..7.1 bug: Buffer overrun. */
+ {
+ iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
+ if (cd_88591_to_utf8 != (iconv_t)(-1))
+ {
+ static ICONV_CONST char input[] = "\304";
+ static char buf[2] = { (char)0xDE, (char)0xAD };
+ ICONV_CONST char *inptr = input;
+ size_t inbytesleft = 1;
+ char *outptr = buf;
+ size_t outbytesleft = 1;
+ size_t res = iconv (cd_88591_to_utf8,
+ &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
+ result |= 4;
+ iconv_close (cd_88591_to_utf8);
 }
 }
 #if 0 /* This bug could be worked around by the caller. */
@@ -6397,17 +6605,18 @@
 iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
 if (cd_88591_to_utf8 != (iconv_t)(-1))
 {
- static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+ static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
 char buf[50];
- const char *inptr = input;
+ ICONV_CONST char *inptr = input;
 size_t inbytesleft = strlen (input);
 char *outptr = buf;
 size_t outbytesleft = sizeof (buf);
 size_t res = iconv (cd_88591_to_utf8,
- (char **) &inptr, &inbytesleft,
+ &inptr, &inbytesleft,
 &outptr, &outbytesleft);
 if ((int)res > 0)
- return 1;
+ result |= 8;
+ iconv_close (cd_88591_to_utf8);
 }
 }
 #endif
@@ -6421,19 +6630,22 @@
 && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
 /* Try HP-UX names. */
 && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
- return 1;
+ result |= 16;
+ return result;
+
+ ;
 return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
 am_cv_func_iconv_works=yes
-else
- am_cv_func_iconv_works=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
+ test "$am_cv_func_iconv_works" = no || break
+ done
 LIBS="$am_save_LIBS"
 
 fi
@@ -6539,7 +6751,7 @@
 done
 if test -z "$already_handled"; then
 names_already_handled="$names_already_handled $name"
- uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
 eval value=\"\$HAVE_LIB$uppername\"
 if test -n "$value"; then
 if test "$value" = yes; then
@@ -6928,7 +7140,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
 $as_echo_n "checking for GNU gettext in libintl... " >&6; }
-if eval "test \"\${$gt_func_gnugettext_libintl+set}\"" = set; then :
+if eval \${$gt_func_gnugettext_libintl+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 gt_save_CPPFLAGS="$CPPFLAGS"
@@ -6937,6 +7149,7 @@
 LIBS="$LIBS $LIBINTL"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
+
 #include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
@@ -6945,11 +7158,14 @@
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+
 int
 main ()
 {
+
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+
 ;
 return 0;
 }
@@ -6965,6 +7181,7 @@
 LIBS="$LIBS $LIBICONV"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
+
 #include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
@@ -6973,19 +7190,22 @@
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+
 int
 main ()
 {
+
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+
 ;
 return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 LIBINTL="$LIBINTL $LIBICONV"
- LTLIBINTL="$LTLIBINTL $LTLIBICONV"
- eval "$gt_func_gnugettext_libintl=yes"
+ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+ eval "$gt_func_gnugettext_libintl=yes"
 
 fi
 rm -f core conftest.err conftest.$ac_objext \
@@ -7141,7 +7361,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
 $as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
-if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then :
+if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 gt_save_LIBS="$LIBS"
@@ -7175,7 +7395,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
 $as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
-if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then :
+if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 gt_save_LIBS="$LIBS"
@@ -7251,20 +7471,24 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
 $as_echo_n "checking for GNU gettext in libc... " >&6; }
-if eval "test \"\${$gt_func_gnugettext_libc+set}\"" = set; then :
+if eval \${$gt_func_gnugettext_libc+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
+
 #include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
+
 int
 main ()
 {
+
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+
 ;
 return 0;
 }
@@ -7314,7 +7538,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
 $as_echo_n "checking for iconv... " >&6; }
-if test "${am_cv_func_iconv+set}" = set; then :
+if ${am_cv_func_iconv+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 
@@ -7322,14 +7546,16 @@
 am_cv_lib_iconv=no
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
+
 #include <stdlib.h>
 #include <iconv.h>
+
 int
 main ()
 {
 iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
 ;
 return 0;
 }
@@ -7344,14 +7570,16 @@
 LIBS="$LIBS $LIBICONV"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
+
 #include <stdlib.h>
 #include <iconv.h>
+
 int
 main ()
 {
 iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
 ;
 return 0;
 }
@@ -7371,44 +7599,54 @@
 if test "$am_cv_func_iconv" = yes; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
 $as_echo_n "checking for working iconv... " >&6; }
-if test "${am_cv_func_iconv_works+set}" = set; then :
+if ${am_cv_func_iconv_works+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 
- am_save_LIBS="$LIBS"
+ am_save_LIBS="$LIBS"
 if test $am_cv_lib_iconv = yes; then
 LIBS="$LIBS $LIBICONV"
 fi
- if test "$cross_compiling" = yes; then :
+ am_cv_func_iconv_works=no
+ for ac_iconv_const in '' 'const'; do
+ if test "$cross_compiling" = yes; then :
 case "$host_os" in
- aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
- *) am_cv_func_iconv_works="guessing yes" ;;
- esac
+ aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+ *) am_cv_func_iconv_works="guessing yes" ;;
+ esac
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 #include <iconv.h>
 #include <string.h>
-int main ()
+
+#ifndef ICONV_CONST
+# define ICONV_CONST $ac_iconv_const
+#endif
+
+int
+main ()
 {
+int result = 0;
 /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
 returns. */
 {
 iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
 if (cd_utf8_to_88591 != (iconv_t)(-1))
 {
- static const char input[] = "\342\202\254"; /* EURO SIGN */
+ static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
 char buf[10];
- const char *inptr = input;
+ ICONV_CONST char *inptr = input;
 size_t inbytesleft = strlen (input);
 char *outptr = buf;
 size_t outbytesleft = sizeof (buf);
 size_t res = iconv (cd_utf8_to_88591,
- (char **) &inptr, &inbytesleft,
+ &inptr, &inbytesleft,
 &outptr, &outbytesleft);
 if (res == 0)
- return 1;
+ result |= 1;
+ iconv_close (cd_utf8_to_88591);
 }
 }
 /* Test against Solaris 10 bug: Failures are not distinguishable from
@@ -7417,17 +7655,37 @@
 iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
 if (cd_ascii_to_88591 != (iconv_t)(-1))
 {
- static const char input[] = "\263";
+ static ICONV_CONST char input[] = "\263";
 char buf[10];
- const char *inptr = input;
+ ICONV_CONST char *inptr = input;
 size_t inbytesleft = strlen (input);
 char *outptr = buf;
 size_t outbytesleft = sizeof (buf);
 size_t res = iconv (cd_ascii_to_88591,
- (char **) &inptr, &inbytesleft,
+ &inptr, &inbytesleft,
 &outptr, &outbytesleft);
 if (res == 0)
- return 1;
+ result |= 2;
+ iconv_close (cd_ascii_to_88591);
+ }
+ }
+ /* Test against AIX 6.1..7.1 bug: Buffer overrun. */
+ {
+ iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
+ if (cd_88591_to_utf8 != (iconv_t)(-1))
+ {
+ static ICONV_CONST char input[] = "\304";
+ static char buf[2] = { (char)0xDE, (char)0xAD };
+ ICONV_CONST char *inptr = input;
+ size_t inbytesleft = 1;
+ char *outptr = buf;
+ size_t outbytesleft = 1;
+ size_t res = iconv (cd_88591_to_utf8,
+ &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
+ result |= 4;
+ iconv_close (cd_88591_to_utf8);
 }
 }
 #if 0 /* This bug could be worked around by the caller. */
@@ -7436,17 +7694,18 @@
 iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
 if (cd_88591_to_utf8 != (iconv_t)(-1))
 {
- static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+ static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
 char buf[50];
- const char *inptr = input;
+ ICONV_CONST char *inptr = input;
 size_t inbytesleft = strlen (input);
 char *outptr = buf;
 size_t outbytesleft = sizeof (buf);
 size_t res = iconv (cd_88591_to_utf8,
- (char **) &inptr, &inbytesleft,
+ &inptr, &inbytesleft,
 &outptr, &outbytesleft);
 if ((int)res > 0)
- return 1;
+ result |= 8;
+ iconv_close (cd_88591_to_utf8);
 }
 }
 #endif
@@ -7460,19 +7719,22 @@
 && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
 /* Try HP-UX names. */
 && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
- return 1;
+ result |= 16;
+ return result;
+
+ ;
 return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
 am_cv_func_iconv_works=yes
-else
- am_cv_func_iconv_works=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
+ test "$am_cv_func_iconv_works" = no || break
+ done
 LIBS="$am_save_LIBS"
 
 fi
@@ -7578,7 +7840,7 @@
 done
 if test -z "$already_handled"; then
 names_already_handled="$names_already_handled $name"
- uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
 eval value=\"\$HAVE_LIB$uppername\"
 if test -n "$value"; then
 if test "$value" = yes; then
@@ -7967,7 +8229,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
 $as_echo_n "checking for GNU gettext in libintl... " >&6; }
-if eval "test \"\${$gt_func_gnugettext_libintl+set}\"" = set; then :
+if eval \${$gt_func_gnugettext_libintl+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 gt_save_CPPFLAGS="$CPPFLAGS"
@@ -7976,6 +8238,7 @@
 LIBS="$LIBS $LIBINTL"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
+
 #include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
@@ -7984,11 +8247,14 @@
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+
 int
 main ()
 {
+
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+
 ;
 return 0;
 }
@@ -8004,6 +8270,7 @@
 LIBS="$LIBS $LIBICONV"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
+
 #include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
@@ -8012,19 +8279,22 @@
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+
 int
 main ()
 {
+
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+
 ;
 return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 LIBINTL="$LIBINTL $LIBICONV"
- LTLIBINTL="$LTLIBINTL $LTLIBICONV"
- eval "$gt_func_gnugettext_libintl=yes"
+ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+ eval "$gt_func_gnugettext_libintl=yes"
 
 fi
 rm -f core conftest.err conftest.$ac_objext \
@@ -8160,7 +8430,7 @@
 # Checks for libraries.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libutils_test_file_exist in -llib" >&5
 $as_echo_n "checking for libutils_test_file_exist in -llib... " >&6; }
-if test "${ac_cv_lib_lib_libutils_test_file_exist+set}" = set; then :
+if ${ac_cv_lib_lib_libutils_test_file_exist+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
@@ -8194,7 +8464,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lib_libutils_test_file_exist" >&5
 $as_echo "$ac_cv_lib_lib_libutils_test_file_exist" >&6; }
-if test "x$ac_cv_lib_lib_libutils_test_file_exist" = x""yes; then :
+if test "x$ac_cv_lib_lib_libutils_test_file_exist" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBLIB 1
 _ACEOF
@@ -8210,7 +8480,7 @@
 as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
 $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-if eval "test \"\${$as_ac_Header+set}\"" = set; then :
+if eval \${$as_ac_Header+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8250,7 +8520,7 @@
 if test $ac_header_dirent = dirent.h; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
 $as_echo_n "checking for library containing opendir... " >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then :
+if ${ac_cv_search_opendir+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_func_search_save_LIBS=$LIBS
@@ -8284,11 +8554,11 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext
- if test "${ac_cv_search_opendir+set}" = set; then :
+ if ${ac_cv_search_opendir+:} false; then :
 break
 fi
 done
-if test "${ac_cv_search_opendir+set}" = set; then :
+if ${ac_cv_search_opendir+:} false; then :
 
 else
 ac_cv_search_opendir=no
@@ -8307,7 +8577,7 @@
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
 $as_echo_n "checking for library containing opendir... " >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then :
+if ${ac_cv_search_opendir+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_func_search_save_LIBS=$LIBS
@@ -8341,11 +8611,11 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext
- if test "${ac_cv_search_opendir+set}" = set; then :
+ if ${ac_cv_search_opendir+:} false; then :
 break
 fi
 done
-if test "${ac_cv_search_opendir+set}" = set; then :
+if ${ac_cv_search_opendir+:} false; then :
 
 else
 ac_cv_search_opendir=no
@@ -8365,7 +8635,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8477,7 +8747,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
 $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
-if test "${ac_cv_header_sys_wait_h+set}" = set; then :
+if ${ac_cv_header_sys_wait_h+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8533,7 +8803,7 @@
 done
 
 
-for ac_header in fcntl.h libintl.h stdlib.h string.h unistd.h sys/time.h math.h
+for ac_header in fcntl.h libintl.h stdlib.h string.h unistd.h sys/time.h math.h locale.h sys/socket.h
 do :
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -8550,84 +8820,66 @@
 # Checks for typedefs, structures, and compiler characteristics.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
 $as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
-if test "${ac_cv_header_stdbool_h+set}" = set; then :
+if ${ac_cv_header_stdbool_h+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
-#include <stdbool.h>
-#ifndef bool
- "error: bool is not defined"
-#endif
-#ifndef false
- "error: false is not defined"
-#endif
-#if false
- "error: false is not 0"
-#endif
-#ifndef true
- "error: true is not defined"
-#endif
-#if true != 1
- "error: true is not 1"
-#endif
-#ifndef __bool_true_false_are_defined
- "error: __bool_true_false_are_defined is not defined"
-#endif
-
-	struct s { _Bool s: 1; _Bool t; } s;
-
-	char a[true == 1 ? 1 : -1];
-	char b[false == 0 ? 1 : -1];
-	char c[__bool_true_false_are_defined == 1 ? 1 : -1];
-	char d[(bool) 0.5 == true ? 1 : -1];
-	bool e = &s;
-	char f[(_Bool) 0.0 == false ? 1 : -1];
-	char g[true];
-	char h[sizeof (_Bool)];
-	char i[sizeof s.t];
-	enum { j = false, k = true, l = false * true, m = true * 256 };
-	/* The following fails for
-	 HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
-	_Bool n[m];
-	char o[sizeof n == m * sizeof n[0] ? 1 : -1];
-	char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
-#	if defined __xlc__ || defined __GNUC__
-	 /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
-	 reported by James Lemley on 2005-10-05; see
-	 http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
-	 This test is not quite right, since xlc is allowed to
-	 reject this program, as the initializer for xlcbug is
-	 not one of the forms that C requires support for.
-	 However, doing the test right would require a runtime
-	 test, and that would make cross-compilation harder.
-	 Let us hope that IBM fixes the xlc bug, and also adds
-	 support for this kind of constant expression. In the
-	 meantime, this test will reject xlc, which is OK, since
-	 our stdbool.h substitute should suffice. We also test
-	 this with GCC, where it should work, to detect more
-	 quickly whether someone messes up the test in the
-	 future. */
-	 char digs[] = "0123456789";
-	 int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1);
-#	endif
-	/* Catch a bug in an HP-UX C compiler. See
-	 http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
-	 http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
-	 */
-	_Bool q = true;
-	_Bool *pq = &q;
+ #include <stdbool.h>
+ #ifndef bool
+ "error: bool is not defined"
+ #endif
+ #ifndef false
+ "error: false is not defined"
+ #endif
+ #if false
+ "error: false is not 0"
+ #endif
+ #ifndef true
+ "error: true is not defined"
+ #endif
+ #if true != 1
+ "error: true is not 1"
+ #endif
+ #ifndef __bool_true_false_are_defined
+ "error: __bool_true_false_are_defined is not defined"
+ #endif
+
+ struct s { _Bool s: 1; _Bool t; } s;
+
+ char a[true == 1 ? 1 : -1];
+ char b[false == 0 ? 1 : -1];
+ char c[__bool_true_false_are_defined == 1 ? 1 : -1];
+ char d[(bool) 0.5 == true ? 1 : -1];
+ /* See body of main program for 'e'. */
+ char f[(_Bool) 0.0 == false ? 1 : -1];
+ char g[true];
+ char h[sizeof (_Bool)];
+ char i[sizeof s.t];
+ enum { j = false, k = true, l = false * true, m = true * 256 };
+ /* The following fails for
+ HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
+ _Bool n[m];
+ char o[sizeof n == m * sizeof n[0] ? 1 : -1];
+ char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
+ /* Catch a bug in an HP-UX C compiler. See
+ http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+ http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
+ */
+ _Bool q = true;
+ _Bool *pq = &q;
 
 int
 main ()
 {
 
-	*pq |= q;
-	*pq |= ! q;
-	/* Refer to every declared value, to avoid compiler optimizations. */
-	return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
-		+ !m + !n + !o + !p + !q + !pq);
+ bool e = &s;
+ *pq |= q;
+ *pq |= ! q;
+ /* Refer to every declared value, to avoid compiler optimizations. */
+ return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
+ + !m + !n + !o + !p + !q + !pq);
 
 ;
 return 0;
@@ -8642,8 +8894,8 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
 $as_echo "$ac_cv_header_stdbool_h" >&6; }
-ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
-if test "x$ac_cv_type__Bool" = x""yes; then :
+ ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
+if test "x$ac_cv_type__Bool" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE__BOOL 1
@@ -8652,6 +8904,7 @@
 
 fi
 
+
 if test $ac_cv_header_stdbool_h = yes; then
 
 $as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
@@ -8660,7 +8913,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
 $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if test "${ac_cv_c_const+set}" = set; then :
+if ${ac_cv_c_const+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8669,11 +8922,11 @@
 int
 main ()
 {
-/* FIXME: Include the comments suggested by Paul. */
+
 #ifndef __cplusplus
- /* Ultrix mips cc rejects this. */
+ /* Ultrix mips cc rejects this sort of thing. */
 typedef int charset[2];
- const charset cs;
+ const charset cs = { 0, 0 };
 /* SunOS 4.1.1 cc rejects this. */
 char const *const *pcpcc;
 char **ppc;
@@ -8690,8 +8943,9 @@
 ++pcpcc;
 ppc = (char**) pcpcc;
 pcpcc = (char const *const *) ppc;
- { /* SCO 3.2v4 cc rejects this. */
- char *t;
+ { /* SCO 3.2v4 cc rejects this sort of thing. */
+ char tx;
+ char *t = &tx;
 char const *s = 0 ? (char *) 0 : (char const *) 0;
 
 *t++ = 0;
@@ -8707,10 +8961,10 @@
 iptr p = 0;
 ++p;
 }
- { /* AIX XL C 1.02.0.0 rejects this saying
+ { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
 "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
- struct s { int j; const int *ap[3]; };
- struct s *b; b->j = 5;
+ struct s { int j; const int *ap[3]; } bx;
+ struct s *b = &bx; b->j = 5;
 }
 { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
 const int foo = 10;
@@ -8739,7 +8993,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-if test "x$ac_cv_type_pid_t" = x""yes; then :
+if test "x$ac_cv_type_pid_t" = xyes; then :
 
 else
 
@@ -8750,7 +9004,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = x""yes; then :
+if test "x$ac_cv_type_size_t" = xyes; then :
 
 else
 
@@ -8761,7 +9015,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
-if test "x$ac_cv_type_ssize_t" = x""yes; then :
+if test "x$ac_cv_type_ssize_t" = xyes; then :
 
 else
 
@@ -8786,7 +9040,7 @@
 # Checks for library functions.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether closedir returns void" >&5
 $as_echo_n "checking whether closedir returns void... " >&6; }
-if test "${ac_cv_func_closedir_void+set}" = set; then :
+if ${ac_cv_func_closedir_void+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test "$cross_compiling" = yes; then :
@@ -8829,7 +9083,7 @@
 for ac_header in vfork.h
 do :
 ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default"
-if test "x$ac_cv_header_vfork_h" = x""yes; then :
+if test "x$ac_cv_header_vfork_h" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_VFORK_H 1
 _ACEOF
@@ -8853,7 +9107,7 @@
 if test "x$ac_cv_func_fork" = xyes; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5
 $as_echo_n "checking for working fork... " >&6; }
-if test "${ac_cv_func_fork_works+set}" = set; then :
+if ${ac_cv_func_fork_works+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test "$cross_compiling" = yes; then :
@@ -8906,7 +9160,7 @@
 if test "x$ac_cv_func_vfork" = xyes; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5
 $as_echo_n "checking for working vfork... " >&6; }
-if test "${ac_cv_func_vfork_works+set}" = set; then :
+if ${ac_cv_func_vfork_works+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test "$cross_compiling" = yes; then :
@@ -9042,7 +9296,7 @@
 if test $ac_cv_c_compiler_gnu = yes; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5
 $as_echo_n "checking whether $CC needs -traditional... " >&6; }
-if test "${ac_cv_prog_gcc_traditional+set}" = set; then :
+if ${ac_cv_prog_gcc_traditional+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_pattern="Autoconf.*'x'"
@@ -9083,7 +9337,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
 $as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
-if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then :
+if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 rm -f conftest.sym conftest.file
@@ -9145,7 +9399,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat accepts an empty string" >&5
 $as_echo_n "checking whether lstat accepts an empty string... " >&6; }
-if test "${ac_cv_func_lstat_empty_string_bug+set}" = set; then :
+if ${ac_cv_func_lstat_empty_string_bug+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test "$cross_compiling" = yes; then :
@@ -9191,7 +9445,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
 $as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
-if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then :
+if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 rm -f conftest.sym conftest.file
@@ -9254,7 +9508,7 @@
 for ac_header in stdlib.h
 do :
 ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = x""yes; then :
+if test "x$ac_cv_header_stdlib_h" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STDLIB_H 1
 _ACEOF
@@ -9265,7 +9519,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
 $as_echo_n "checking for GNU libc compatible malloc... " >&6; }
-if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then :
+if ${ac_cv_func_malloc_0_nonnull+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test "$cross_compiling" = yes; then :
@@ -9320,7 +9574,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
 $as_echo_n "checking return type of signal handlers... " >&6; }
-if test "${ac_cv_type_signal+set}" = set; then :
+if ${ac_cv_type_signal+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9351,7 +9605,7 @@
 _ACEOF
 
 
-for ac_func in dup2 getcwd memset mkfifo setlocale strcasecmp strchr strdup strncasecmp strrchr strstr uname gettimeofday strtoul
+for ac_func in dup2 getcwd memset mkfifo setlocale strcasecmp strchr strdup strncasecmp strrchr strstr uname gettimeofday strtoul socket
 do :
 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -9513,12 +9767,11 @@
 fi
 
 #
-# LDFLAGS="-lm$LDFLAGS"
 # Check for complex math functions support: -lm
 #
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for csin in -lm" >&5
-$as_echo_n "checking for csin in -lm... " >&6; }
-if test "${ac_cv_lib_m_csin+set}" = set; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for roundf in -lm" >&5
+$as_echo_n "checking for roundf in -lm... " >&6; }
+if ${ac_cv_lib_m_roundf+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
@@ -9532,40 +9785,39 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char csin ();
+char roundf ();
 int
 main ()
 {
-return csin ();
+return roundf ();
 ;
 return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_m_csin=yes
+ ac_cv_lib_m_roundf=yes
 else
- ac_cv_lib_m_csin=no
+ ac_cv_lib_m_roundf=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_csin" >&5
-$as_echo "$ac_cv_lib_m_csin" >&6; }
-if test "x$ac_cv_lib_m_csin" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBM 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_roundf" >&5
+$as_echo "$ac_cv_lib_m_roundf" >&6; }
+if test "x$ac_cv_lib_m_roundf" = xyes; then :
 
- LIBS="-lm $LIBS"
+ LDFLAGS="-lm $LDFLAGS"
 
 fi
 
 
 #
 # gtk support
+# gtk+-3.0 glib-2.0
 #
-pkg_modules="gtk+-2.0 cairo glib-2.0 gthread-2.0"
+pkg_modules="gtk+-3.0 cairo glib-2.0 gthread-2.0"
+
 
 
 
@@ -9578,7 +9830,7 @@
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 case $PKG_CONFIG in
@@ -9592,7 +9844,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -9621,7 +9873,7 @@
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 case $ac_pt_PKG_CONFIG in
@@ -9635,7 +9887,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -9700,6 +9952,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_PACKAGE_CFLAGS=`$PKG_CONFIG --cflags "$pkg_modules" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -9716,6 +9969,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_PACKAGE_LIBS=`$PKG_CONFIG --libs "$pkg_modules" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -9735,9 +9989,9 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 PACKAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$pkg_modules" 2>&1`
+	 PACKAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$pkg_modules" 2>&1`
 else
-	 PACKAGE_PKG_ERRORS=`$PKG_CONFIG --print-errors "$pkg_modules" 2>&1`
+	 PACKAGE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$pkg_modules" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$PACKAGE_PKG_ERRORS" >&5
@@ -9766,7 +10020,7 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	PACKAGE_CFLAGS=$pkg_cv_PACKAGE_CFLAGS
 	PACKAGE_LIBS=$pkg_cv_PACKAGE_LIBS
@@ -9782,7 +10036,7 @@
 #
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for taglib_file_new in -ltag_c" >&5
 $as_echo_n "checking for taglib_file_new in -ltag_c... " >&6; }
-if test "${ac_cv_lib_tag_c_taglib_file_new+set}" = set; then :
+if ${ac_cv_lib_tag_c_taglib_file_new+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
@@ -9816,7 +10070,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tag_c_taglib_file_new" >&5
 $as_echo "$ac_cv_lib_tag_c_taglib_file_new" >&6; }
-if test "x$ac_cv_lib_tag_c_taglib_file_new" = x""yes; then :
+if test "x$ac_cv_lib_tag_c_taglib_file_new" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBTAG_C 1
 _ACEOF
@@ -9843,7 +10097,7 @@
 #
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_pcm_open in -lasound" >&5
 $as_echo_n "checking for snd_pcm_open in -lasound... " >&6; }
-if test "${ac_cv_lib_asound_snd_pcm_open+set}" = set; then :
+if ${ac_cv_lib_asound_snd_pcm_open+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
@@ -9877,7 +10131,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_pcm_open" >&5
 $as_echo "$ac_cv_lib_asound_snd_pcm_open" >&6; }
-if test "x$ac_cv_lib_asound_snd_pcm_open" = x""yes; then :
+if test "x$ac_cv_lib_asound_snd_pcm_open" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBASOUND 1
 _ACEOF
@@ -9902,7 +10156,7 @@
 #
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
 $as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
+if ${ac_cv_lib_pthread_pthread_create+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
@@ -9936,7 +10190,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
 $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
+if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBPTHREAD 1
 _ACEOF
@@ -9958,7 +10212,7 @@
 #
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_easy_init in -lcurl" >&5
 $as_echo_n "checking for curl_easy_init in -lcurl... " >&6; }
-if test "${ac_cv_lib_curl_curl_easy_init+set}" = set; then :
+if ${ac_cv_lib_curl_curl_easy_init+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
@@ -9992,7 +10246,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_easy_init" >&5
 $as_echo "$ac_cv_lib_curl_curl_easy_init" >&6; }
-if test "x$ac_cv_lib_curl_curl_easy_init" = x""yes; then :
+if test "x$ac_cv_lib_curl_curl_easy_init" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBCURL 1
 _ACEOF
@@ -10015,13 +10269,13 @@
 #
 # vte support
 #
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for vte_terminal_feed in -lvte" >&5
-$as_echo_n "checking for vte_terminal_feed in -lvte... " >&6; }
-if test "${ac_cv_lib_vte_vte_terminal_feed+set}" = set; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for vte_terminal_feed in -lvte-2.91" >&5
+$as_echo_n "checking for vte_terminal_feed in -lvte-2.91... " >&6; }
+if ${ac_cv_lib_vte_2_91_vte_terminal_feed+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
-LIBS="-lvte $LIBS"
+LIBS="-lvte-2.91 $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
@@ -10041,22 +10295,22 @@
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_vte_vte_terminal_feed=yes
+ ac_cv_lib_vte_2_91_vte_terminal_feed=yes
 else
- ac_cv_lib_vte_vte_terminal_feed=no
+ ac_cv_lib_vte_2_91_vte_terminal_feed=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vte_vte_terminal_feed" >&5
-$as_echo "$ac_cv_lib_vte_vte_terminal_feed" >&6; }
-if test "x$ac_cv_lib_vte_vte_terminal_feed" = x""yes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vte_2_91_vte_terminal_feed" >&5
+$as_echo "$ac_cv_lib_vte_2_91_vte_terminal_feed" >&6; }
+if test "x$ac_cv_lib_vte_2_91_vte_terminal_feed" = xyes; then :
 cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBVTE 1
+#define HAVE_LIBVTE_2_91 1
 _ACEOF
 
- LIBS="-lvte $LIBS"
+ LIBS="-lvte-2.91 $LIBS"
 
 else
 
@@ -10074,7 +10328,7 @@
 # for win_vte.c: directory vte.h ?
 #
 FILE_DEBIAN_VTE_H="/usr/include/vte/vte.h"
-FILE_ARCH_VTE_H="/usr/include/vte-0.0/vte/vte.h"
+FILE_ARCH_VTE_H="/usr/include/vte-2.91/vte/vte.h"
 FILE_FW_VTE_H="/usr/include/vte-2.90/vte/vte.h"
 if test -f $FILE_DEBIAN_VTE_H; then
 
@@ -10117,7 +10371,7 @@
 		;;
 esac
 
-ac_config_files="$ac_config_files po/Makefile.in lib/Makefile Makefile src/Makefile man/Makefile pixmaps/Makefile menu/Makefile mime/Makefile glade/Makefile desktop/Makefile"
+ac_config_files="$ac_config_files po/Makefile.in po_cli/Makefile.in lib/Makefile Makefile src/Makefile man/Makefile pixmaps/Makefile menu/Makefile glade/Makefile desktop/Makefile src_cli/Makefile"
 
 
 cat >confcache <<\_ACEOF
@@ -10184,10 +10438,21 @@
 :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 if test -w "$cache_file"; then
- test "x$cache_file" != "x/dev/null" &&
+ if test "x$cache_file" != "x/dev/null"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
+ if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+ else
+ case $cache_file in #(
+ */* | ?:*)
+	 mv -f confcache "$cache_file"$$ &&
+	 mv -f "$cache_file"$$ "$cache_file" ;; #(
+ *)
+	 mv -f confcache "$cache_file" ;;
+	esac
+ fi
+ fi
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -10218,6 +10483,14 @@
 LTLIBOBJS=$ac_ltlibobjs
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+ if test -n "$am_sleep_pid"; then
+ # Hide warnings about reused PIDs.
+ wait $am_sleep_pid 2>/dev/null
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
 if test -n "$EXEEXT"; then
 am__EXEEXT_TRUE=
 am__EXEEXT_FALSE='#'
@@ -10239,7 +10512,7 @@
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -10340,6 +10613,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are. Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
 *[\\/]* ) as_myself=$0 ;;
 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10535,16 +10809,16 @@
 # ... but there are two gotchas:
 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 elif ln conf$$.file conf$$ 2>/dev/null; then
 as_ln_s=ln
 else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 fi
 else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -10604,28 +10878,16 @@
 as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
-	test -d "$1/.";
- else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -10646,8 +10908,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xcfa $as_me 4.2.8, which was
-generated by GNU Autoconf 2.67. Invocation command line was
+This file was extended by xcfa $as_me 5.0.2, which was
+generated by GNU Autoconf 2.69. Invocation command line was
 
 CONFIG_FILES = $CONFIG_FILES
 CONFIG_HEADERS = $CONFIG_HEADERS
@@ -10713,11 +10975,11 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xcfa config.status 4.2.8
-configured by $0, generated by GNU Autoconf 2.67,
+xcfa config.status 5.0.2
+configured by $0, generated by GNU Autoconf 2.69,
 with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -10808,7 +11070,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
 shift
 \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
 CONFIG_SHELL='$SHELL'
@@ -10853,17 +11115,18 @@
 "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
 "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
 "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+ "po_cli/Makefile.in") CONFIG_FILES="$CONFIG_FILES po_cli/Makefile.in" ;;
 "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
 "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
 "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
 "pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/Makefile" ;;
 "menu/Makefile") CONFIG_FILES="$CONFIG_FILES menu/Makefile" ;;
- "mime/Makefile") CONFIG_FILES="$CONFIG_FILES mime/Makefile" ;;
 "glade/Makefile") CONFIG_FILES="$CONFIG_FILES glade/Makefile" ;;
 "desktop/Makefile") CONFIG_FILES="$CONFIG_FILES desktop/Makefile" ;;
+ "src_cli/Makefile") CONFIG_FILES="$CONFIG_FILES src_cli/Makefile" ;;
 
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
 esac
 done
 
@@ -10886,9 +11149,10 @@
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
- tmp=
+ tmp= ac_tmp=
 trap 'exit_status=$?
- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+ : "${ac_tmp:=$tmp}"
+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
 trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -10896,12 +11160,13 @@
 
 {
 tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
+ test -d "$tmp"
 } ||
 {
 tmp=./conf$$-$RANDOM
 (umask 077 && mkdir "$tmp")
 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -10923,7 +11188,7 @@
 ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -10951,7 +11216,7 @@
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -10999,7 +11264,7 @@
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
 for (key in S) S_is_set[key] = 1
 FS = "&#x7;"
 
@@ -11031,7 +11296,7 @@
 sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
 cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
 || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
@@ -11065,7 +11330,7 @@
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
@@ -11077,8 +11342,8 @@
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
- ac_t=`sed -n "/$ac_delim/p" confdefs.h`
- if test -z "$ac_t"; then
+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+ if test -z "$ac_tt"; then
 break
 elif $ac_last_try; then
 as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
@@ -11179,7 +11444,7 @@
 esac
 case $ac_mode$ac_tag in
 :[FHL]*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
 :[FH]-) ac_tag=-:-;;
 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
 esac
@@ -11198,7 +11463,7 @@
 for ac_f
 do
 case $ac_f in
- -) ac_f="$tmp/stdin";;
+ -) ac_f="$ac_tmp/stdin";;
 *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute). The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -11207,7 +11472,7 @@
 	 [\\/$]*) false;;
 	 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	 esac ||
-	 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+	 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
 esac
 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
 as_fn_append ac_file_inputs " '$ac_f'"
@@ -11233,8 +11498,8 @@
 esac
 
 case $ac_tag in
- *:-:* | *:-) cat >"$tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ *:-:* | *:-) cat >"$ac_tmp/stdin" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
 esac
 ;;
 esac
@@ -11370,21 +11635,22 @@
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+ "$ac_tmp/out"`; test -z "$ac_out"; } &&
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined. Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined. Please make sure it is defined" >&2;}
 
- rm -f "$tmp/stdin"
+ rm -f "$ac_tmp/stdin"
 case $ac_file in
- -) cat "$tmp/out" && rm -f "$tmp/out";;
- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
 esac \
 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 ;;
@@ -11395,20 +11661,20 @@
 if test x"$ac_file" != x-; then
 {
 $as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
- } >"$tmp/config.h" \
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+ } >"$ac_tmp/config.h" \
 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
 else
 rm -f "$ac_file"
- mv "$tmp/config.h" "$ac_file" \
+ mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
 fi
 else
 $as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
 || as_fn_error $? "could not create -" "$LINENO" 5
 fi
 # Compute "$ac_file"'s index in $config_headers.
@@ -11455,7 +11721,7 @@
 
 case $ac_file$ac_mode in
 "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # Older Autoconf quotes --file arguments for eval, but not when files
 # are listed without --file. Let's play safe and only enable the eval
 # if we detect the quoting.
 case $CONFIG_FILES in
@@ -11468,7 +11734,7 @@
 # Strip MF so we end up with the name of the file.
 mf=`echo "$mf" | sed -e 's/:.*$//'`
 # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
+ # We used to match only the files named 'Makefile.in', but
 # some people rename them; so instead we look at the file content.
 # Grep'ing the first line is not enough: some people post-process
 # each Makefile.in and add a new line on top of each file to say so.
@@ -11502,21 +11768,19 @@
 continue
 fi
 # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ # from the Makefile without running 'make'.
 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
 test -z "$DEPDIR" && continue
 am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
+ test -z "$am__include" && continue
 am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
 # Find all dependency output files, they are included files with
 # $(DEPDIR) in their names. We invoke sed twice because it is the
 # simplest approach to changing $(DEPDIR) to its actual value in the
 # expansion.
 for file in `sed -n "
 s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
 # Make sure the directory exists.
 test -f "$dirpart/$file" && continue
 fdir=`$as_dirname -- "$file" ||
@@ -11559,7 +11823,7 @@
 case "$ac_file" in */Makefile.in)
 # Adjust a relative srcdir.
 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
- ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+ ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
 # In autoconf-2.13 it is called $ac_given_srcdir.
 # In autoconf-2.50 it is called $srcdir.
@@ -11575,7 +11839,8 @@
 if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
 rm -f "$ac_dir/POTFILES"
 test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
- cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/$.*$ \\\\/\1/" > "$ac_dir/POTFILES"
+ gt_tab=`printf '\t'`
+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/$.*$ \\\\/\1/" > "$ac_dir/POTFILES"
 POMAKEFILEDEPS="POTFILES.in"
 # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
 # on $ac_dir but don't depend on user-specified configuration
@@ -11586,12 +11851,12 @@
 test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
 fi
 ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
- # Hide the ALL_LINGUAS assigment from automake < 1.5.
+ # Hide the ALL_LINGUAS assignment from automake < 1.5.
 eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
 else
 # The set of available languages was given in configure.in.
- # Hide the ALL_LINGUAS assigment from automake < 1.5.
+ # Hide the ALL_LINGUAS assignment from automake < 1.5.
 eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
 fi
 # Compute POFILES
@@ -11702,7 +11967,7 @@
 
 
 the_hostname=`hostname`
-pkg_config_modversion_gtk=`pkg-config --modversion gtk+-2.0`
+pkg_config_modversion_gtk=`pkg-config --modversion gtk+-3.0`
 pkg_config_modversion_cairo=`pkg-config --modversion cairo`
 pkg_config_modversion_glib=`pkg-config --modversion glib-2.0`
 pkg_config_modversion_gthread=`pkg-config --modversion gthread-2.0`
@@ -11717,7 +11982,8 @@
 Host System Type ................ : $host ( $HOST )
 HosName ......................... : $the_hostname
 Compiler ........................ : $CC $CPPFLAGS
- Linker .......................... : $LDFLAGS $LIBS
+ LDFLAGS ......................... : $LDFLAGS
+ LIBS ............................ : $LIBS
 NLS/gettext ..................... : $USE_NLS
 ALL_LINGUAS ..................... : $ALL_LINGUAS
 GTK+ version .................... : $pkg_config_modversion_gtk
@@ -11731,6 +11997,7 @@
 WITH ANSI COMPILATE ............. : $enable_ansi
 CFLAGS .......................... : $CFLAGS
 INSTALL ......................... : $prefix/bin/xcfa
+ INSTALL ......................... : $prefix/bin/xcfa_cli
 
 Options parameters:
 -------------------
@@ -11754,7 +12021,8 @@
 Host System Type ................ : $host ( $HOST )
 HosName ......................... : $the_hostname
 Compiler ........................ : $CC $CPPFLAGS
- Linker .......................... : $LDFLAGS $LIBS
+ LDFLAGS ......................... : $LDFLAGS
+ LIBS ............................ : $LIBS
 NLS/gettext ..................... : $USE_NLS
 ALL_LINGUAS ..................... : $ALL_LINGUAS
 GTK+ version .................... : $pkg_config_modversion_gtk
@@ -11768,6 +12036,7 @@
 WITH ANSI COMPILATE ............. : $enable_ansi
 CFLAGS .......................... : $CFLAGS
 INSTALL ......................... : $prefix/bin/xcfa
+ INSTALL ......................... : $prefix/bin/xcfa_cli
 
 Options parameters:
 -------------------

xcfa-5.0.2.tar.gz/configure.ac Added

@@ -0,0 +1,374 @@
+#
+# configure.in
+# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+# For XCFA project
+#
+
+AC_INIT([xcfa],
+        [5.0.2],
+        [http://www.xcfa.tuxfamily.org/],
+        [xcfa],
+        [http://www.xcfa.tuxfamily.org/])
+AM_INIT_AUTOMAKE
+AC_CONFIG_SRCDIR([src/main.c])
+AC_CONFIG_HEADERS([config.h])
+
+# Enable silent rules if supported
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+# Checks for programs.
+AC_PROG_CXX
+AC_PROG_CC
+AC_PROG_CPP
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+AC_PATH_X
+AC_PROG_RANLIB
+AM_PROG_CC_C_O
+
+AC_DEFINE(ENABLE_STATIC_LIBRARY,1,[Define for enable static libarry])
+
+# Set PREFIX: ./configure  OR ./configure --prefix=/usr
+AC_SUBST(INSTALL_PREFIX)
+AC_PREFIX_DEFAULT(/usr/local)
+if [[ $prefix = "NONE" ]] ; then
+	AC_DEFINE(INSTALL_PREFIX, "/usr/local",
+		[define as prefix where xcfa is installed])
+else
+	AC_DEFINE_UNQUOTED(INSTALL_PREFIX, "$prefix")
+fi
+
+# Set used name package glade: *.glade or *.ui
+AC_DEFINE(PACKAGE_NAME_GLADE, "xcfa.glade", [define as package name of glade])
+AC_DEFINE(PACKAGE_NAME_GLADE_UI, "xcfa.ui", [define as package name of ui])
+
+# nls support
+AC_MSG_CHECKING(for nls mode support)
+XCFA_LANG="en en_GB es fr de it nl"
+AC_ARG_ENABLE(nls, , [
+if test "$enableval" = "yes"; then
+	ALL_LINGUAS=$XCFA_LANG
+	AC_MSG_RESULT(yes)
+	AM_GNU_GETTEXT([external])
+	AC_DEFINE(ENABLE_NLS,1,[Define for NLS support])
+else
+	AC_MSG_RESULT(no)
+	ALL_LINGUAS=
+	USE_NLS="no"
+fi
+], [
+	ALL_LINGUAS=$XCFA_LANG
+	AC_MSG_RESULT(yes)
+	AM_GNU_GETTEXT([external])
+	AC_DEFINE(ENABLE_NLS,1,[Define for NLS support])
+])
+
+GETTEXT_PACKAGE=[$PACKAGE]
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain])
+
+# Checks for libraries.
+AC_CHECK_LIB([lib], [libutils_test_file_exist])
+
+# Checks for header files.
+AC_HEADER_DIRENT
+AC_HEADER_STDC
+AC_HEADER_SYS_WAIT
+AC_CHECK_HEADERS([fcntl.h libintl.h stdlib.h string.h unistd.h sys/time.h math.h locale.h sys/socket.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_HEADER_STDBOOL
+AC_C_CONST
+AC_TYPE_PID_T
+AC_TYPE_SIZE_T
+AC_TYPE_SSIZE_T
+AC_TYPE_INT64_T
+
+# Checks for library functions.
+AC_FUNC_CLOSEDIR_VOID
+AC_FUNC_FORK
+AC_PROG_GCC_TRADITIONAL
+AC_FUNC_LSTAT
+AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
+AC_FUNC_MALLOC
+AC_TYPE_SIGNAL
+AC_CHECK_FUNCS([dup2 getcwd memset mkfifo setlocale strcasecmp strchr strdup strncasecmp strrchr strstr uname gettimeofday strtoul socket])
+
+#
+# debug and ansi support
+#
+AC_ARG_ENABLE(debug_pg, AS_HELP_STRING([--disable-debug-pg], [Enable debug mode (default=disable)]),,enable_debug_pg=no)
+AC_ARG_ENABLE(debug, AS_HELP_STRING([--disable-debug], [Disable debug mode (default=disable)]),,enable_debug=no)
+AC_ARG_ENABLE(ansi,  AS_HELP_STRING([--disable-ansi],  [Enable ansi (default=enabled)]),,enable_ansi=no)
+
+AC_MSG_CHECKING(for debug mode request)
+if test "$enable_debug" = "yes"; then
+ 	AC_MSG_RESULT(yes)
+	AC_DEFINE(DEBUG,1,[Define for debug support])
+	AC_MSG_CHECKING(With ansi compilate)
+	if test "$enable_ansi" = "yes"; then
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(ENABLE_ANSI,1,[Define With ansi compilate])
+		AC_MSG_CHECKING(With enable_debug_pg)
+		if test "$enable_debug_pg" = "yes"; then
+			AC_MSG_RESULT(yes)
+			AC_DEFINE(ENABLE_DEBUG_PG,1,[Define for debug gprof support])
+			echo "***"
+			echo "*** enable_debug=yes, enable_ansi=yes, enable_debug_pg=yes"
+			echo "*** CFLAGS=-pg -g -O2 -Wall -ansi -D_REENTRANT -DLinux -Wl,--export-dynamic"
+			echo "***"
+			CFLAGS="-pg -g -O2 -Wall -ansi -D_REENTRANT -DLinux -Wl,--export-dynamic"
+		else
+			AC_MSG_RESULT(no)
+			echo "***"
+			echo "*** enable_debug=yes, enable_ansi=yes, enable_debug_pg=no"
+			echo "*** CFLAGS=-g -O2 -Wall -ansi -D_REENTRANT -DLinux -Wl,--export-dynamic"
+			echo "***"
+			CFLAGS="-g -O2 -Wall -ansi -D_REENTRANT -DLinux -Wl,--export-dynamic"
+		fi
+	else
+		AC_MSG_RESULT(no)
+		AC_MSG_CHECKING(With enable_debug_pg)
+		if test "$enable_debug_pg" = "yes"; then
+			AC_MSG_RESULT(yes)
+			AC_DEFINE(ENABLE_DEBUG_PG,1,[Define for debug gprof support])
+			echo "***"
+			echo "*** enable_debug=yes, enable_ansi=no, enable_debug_pg=yes"
+			echo "*** CFLAGS=-pg -g -O2 -Wall -D_REENTRANT -DLinux -Wl,--export-dynamic"
+			echo "***"
+			CFLAGS="-pg -g -O2 -Wall -D_REENTRANT -DLinux -Wl,--export-dynamic"
+		else
+			AC_MSG_RESULT(no)
+			echo "***"
+			echo "*** enable_debug=yes, enable_ansi=no, enable_debug_pg=no"
+			echo "*** CFLAGS=-g -O2 -Wall -D_REENTRANT -DLinux -Wl,--export-dynamic"
+			echo "***"
+			CFLAGS="-g -O2 -Wall -D_REENTRANT -DLinux -Wl,--export-dynamic"
+		fi
+	fi
+else
+ 	AC_MSG_RESULT(no)
+	AC_MSG_CHECKING(With ansi compilate)
+ 	if test "$enable_ansi" = "yes"; then
+ 		AC_MSG_RESULT(yes)
+		AC_DEFINE(ENABLE_ANSI,1,[Define With ansi compilate])
+		AC_MSG_CHECKING(With enable_debug_pg)
+		if test "$enable_debug_pg" = "yes"; then
+			AC_MSG_RESULT(yes)
+			AC_DEFINE(ENABLE_DEBUG_PG,1,[Define for debug gprof support])
+			echo "***"
+			echo "*** enable_debug=no, enable_ansi=yes, enable_debug_pg=yes"
+			echo "*** CFLAGS=-pg -Wall -ansi -D_REENTRANT -DLinux -Wl,--export-dynamic"
+			echo "***"
+			CFLAGS="-pg -Wall -ansi -D_REENTRANT -DLinux -Wl,--export-dynamic"
+		else
+			echo "***"
+			echo "*** enable_debug=no, enable_ansi=yes, enable_debug_pg=no"
+			echo "*** CFLAGS=-Wall -ansi -D_REENTRANT -DLinux -Wl,--export-dynamic"
+			echo "***"
+			CFLAGS="-Wall -ansi -D_REENTRANT -DLinux -Wl,--export-dynamic"
+		fi
+	else
+		AC_MSG_RESULT(no)
+		AC_MSG_CHECKING(With enable_debug_pg)
+		if test "$enable_debug_pg" = "yes"; then
+			AC_MSG_RESULT(yes)
+			AC_DEFINE(ENABLE_DEBUG_PG,1,[Define for debug gprof support])
+			echo "***"
+			echo "*** enable_debug=no, enable_ansi=no, enable_debug_pg=yes"
+			echo "*** CFLAGS=-pg -Wall -D_REENTRANT -DLinux -Wl,--export-dynamic"
+			echo "***"
+			CFLAGS="-pg -Wall -D_REENTRANT -DLinux -Wl,--export-dynamic"
+		else
+			AC_MSG_RESULT(no)
+			echo "***"
+			echo "*** enable_debug=no, enable_ansi=no, enable_debug_pg=no"
+			echo "*** CFLAGS=-Wall -O3 -D_REENTRANT -DLinux -Wl,--export-dynamic"
+			echo "***"
+			CFLAGS="-Wall -O3 -D_REENTRANT -DLinux -Wl,--export-dynamic"
+		fi
+	fi
+fi
+
+#
+# Check for complex math functions support: -lm
+#
+AC_CHECK_LIB(m,roundf,[
+  LDFLAGS="-lm $LDFLAGS"
+])
+
+#
+# gtk support
+# gtk+-3.0 glib-2.0
+#
+pkg_modules="gtk+-3.0 cairo glib-2.0 gthread-2.0"
+PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+AC_SUBST(PACKAGE_CFLAGS)
+AC_SUBST(PACKAGE_LIBS)
+
+#
+# taglib support
+#
+AC_CHECK_LIB([tag_c], [taglib_file_new],,
+[
+  echo "***"
+  echo "*** Please, install libtag1-dev,libtagc0-dev development headers"
+  echo "*** OR"
+  echo "*** install taglib-dev for Fedora, Mandriva"
+  echo "***"
+  exit -1
+])
+AC_DEFINE([HAVE_TAGLIB], 1, [Define if you have TAGLIB installed])
+
+#
+# asound support
+#
+AC_CHECK_LIB([asound], [snd_pcm_open],,
+[
+  echo "***"
+  echo "*** Please, install libasound2-dev development headers"
+  echo "***"
+  exit -1
+])
+AC_DEFINE([HAVE_ALSA], 1, [Define if you have ALSA installed])
+
+#
+# pthread support
+#
+AC_CHECK_LIB([pthread], [pthread_create],,
+[
+  echo "***"
+  echo "*** Please, install pthread-dev development headers"
+  echo "***"
+  exit -1
+])
+
+#
+# curl support
+#
+AC_CHECK_LIB([curl], [curl_easy_init],,
+[
+  echo "***"
+  echo "*** Please, install libcurl4-gnutls-dev or libcurl4-openssl-dev development headers"
+  echo "***"
+  exit -1
+])
+AC_DEFINE([HAVE_CURL], 1, [Define if you have CURL installed])
+
+#
+# vte support
+#
+AC_CHECK_LIB([vte-2.91], [vte_terminal_feed],,
+[
+  echo "***"
+  echo "*** Please, install libvte-dev development headers"
+  echo "***"
+  exit -1
+])
+AC_DEFINE([HAVE_VTE], 1, [Define if you have VTE installed])
+#
+# for win_vte.c: directory vte.h ?
+#
+FILE_DEBIAN_VTE_H="/usr/include/vte/vte.h"
+FILE_ARCH_VTE_H="/usr/include/vte-2.91/vte/vte.h"
+FILE_FW_VTE_H="/usr/include/vte-2.90/vte/vte.h"
+if test -f $FILE_DEBIAN_VTE_H; then
+	AC_DEFINE([FILE_DEBIAN_VTE_H_IS_OK], 1, [Define if you have vte.h in /usr/include/vte/vte.h])
+elif test -f $FILE_ARCH_VTE_H; then
+	AC_DEFINE([FILE_ARCH_VTE_H_IS_OK], 1, [Define if you have vte.h in /usr/include/vte-2.91/vte/vte.h])
+elif test -f $FILE_FW_VTE_H; then
+	AC_DEFINE([FILE_FW_VTE_H_IS_OK], 1, [Define if you have vte.h in /usr/include/vte-2.90/vte/vte.h])
+fi
+
+#
+# ? System info
+#
+case $host in
+	*linux*)
+		HOST="Linux-based system"
+		;;
+	*openbsd*)
+		HOST="OpenBSD"
+		;;
+	*netbsd*)
+		HOST="NetBSD"
+		;;
+	*freebsd*)
+		HOST="FreeBSD"
+		;;
+	*mingw*)
+		HOST="Mingw"
+		;;
+	*solaris*)
+		HOST="Solaris"
+		;;
+	*)
+		HOST="Other"
+		;;
+esac
+
+AC_CONFIG_FILES([
+po/Makefile.in
+po_cli/Makefile.in
+lib/Makefile
+Makefile
+src/Makefile
+man/Makefile
+pixmaps/Makefile
+menu/Makefile
+glade/Makefile
+desktop/Makefile
+src_cli/Makefile
+])
+
+AC_OUTPUT
+
+the_hostname=`hostname`
+pkg_config_modversion_gtk=`pkg-config --modversion gtk+-3.0`
+pkg_config_modversion_cairo=`pkg-config --modversion cairo`
+pkg_config_modversion_glib=`pkg-config --modversion glib-2.0`
+pkg_config_modversion_gthread=`pkg-config --modversion gthread-2.0`
+pkg_config_modversion_libcurl=`pkg-config --modversion libcurl`
+pkg_config_modversion_vte=`pkg-config --modversion vte`
+
+AC_MSG_NOTICE([
+=================================================================
+  Configuration for $PACKAGE $VERSION :
+=================================================================
+
+  Host System Type ................ : $host ( $HOST )
+  HosName ......................... : $the_hostname
+  Compiler ........................ : $CC $CPPFLAGS
+  LDFLAGS ......................... : $LDFLAGS
+  LIBS ............................ : $LIBS
+  NLS/gettext ..................... : $USE_NLS
+  ALL_LINGUAS ..................... : $ALL_LINGUAS
+  GTK+ version .................... : $pkg_config_modversion_gtk
+  CAIRO version ................... : $pkg_config_modversion_cairo
+  GLIB version .................... : $pkg_config_modversion_glib
+  GTHREAD version ................. : $pkg_config_modversion_gthread
+  LIBCURL version ................. : $pkg_config_modversion_libcurl
+  VTE version ..................... : $pkg_config_modversion_vte
+  Debug mode g .................... : $enable_debug
+  Debug mode pg ................... : $enable_debug_pg
+  WITH ANSI COMPILATE ............. : $enable_ansi
+  CFLAGS .......................... : $CFLAGS
+  INSTALL ......................... : $prefix/bin/xcfa
+  INSTALL ......................... : $prefix/bin/xcfa_cli
+
+  Options parameters:
+  -------------------
+  by default:
+  	--disable-debug                             No debug support
+  	--disable-debug-pg                          No debug support with gprof
+  	--disable-ansi                              No define ansi for probleme compilate
+  Options is:
+  	--enable-debug      #define DEBUG 1         Define for debug: -g
+  	--enable-debug-pg   #define DEBUG_PG 1      Define for debug support with gprof: -pg
+  	--enable-ansi       #define ENABLE_ANSI 1   Define With ansi compilate
+
+  Now type 'make' to build $PACKAGE $VERSION,
+  and then type (under root) 'make install' for installation.
+])
+

xcfa-4.2.8.tar.gz/desktop/Makefile.in -> xcfa-5.0.2.tar.gz/desktop/Makefile.in Changed

xcfa-4.2.8.tar.gz/glade/Makefile.am -> xcfa-5.0.2.tar.gz/glade/Makefile.am Changed

xcfa-4.2.8.tar.gz/glade/Makefile.in -> xcfa-5.0.2.tar.gz/glade/Makefile.in Changed

xcfa-4.2.8.tar.gz/glade/xcfa.glade -> xcfa-5.0.2.tar.gz/glade/xcfa.glade Changed

@@ -1,37 +1,81 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <interface>
- <requires lib="gtk+" version="2.16"/>
- 
+ <requires lib="gtk+" version="3.12"/>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">100</property>
+ <property name="value">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">1</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="upper">100</property>
+ <property name="value">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">1</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment3">
+ <property name="upper">9999</property>
+ <property name="value">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">1</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment4">
+ <property name="upper">999</property>
+ <property name="value">2</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">1</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment5">
+ <property name="lower">1</property>
+ <property name="upper">99999</property>
+ <property name="value">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">1</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment6">
+ <property name="lower">-24</property>
+ <property name="upper">-6</property>
+ <property name="value">-10</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">1</property>
+ </object>
 <object class="GtkWindow" id="wind_main">
 <property name="width_request">800</property>
 <property name="height_request">520</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK</property>
- <property name="extension_events">all</property>
- <signal name="destroy_event" handler="on_wind_main_destroy_event"/>
- <signal name="key_press_event" handler="on_wind_main_key_press_event"/>
- <signal name="delete_event" handler="on_wind_main_delete_event"/>
- <signal name="key_release_event" handler="on_wind_main_key_release_event"/>
+ <signal name="delete-event" handler="on_wind_main_delete_event" swapped="no"/>
+ <signal name="destroy-event" handler="on_wind_main_destroy_event" swapped="no"/>
+ <signal name="key-press-event" handler="on_wind_main_key_press_event" swapped="no"/>
+ <signal name="key-release-event" handler="on_wind_main_key_release_event" swapped="no"/>
+ <signal name="window-state-event" handler="on_wind_main_window_state_event" swapped="no"/>
 <child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkBox" id="vbox1">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkMenuBar" id="menubar_wind_main">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkMenuItem" id="fichier1">
 <property name="visible">True</property>
- <property name="label" translatable="yes">Fichier</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">File</property>
 <property name="use_underline">True</property>
 <child type="submenu">
 <object class="GtkMenu" id="fichier1_menu">
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkMenuItem" id="quitter1">
 <property name="visible">True</property>
- <property name="label" translatable="yes">Quitter</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Quit</property>
 <property name="use_underline">True</property>
+ <signal name="activate" handler="on_quitter1_activate" swapped="no"/>
 <accelerator key="Q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- <signal name="activate" handler="on_quitter1_activate"/>
 </object>
 </child>
 </object>
@@ -41,17 +85,20 @@
 <child>
 <object class="GtkMenuItem" id="outils1">
 <property name="visible">True</property>
- <property name="label" translatable="yes">Outils</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Tools</property>
 <property name="use_underline">True</property>
 <child type="submenu">
 <object class="GtkMenu" id="menu1">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkMenuItem" id="show_fields">
 <property name="visible">True</property>
- <property name="label" translatable="yes">Visibilite des champs</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Visibility fields</property>
 <property name="use_underline">True</property>
- <signal name="activate" handler="on_show_fields_activate"/>
+ <signal name="activate" handler="on_show_fields_activate" swapped="no"/>
 </object>
 </child>
 </object>
@@ -61,17 +108,20 @@
 <child>
 <object class="GtkMenuItem" id="aide1">
 <property name="visible">True</property>
- <property name="label" translatable="yes">Aide</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Help</property>
 <property name="use_underline">True</property>
 <child type="submenu">
 <object class="GtkMenu" id="aide1_menu">
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkMenuItem" id="a_propos">
 <property name="visible">True</property>
- <property name="label" translatable="yes">A propos</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">About</property>
 <property name="use_underline">True</property>
+ <signal name="activate" handler="on_a_propos1_activate" swapped="no"/>
 <accelerator key="H" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- <signal name="activate" handler="on_a_propos1_activate"/>
 </object>
 </child>
 </object>
@@ -91,40 +141,49 @@
 <property name="height_request">528</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <signal name="switch_page" handler="on_notebook_general_switch_page"/>
+ <signal name="switch-page" handler="on_notebook_general_switch_page" swapped="no"/>
 <child>
- <object class="GtkVBox" id="vbox411">
+ <object class="GtkBox" id="vbox411">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="orientation">vertical</property>
 <child>
- <object class="GtkHBox" id="hbox152">
+ <object class="GtkBox" id="hbox152">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkFrame" id="frame106">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment170">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkHBox" id="hbox153">
+ <object class="GtkBox" id="hbox153">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkEventBox" id="eventbox_combobox_peripherique_dvd">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
- <object class="GtkComboBox" id="combobox_peripherique_dvd">
+ <object class="GtkComboBoxText" id="combobox_peripherique_dvd">
 <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_peripherique_dvd_changed"/>
- <signal name="realize" handler="on_combobox_peripherique_dvd_realize"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_peripherique_dvd_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_peripherique_dvd_realize" swapped="no"/>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -134,19 +193,22 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_rafraichir_dvd_clicked"/>
+ <signal name="clicked" handler="on_button_rafraichir_dvd_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment172">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox156">
+ <object class="GtkBox" id="hbox156">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image80">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-cdrom</property>
 </object>
 <packing>
@@ -158,7 +220,8 @@
 <child>
 <object class="GtkLabel" id="label215">
 <property name="visible">True</property>
- <property name="label" translatable="yes">Lecture</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Read</property>
 <property name="use_underline">True</property>
 </object>
 <packing>
@@ -185,7 +248,8 @@
 <child type="label">
 <object class="GtkLabel" id="label213">
 <property name="visible">True</property>
- <property name="label" translatable="yes"> &lt;b&gt;Choix du peripherique / Lecture du DVD&lt;/b&gt; </property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"> &lt;b&gt;Choosing the peripheral / DVD playback&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
 </child>
@@ -199,15 +263,18 @@
 <child>
 <object class="GtkFrame" id="frame107">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment171">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkHBox" id="hbox155">
+ <object class="GtkBox" id="hbox155">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkButton" id="button_destination_dvd">
@@ -216,10 +283,12 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="use_underline">True</property>
- <signal name="clicked" handler="on_button_destination_dvd_clicked"/>
- <signal name="realize" handler="on_button_destination_dvd_realize"/>
+ <signal name="clicked" handler="on_button_destination_dvd_clicked" swapped="no"/>
+ <signal name="realize" handler="on_button_destination_dvd_realize" swapped="no"/>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -230,42 +299,52 @@
 <child type="label">
 <object class="GtkLabel" id="label214">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Destination des fichiers &lt;/b&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt; File Destination &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
 <object class="GtkFrame" id="frame194">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment403">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkHBox" id="hbox2802">
+ <object class="GtkBox" id="hbox2802">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkButton" id="button_eject_dvd">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
- <signal name="clicked" handler="on_button_eject_dvd_clicked"/>
+ <signal name="clicked" handler="on_button_eject_dvd_clicked" swapped="no"/>
+ <signal name="realize" handler="on_button_eject_dvd_realize" swapped="no"/>
 <child>
 <object class="GtkImage" id="image246">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-save</property>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -276,6 +355,7 @@
 <child type="label">
 <object class="GtkLabel" id="label669">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt; Eject &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
@@ -299,42 +379,48 @@
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="border_width">5</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
 <property name="shadow_type">in</property>
- <signal name="realize" handler="on_scrolledwindow_dvd_audio_realize"/>
+ <signal name="realize" handler="on_scrolledwindow_dvd_audio_realize" swapped="no"/>
 <child>
 <placeholder/>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="padding">5</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox492">
+ <object class="GtkBox" id="vbox492">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkHBox" id="hbox160">
+ <object class="GtkBox" id="hbox160">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkFrame" id="frame187">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment376">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkEventBox" id="eventbox_combobox_normalise_dvd">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
- <object class="GtkComboBox" id="combobox_normalise_dvd">
+ <object class="GtkComboBoxText" id="combobox_normalise_dvd">
 <property name="visible">True</property>
- <signal name="realize" handler="on_combobox_normalise_dvd_realize"/>
+ <property name="can_focus">False</property>
+ <signal name="realize" handler="on_combobox_normalise_dvd_realize" swapped="no"/>
 </object>
 </child>
 </object>
@@ -344,7 +430,8 @@
 <child type="label">
 <object class="GtkLabel" id="label619">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Normaliser &lt;/b&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt; Normalize &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
@@ -359,33 +446,39 @@
 <child>
 <object class="GtkFrame" id="frame109">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment180">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkHBox" id="hbox167">
+ <object class="GtkBox" id="hbox167">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkButton" id="button_deplier_dvd">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_deplier_dvd_clicked"/>
+ <signal name="clicked" handler="on_button_deplier_dvd_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment174">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox162">
+ <object class="GtkBox" id="hbox162">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image82">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-undo</property>
 </object>
 <packing>
@@ -397,7 +490,8 @@
 <child>
 <object class="GtkLabel" id="label217">
 <property name="visible">True</property>
- <property name="label" translatable="yes">Deplier</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Unfold</property>
 <property name="use_underline">True</property>
 </object>
 <packing>
@@ -423,19 +517,22 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_replier_dvd_clicked"/>
+ <signal name="clicked" handler="on_button_replier_dvd_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment175">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox163">
+ <object class="GtkBox" id="hbox163">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image83">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-redo</property>
 </object>
 <packing>
@@ -447,7 +544,8 @@
 <child>
 <object class="GtkLabel" id="label218">
 <property name="visible">True</property>
- <property name="label" translatable="yes">Replier</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Fold</property>
 <property name="use_underline">True</property>
 </object>
 <packing>
@@ -474,6 +572,7 @@
 <child type="label">
 <object class="GtkLabel" id="label222">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="use_markup">True</property>
 </object>
 </child>
@@ -488,27 +587,34 @@
 <child>
 <object class="GtkFrame" id="frame110">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment181">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
- <object class="GtkHBox" id="hbox168">
+ <object class="GtkBox" id="hbox168">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkEventBox" id="eventbox_combobox_sub_dvd">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkComboBox" id="combobox_sub_dvd">
+ <object class="GtkComboBoxText" id="combobox_sub_dvd">
 <property name="visible">True</property>
- <signal name="realize" handler="on_combobox_sub_dvd_realize"/>
+ <property name="can_focus">False</property>
+ <signal name="realize" handler="on_combobox_sub_dvd_realize" swapped="no"/>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="padding">5</property>
 <property name="position">0</property>
 </packing>
@@ -516,14 +622,18 @@
 <child>
 <object class="GtkEventBox" id="eventbox_combobox_ambiance_dvd">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkComboBox" id="combobox_ambiance_dvd">
+ <object class="GtkComboBoxText" id="combobox_ambiance_dvd">
 <property name="visible">True</property>
- <signal name="realize" handler="on_combobox_ambiance_dvd_realize"/>
+ <property name="can_focus">False</property>
+ <signal name="realize" handler="on_combobox_ambiance_dvd_realize" swapped="no"/>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="padding">5</property>
 <property name="position">1</property>
 </packing>
@@ -535,6 +645,7 @@
 <child type="label">
 <object class="GtkLabel" id="label223">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt; Vers 2CH: Sub / Ambiance &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
@@ -550,30 +661,35 @@
 <child>
 <object class="GtkFrame" id="frame184">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment373">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkButton" id="button_extraction_dvd">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_extraction_dvd_clicked"/>
+ <signal name="clicked" handler="on_button_extraction_dvd_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment173">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox161">
+ <object class="GtkBox" id="hbox161">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image81">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-execute</property>
 </object>
 <packing>
@@ -585,7 +701,8 @@
 <child>
 <object class="GtkLabel" id="label216">
 <property name="visible">True</property>
- <property name="label" translatable="yes">Extraire</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Extraction</property>
 <property name="use_underline">True</property>
 </object>
 <packing>
@@ -605,6 +722,7 @@
 <child type="label">
 <object class="GtkLabel" id="label612">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="use_markup">True</property>
 </object>
 </child>
@@ -617,8 +735,8 @@
 </child>
 </object>
 <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -634,6 +752,7 @@
 <child type="tab">
 <object class="GtkLabel" id="label1">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> DVD </property>
 </object>
 <packing>
@@ -641,45 +760,47 @@
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox2">
+ <object class="GtkBox" id="vbox2">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="orientation">vertical</property>
 <child>
- <object class="GtkHBox" id="hbox128">
+ <object class="GtkBox" id="hbox128">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkFrame" id="frame1">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment1">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkHBox" id="hbox5">
+ <object class="GtkBox" id="hbox5">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkEventBox" id="eventbox_combo_peripherique_cd">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
- <object class="GtkComboBox" id="combobox_peripherique_cd">
+ <object class="GtkComboBoxText" id="combobox_peripherique_cd">
 <property name="visible">True</property>
- <property name="model">liststore10</property>
- <signal name="changed" handler="on_combobox_peripherique_cd_changed"/>
- <signal name="realize" handler="on_combobox_peripherique_cd_realize"/>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext10"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_peripherique_cd_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_peripherique_cd_realize" swapped="no"/>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -689,20 +810,23 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_rafraichir_cd_clicked"/>
- <signal name="realize" handler="on_button_rafraichir_cd_realize"/>
+ <signal name="clicked" handler="on_button_rafraichir_cd_clicked" swapped="no"/>
+ <signal name="realize" handler="on_button_rafraichir_cd_realize" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment144">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox129">
+ <object class="GtkBox" id="hbox129">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image74">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-cdrom</property>
 </object>
 <packing>
@@ -714,6 +838,7 @@
 <child>
 <object class="GtkLabel" id="label166">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">Lecture</property>
 <property name="use_underline">True</property>
 </object>
@@ -741,7 +866,8 @@
 <child type="label">
 <object class="GtkLabel" id="label4">
 <property name="visible">True</property>
- <property name="label" translatable="yes"> &lt;b&gt;Choix du peripherique / Lecture du CD&lt;/b&gt; </property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"> &lt;b&gt;Choosing the peripheral / CD playback&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
 </child>
@@ -755,15 +881,18 @@
 <child>
 <object class="GtkFrame" id="frame2">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment2">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkHBox" id="hbox6">
+ <object class="GtkBox" id="hbox6">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkButton" id="button_destination_cd">
@@ -772,10 +901,12 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="use_underline">True</property>
- <signal name="clicked" handler="on_button_destination_cd_clicked"/>
- <signal name="realize" handler="on_button_destination_cd_realize"/>
+ <signal name="clicked" handler="on_button_destination_cd_clicked" swapped="no"/>
+ <signal name="realize" handler="on_button_destination_cd_realize" swapped="no"/>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -786,46 +917,56 @@
 <child type="label">
 <object class="GtkLabel" id="label5">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Destination des fichiers &lt;/b&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt; File Destination &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
 <object class="GtkFrame" id="frame193">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment401">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkHBox" id="hbox2800">
+ <object class="GtkBox" id="hbox2800">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkButton" id="button_eject_cd">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
- <signal name="clicked" handler="on_button_eject_cd_clicked"/>
+ <signal name="clicked" handler="on_button_eject_cd_clicked" swapped="no"/>
+ <signal name="realize" handler="on_button_eject_cd_realize" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment402">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox2801">
+ <object class="GtkBox" id="hbox2801">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image245">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-save</property>
 </object>
 <packing>
@@ -837,6 +978,7 @@
 <child>
 <object class="GtkLabel" id="label668">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="use_underline">True</property>
 </object>
 <packing>
@@ -851,6 +993,8 @@
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -861,6 +1005,7 @@
 <child type="label">
 <object class="GtkLabel" id="label667">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt; Eject &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
@@ -884,15 +1029,15 @@
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="border_width">5</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
 <property name="shadow_type">in</property>
- <signal name="realize" handler="on_scrolledwindow_cd_realize"/>
+ <signal name="realize" handler="on_scrolledwindow_cd_realize" swapped="no"/>
 <child>
 <placeholder/>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="padding">5</property>
 <property name="position">1</property>
 </packing>
@@ -902,242 +1047,208 @@
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="expanded">True</property>
- <signal name="realize" handler="on_expander_cd_realize"/>
+ <signal name="realize" handler="on_expander_cd_realize" swapped="no"/>
 <child>
 <object class="GtkNotebook" id="notebook_expander_cd">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <signal name="realize" handler="on_notebook_expander_cd_realize"/>
- <signal name="switch_page" handler="on_notebook_expander_cd_switch_page"/>
+ <signal name="realize" handler="on_notebook_expander_cd_realize" swapped="no"/>
+ <signal name="switch-page" handler="on_notebook_expander_cd_switch_page" swapped="no"/>
 <child>
- <object class="GtkTable" id="table_tags_expanderCD">
+ <object class="GtkGrid" id="table_tags_expanderCD">
 <property name="visible">True</property>
- <property name="n_rows">4</property>
- <property name="n_columns">4</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkLabel" id="label537">
+ <object class="GtkLabel" id="label19">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;i&gt;Titre:&lt;/i&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;i&gt;Title:&lt;/i&gt;</property>
 <property name="use_markup">True</property>
 </object>
 <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label538">
+ <object class="GtkLabel" id="label20">
 <property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;i&gt;Album:&lt;/i&gt;</property>
 <property name="use_markup">True</property>
 </object>
 <packing>
+ <property name="left_attach">0</property>
 <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label539">
+ <object class="GtkLabel" id="label30">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;i&gt;Artiste:&lt;/i&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;i&gt;Artist:&lt;/i&gt;</property>
 <property name="use_markup">True</property>
 </object>
 <packing>
+ <property name="left_attach">0</property>
 <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label541">
+ <object class="GtkLabel" id="label33">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;i&gt;Comment:&lt;/i&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label58">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"> &lt;i&gt;Annee:&lt;/i&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"> &lt;i&gt;Year:&lt;/i&gt;</property>
 <property name="use_markup">True</property>
 </object>
 <packing>
 <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="top_attach">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label542">
+ <object class="GtkLabel" id="label59">
 <property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> &lt;i&gt;Genre:&lt;/i&gt;</property>
 <property name="use_markup">True</property>
 </object>
 <packing>
 <property name="left_attach">2</property>
- <property name="right_attach">3</property>
 <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label543">
+ <object class="GtkLabel" id="label60">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"> &lt;i&gt;Piste:&lt;/i&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"> &lt;i&gt;Track:&lt;/i&gt;</property>
 <property name="use_markup">True</property>
 </object>
 <packing>
 <property name="left_attach">2</property>
- <property name="right_attach">3</property>
 <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label544">
+ <object class="GtkLabel" id="label61">
 <property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> &lt;i&gt;*.m3u et xspf:&lt;/i&gt; </property>
 <property name="use_markup">True</property>
 </object>
 <packing>
 <property name="left_attach">2</property>
- <property name="right_attach">3</property>
 <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
 </packing>
 </child>
 <child>
 <object class="GtkEntry" id="entry_tag_titre_chanson">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <signal name="changed" handler="on_entry_tag_titre_chanson_changed"/>
- <signal name="realize" handler="on_entry_tag_titre_chanson_realize"/>
+ <property name="hexpand">True</property>
+ <signal name="realize" handler="on_entry_tag_titre_chanson_realize" swapped="no"/>
 </object>
 <packing>
 <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="top_attach">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkEntry" id="entry_tag_titre_album">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <signal name="changed" handler="on_entry_tag_titre_album_changed"/>
- <signal name="realize" handler="on_entry_tag_titre_album_realize"/>
+ <signal name="realize" handler="on_entry_tag_titre_album_realize" swapped="no"/>
 </object>
 <packing>
 <property name="left_attach">1</property>
- <property name="right_attach">2</property>
 <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
 </packing>
 </child>
 <child>
 <object class="GtkEntry" id="entry_tag_nom_artiste">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <signal name="changed" handler="on_entry_tag_nom_artiste_changed"/>
- <signal name="realize" handler="on_entry_tag_nom_artiste_realize"/>
+ <signal name="realize" handler="on_entry_tag_nom_artiste_realize" swapped="no"/>
 </object>
 <packing>
 <property name="left_attach">1</property>
- <property name="right_attach">2</property>
 <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
 </packing>
 </child>
 <child>
 <object class="GtkEntry" id="entry_tag_commentaire">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <signal name="changed" handler="on_entry_tag_commentaire_changed"/>
- <signal name="realize" handler="on_entry_tag_commentaire_realize"/>
+ <signal name="realize" handler="on_entry_tag_commentaire_realize" swapped="no"/>
 </object>
 <packing>
 <property name="left_attach">1</property>
- <property name="right_attach">2</property>
 <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <object class="GtkSpinButton" id="spinbutton_tag_annee">
+ <object class="GtkEntry" id="entry_tag_titre_fichier_m3u">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <property name="adjustment">adjustment8</property>
- <property name="climb_rate">1</property>
- <signal name="value_changed" handler="on_spinbutton_tag_annee_value_changed"/>
- <signal name="realize" handler="on_spinbutton_tag_annee_realize"/>
+ <signal name="realize" handler="on_entry_tag_titre_fichier_m3u_realize" swapped="no"/>
 </object>
 <packing>
 <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="top_attach">3</property>
 </packing>
 </child>
 <child>
- <object class="GtkSpinButton" id="spinbutton_tag_piste">
+ <object class="GtkSpinButton" id="spinbutton_tag_annee">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <property name="adjustment">adjustment7</property>
- <property name="climb_rate">1</property>
- <signal name="value_changed" handler="on_spinbutton_tag_piste_value_changed"/>
- <signal name="realize" handler="on_spinbutton_tag_piste_realize"/>
+ <property name="hexpand">True</property>
+ <signal name="realize" handler="on_spinbutton_tag_annee_realize" swapped="no"/>
+ <signal name="value-changed" handler="on_spinbutton_tag_annee_value_changed" swapped="no"/>
 </object>
 <packing>
 <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="top_attach">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkEntry" id="entry_tag_titre_fichier_m3u">
+ <object class="GtkSpinButton" id="spinbutton_tag_piste">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <signal name="changed" handler="on_entry_tag_titre_fichier_m3u_changed"/>
- <signal name="realize" handler="on_entry_tag_titre_fichier_m3u_realize"/>
+ <signal name="realize" handler="on_spinbutton_tag_piste_realize" swapped="no"/>
+ <signal name="value-changed" handler="on_spinbutton_tag_piste_value_changed" swapped="no"/>
 </object>
 <packing>
 <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="top_attach">2</property>
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox36">
+ <object class="GtkBox" id="box1">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
 <child>
 <object class="GtkEntry" id="entry_tag_genre">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <property name="invisible_char">&#x25CF;</property>
- <signal name="changed" handler="on_entry_tag_genre_changed"/>
- <signal name="realize" handler="on_entry_tag_genre_realize"/>
+ <signal name="realize" handler="on_entry_tag_genre_realize" swapped="no"/>
 </object>
 <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -1146,38 +1257,25 @@
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">True</property>
- <signal name="clicked" handler="on_button_tag_call_popup_clicked"/>
+ <signal name="clicked" handler="on_button_tag_call_popup_clicked" swapped="no"/>
 <child>
- <object class="GtkImage" id="image32">
+ <object class="GtkImage" id="img_button_tag_call_popup">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-info</property>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="left_attach">3</property>
- <property name="right_attach">4</property>
 <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label791">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;i&gt;Commentaire:&lt;/i&gt;</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
 </packing>
 </child>
 </object>
@@ -1185,19 +1283,22 @@
 <child type="tab">
 <object class="GtkLabel" id="label534">
 <property name="visible">True</property>
- <property name="label" translatable="yes"> Modification des tags Freedb </property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Editing tags Freedb</property>
 </object>
 <packing>
 <property name="tab_fill">False</property>
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox_titres_expanderCD">
+ <object class="GtkBox" id="vbox_titres_expanderCD">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkLabel" id="label545">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="tooltip_text" translatable="yes">%a [ %a="Artist" ]
 
 %b [ %b="Album" ]
@@ -1215,6 +1316,8 @@
 <property name="use_markup">True</property>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -1222,8 +1325,8 @@
 <object class="GtkEntry" id="entry_new_titre_cdaudio">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <signal name="changed" handler="on_entry_new_titre_cdaudio_changed"/>
- <signal name="realize" handler="on_entry_new_titre_cdaudio_realize"/>
+ <signal name="changed" handler="on_entry_new_titre_cdaudio_changed" swapped="no"/>
+ <signal name="realize" handler="on_entry_new_titre_cdaudio_realize" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -1239,7 +1342,8 @@
 <child type="tab">
 <object class="GtkLabel" id="label535">
 <property name="visible">True</property>
- <property name="label" translatable="yes"> Arrangement des titres du CD </property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"> Arrangement of CD titles</property>
 </object>
 <packing>
 <property name="position">1</property>
@@ -1247,35 +1351,42 @@
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox_cue">
+ <object class="GtkBox" id="vbox_cue">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkHBox" id="hbox2788">
+ <object class="GtkBox" id="hbox2788">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkFrame" id="frame_options_cue">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment393">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox_options_cue">
+ <object class="GtkBox" id="vbox_options_cue">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
- <object class="GtkHBox" id="hbox2789">
+ <object class="GtkBox" id="hbox2789">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkCheckButton" id="checkbutton_creation_fichier_unique_cue">
- <property name="label" translatable="yes">Creation d'un fichier unique au format: </property>
+ <property name="label" translatable="yes">Creation of a single file format: </property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
 <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_creation_fichier_unique_cue_clicked"/>
+ <signal name="clicked" handler="on_checkbutton_creation_fichier_unique_cue_clicked" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -1286,14 +1397,18 @@
 <child>
 <object class="GtkEventBox" id="eventbox_combobox_choice_file_cue">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkComboBox" id="combobox_choice_file_cue">
+ <object class="GtkComboBoxText" id="combobox_choice_file_cue">
 <property name="visible">True</property>
- <signal name="realize" handler="on_combobox_choice_file_cue_realize"/>
+ <property name="can_focus">False</property>
+ <signal name="realize" handler="on_combobox_choice_file_cue_realize" swapped="no"/>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -1305,12 +1420,15 @@
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox2790">
+ <object class="GtkBox" id="hbox2790">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkLabel" id="label649">
 <property name="visible">True</property>
- <property name="label" translatable="yes"> et dont le nom sera: </property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"> and whose name will be: </property>
+ <property name="angle">0.040000000000000001</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -1322,27 +1440,32 @@
 <object class="GtkEntry" id="entry_name_fichier_unique_cue">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <signal name="changed" handler="on_entry_name_fichier_unique_cue_changed"/>
- <signal name="realize" handler="on_entry_name_fichier_unique_cue_realize"/>
+ <signal name="changed" handler="on_entry_name_fichier_unique_cue_changed" swapped="no"/>
+ <signal name="realize" handler="on_entry_name_fichier_unique_cue_realize" swapped="no"/>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
 <object class="GtkCheckButton" id="checkbutton_creation_fichier_cue">
- <property name="label" translatable="yes">Ecriture du fichier cue</property>
+ <property name="label" translatable="yes">Writing the cue file</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
 <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_creation_fichier_cue_clicked"/>
+ <signal name="clicked" handler="on_checkbutton_creation_fichier_cue_clicked" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -1357,33 +1480,41 @@
 <child type="label">
 <object class="GtkLabel" id="label657">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Au moins deux selections colonne Wav &lt;/b&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt; At least two selections column Wav &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkFrame" id="frame192">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment394">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox508">
+ <object class="GtkBox" id="vbox508">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkLabel" id="label659">
 <property name="visible">True</property>
- <property name="label" translatable="yes">Creation d'un fichier cue
-unique depuis une lecture
-du cd audio</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">
+Creating a cue file from a single
+reading audio cd
+</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -1392,26 +1523,30 @@
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox2791">
+ <object class="GtkBox" id="hbox2791">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkButton" id="button_cue_creation_from_cd">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
- <signal name="clicked" handler="on_button_cue_creation_from_cd_clicked"/>
+ <signal name="clicked" handler="on_button_cue_creation_from_cd_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment395">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox2792">
+ <object class="GtkBox" id="hbox2792">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image239">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-cdrom</property>
 </object>
 <packing>
@@ -1423,7 +1558,8 @@
 <child>
 <object class="GtkLabel" id="label660">
 <property name="visible">True</property>
- <property name="label" translatable="yes">Creation fichier cue uniquement</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">File Creation cue only</property>
 <property name="use_underline">True</property>
 </object>
 <packing>
@@ -1438,7 +1574,8 @@
 </child>
 </object>
 <packing>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -1456,17 +1593,22 @@
 <child type="label">
 <object class="GtkLabel" id="label658">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt; Creation Cue cd &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="padding">5</property>
 <property name="position">0</property>
 </packing>
@@ -1479,7 +1621,8 @@
 <child type="tab">
 <object class="GtkLabel" id="label645">
 <property name="visible">True</property>
- <property name="label" translatable="yes"> Creation d'un fichier unique </property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">  Creation of a single file</property>
 </object>
 <packing>
 <property name="position">2</property>
@@ -1491,7 +1634,8 @@
 <child type="label">
 <object class="GtkLabel" id="label601">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Gestion des tags, titres et fichiers cue&lt;/b&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Management of tags, titles and cue files&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
@@ -1504,29 +1648,35 @@
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox_action_expanderCD">
+ <object class="GtkBox" id="vbox_action_expanderCD">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkHBox" id="hbox2703">
+ <object class="GtkBox" id="hbox2703">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkHBox" id="hbox_cache_cd">
+ <object class="GtkBox" id="hbox_cache_cd">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkFrame" id="frame186">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkEventBox" id="eventbox_combobox_normalise_cd">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
- <object class="GtkComboBox" id="combobox_normalise_cd">
+ <object class="GtkComboBoxText" id="combobox_normalise_cd">
 <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_normalise_cd_changed"/>
- <signal name="realize" handler="on_combobox_normalise_cd_realize"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_normalise_cd_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_normalise_cd_realize" swapped="no"/>
 </object>
 </child>
 </object>
@@ -1534,57 +1684,61 @@
 <child type="label">
 <object class="GtkLabel" id="label618">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Normaliser &lt;/b&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt; normalize &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkFrame" id="frame_serveur_cd">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
- <object class="GtkHBox" id="hbox30">
+ <object class="GtkBox" id="hbox30">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkAlignment" id="alignment92">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="left_padding">5</property>
 <property name="right_padding">5</property>
 <child>
 <object class="GtkEventBox" id="eventbox_combo_serveur_cd">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
- <object class="GtkComboBox" id="combobox_serveur_cd">
+ <object class="GtkComboBoxText" id="combobox_serveur_cd">
 <property name="visible">True</property>
- <property name="model">liststore9</property>
- <signal name="changed" handler="on_combobox_serveur_cd_changed"/>
- <signal name="realize" handler="on_cdaudio_combobox_serveur_cd_realize"/>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext9"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_serveur_cd_changed" swapped="no"/>
+ <signal name="realize" handler="on_cdaudio_combobox_serveur_cd_realize" swapped="no"/>
 </object>
 </child>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkAlignment" id="alignment_cddb_server">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="left_padding">5</property>
 <property name="right_padding">5</property>
 <child>
@@ -1593,12 +1747,14 @@
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="tooltip_text" translatable="yes">definit le serveur a contacter pour les recherches titre</property>
- <signal name="changed" handler="on_entry_cddp_server_changed"/>
- <signal name="realize" handler="on_entry_cddp_server_realize"/>
+ <signal name="changed" handler="on_entry_cddp_server_changed" swapped="no"/>
+ <signal name="realize" handler="on_entry_cddp_server_realize" swapped="no"/>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -1606,19 +1762,21 @@
 <object class="GtkAlignment" id="alignment_cddb_port">
 <property name="width_request">70</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="left_padding">5</property>
 <property name="right_padding">5</property>
 <child>
 <object class="GtkEntry" id="entry_cddb_port">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <property name="invisible_char">&#x25CF;</property>
- <signal name="changed" handler="on_entry_cddb_port_changed"/>
+ <property name="invisible_char">●</property>
+ <signal name="changed" handler="on_entry_cddb_port_changed" swapped="no"/>
 </object>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">2</property>
 </packing>
 </child>
@@ -1628,19 +1786,22 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="tooltip_text" translatable="yes">Parametres par defaut</property>
- <signal name="clicked" handler="on_button_init_cddp_clicked"/>
+ <signal name="clicked" handler="on_button_init_cddp_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment17">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox31">
+ <object class="GtkBox" id="hbox31">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image16">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-refresh</property>
 </object>
 <packing>
@@ -1652,6 +1813,7 @@
 <child>
 <object class="GtkLabel" id="label43">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="use_underline">True</property>
 </object>
 <packing>
@@ -1666,6 +1828,8 @@
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">3</property>
 </packing>
 </child>
@@ -1674,12 +1838,15 @@
 <child type="label">
 <object class="GtkLabel" id="label101">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Serveur &lt;/b&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt; Server &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -1693,26 +1860,21 @@
 <child>
 <object class="GtkFrame" id="frame_discid">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkEventBox" id="eventbox_combobox_discid">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
- <object class="GtkComboBox" id="combobox_discid">
+ <object class="GtkComboBoxText" id="combobox_discid">
 <property name="visible">True</property>
- <property name="tooltip_text" translatable="yes">Choix parmis les differentes bases de donnees pour le CD.</property>
- <property name="model">liststore12</property>
- <signal name="changed" handler="on_combobox_discid_changed"/>
- <signal name="realize" handler="on_combobox_discid_realize"/>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext11"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_discid_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_discid_realize" swapped="no"/>
 </object>
 </child>
 </object>
@@ -1720,6 +1882,7 @@
 <child type="label">
 <object class="GtkLabel" id="label55">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="yalign">0.4699999988079071</property>
 <property name="label" translatable="yes">&lt;b&gt;DiscId&lt;/b&gt;</property>
 <property name="use_markup">True</property>
@@ -1735,12 +1898,14 @@
 <child>
 <object class="GtkFrame" id="frame_action_cd">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment146">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="left_padding">5</property>
 <property name="right_padding">5</property>
 <child>
@@ -1749,20 +1914,23 @@
 <property name="can_focus">True</property>
 <property name="receives_default">True</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_applique_change_clicked"/>
- <signal name="realize" handler="on_button_applique_change_realize"/>
+ <signal name="clicked" handler="on_button_applique_change_clicked" swapped="no"/>
+ <signal name="realize" handler="on_button_applique_change_realize" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment147">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox131">
+ <object class="GtkBox" id="hbox131">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image75">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-execute</property>
 </object>
 <packing>
@@ -1774,7 +1942,8 @@
 <child>
 <object class="GtkLabel" id="label169">
 <property name="visible">True</property>
- <property name="label" translatable="yes">Extraire</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Extract</property>
 <property name="use_underline">True</property>
 </object>
 <packing>
@@ -1794,12 +1963,14 @@
 <child type="label">
 <object class="GtkLabel" id="label168">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">2</property>
 </packing>
 </child>
@@ -1811,20 +1982,25 @@
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox502">
+ <object class="GtkBox" id="vbox502">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkHBox" id="hbox2704">
+ <object class="GtkBox" id="hbox2704">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkLabel" id="label_duree_cd">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label">label_duree_cd</property>
 <property name="use_markup">True</property>
 <property name="justify">center</property>
- <signal name="realize" handler="on_label_duree_cd_realize"/>
+ <signal name="realize" handler="on_label_duree_cd_realize" swapped="no"/>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -1836,14 +2012,18 @@
 <property name="use_markup">True</property>
 <property name="justify">center</property>
 <property name="selectable">True</property>
- <signal name="realize" handler="on_label_titre_cd_realize"/>
+ <signal name="realize" handler="on_label_titre_cd_realize" swapped="no"/>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -1857,6 +2037,7 @@
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">3</property>
 </packing>
 </child>
@@ -1868,6 +2049,7 @@
 <child type="tab">
 <object class="GtkLabel" id="label478">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> CD </property>
 </object>
 <packing>
@@ -1876,41 +2058,48 @@
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox6">
+ <object class="GtkBox" id="vbox6">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="orientation">vertical</property>
 <child>
- <object class="GtkHBox" id="hbox7">
+ <object class="GtkBox" id="hbox7">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkFrame" id="frame158">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment304">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkButton" id="button_import_file">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
- <signal name="clicked" handler="on_button_import_file_clicked"/>
+ <signal name="clicked" handler="on_button_import_file_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment73">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox70">
+ <object class="GtkBox" id="hbox70">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image28">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-open</property>
 </object>
 <packing>
@@ -1922,6 +2111,7 @@
 <child>
 <object class="GtkLabel" id="label80">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="use_underline">True</property>
 </object>
 <packing>
@@ -1941,7 +2131,8 @@
 <child type="label">
 <object class="GtkLabel" id="label472">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Importer &lt;/b&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt; Import &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
@@ -1955,29 +2146,36 @@
 <child>
 <object class="GtkFrame" id="frame51">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment87">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
- <object class="GtkHBox" id="hbox82">
+ <object class="GtkBox" id="hbox82">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="homogeneous">True</property>
 <child>
 <object class="GtkEventBox" id="eventbox_dest_file">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkComboBox" id="combobox_dest_file">
+ <object class="GtkComboBoxText" id="combobox_dest_file">
 <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_dest_file_changed"/>
- <signal name="realize" handler="on_combobox_dest_file_realize"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_dest_file_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_dest_file_realize" swapped="no"/>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -1988,43 +2186,51 @@
 <child type="label">
 <object class="GtkLabel" id="label_combobox_dest_file">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Destination des conversions &lt;/b&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt; Destination conversions &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
 <object class="GtkFrame" id="frame159">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment305">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkButton" id="button_del_file">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
- <signal name="clicked" handler="on_file_button_del_file_clicked"/>
+ <signal name="clicked" handler="on_file_button_del_file_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment182">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox170">
+ <object class="GtkBox" id="hbox170">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image87">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-clear</property>
 </object>
 <packing>
@@ -2036,6 +2242,7 @@
 <child>
 <object class="GtkLabel" id="label224">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="use_underline">True</property>
 </object>
 <packing>
@@ -2055,7 +2262,8 @@
 <child type="label">
 <object class="GtkLabel" id="label473">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Nettoyer &lt;/b&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt; Clean up &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
@@ -2074,29 +2282,32 @@
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox2646">
+ <object class="GtkBox" id="hbox2646">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
 <child>
 <object class="GtkNotebook" id="notebook_in_file">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="tab_pos">bottom</property>
- <signal name="switch_page" handler="on_notebook_in_file_switch_page"/>
+ <signal name="switch-page" handler="on_notebook_in_file_switch_page" swapped="no"/>
 <child>
- <object class="GtkVBox" id="vbox10">
+ <object class="GtkBox" id="vbox10">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkEventBox" id="eventbox_scrollwindow_file">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkScrolledWindow" id="scrolledwindow_file">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
+ <property name="vexpand">True</property>
 <property name="shadow_type">in</property>
- <signal name="realize" handler="on_file_scrolledwindow_file_realize"/>
+ <signal name="realize" handler="on_file_scrolledwindow_file_realize" swapped="no"/>
 <child>
 <placeholder/>
 </child>
@@ -2104,30 +2315,40 @@
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox461">
+ <object class="GtkBox" id="vbox461">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="orientation">vertical</property>
 <child>
- <object class="GtkHBox" id="hbox2746">
+ <object class="GtkBox" id="hbox2746">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkLabel" id="label50">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="label32">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -2137,19 +2358,22 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_apply_file_clicked"/>
+ <signal name="clicked" handler="on_button_apply_file_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment94">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox89">
+ <object class="GtkBox" id="hbox89">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image41">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-execute</property>
 </object>
 <packing>
@@ -2161,6 +2385,7 @@
 <child>
 <object class="GtkLabel" id="label110">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">Appliquer les modifications</property>
 <property name="use_underline">True</property>
 </object>
@@ -2189,24 +2414,20 @@
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox2764">
+ <object class="GtkBox" id="hbox2764">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkEventBox" id="eventbox_combobox_select_type">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
- <object class="GtkComboBox" id="combobox_select_type">
+ <object class="GtkComboBoxText" id="combobox_select_type">
 <property name="visible">True</property>
- <property name="model">liststore8</property>
- <signal name="changed" handler="on_combobox_select_type_changed"/>
- <signal name="realize" handler="on_combobox_select_type_realize"/>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext8"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_select_type_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_select_type_realize" swapped="no"/>
 </object>
 </child>
 </object>
@@ -2219,7 +2440,8 @@
 <child>
 <object class="GtkLabel" id="label623">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Normalise: &lt;/b&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt; Normalize: &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 <packing>
@@ -2231,12 +2453,14 @@
 <child>
 <object class="GtkEventBox" id="eventbox_combobox_normalise_file">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
- <object class="GtkComboBox" id="combobox_normalise_file">
+ <object class="GtkComboBoxText" id="combobox_normalise_file">
 <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_normalise_file_changed"/>
- <signal name="realize" handler="on_combobox_normalise_file_realize"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_normalise_file_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_normalise_file_realize" swapped="no"/>
 </object>
 </child>
 </object>
@@ -2249,7 +2473,8 @@
 <child>
 <object class="GtkLabel" id="label624">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Choix niveau dBFS: &lt;/b&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt; Level selection dBFS: &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 <packing>
@@ -2264,8 +2489,8 @@
 <property name="can_focus">True</property>
 <property name="adjustment">adjustment6</property>
 <property name="climb_rate">1</property>
- <signal name="value_changed" handler="on_spinbutton_choix_niveau_file_value_changed"/>
- <signal name="realize" handler="on_spinbutton_choix_niveau_file_realize"/>
+ <signal name="realize" handler="on_spinbutton_choix_niveau_file_realize" swapped="no"/>
+ <signal name="value-changed" handler="on_spinbutton_choix_niveau_file_value_changed" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -2283,15 +2508,19 @@
 <child>
 <object class="GtkLabel" id="label_number_files">
 <property name="visible">True</property>
- <signal name="realize" handler="on_label_number_files_realize"/>
+ <property name="can_focus">False</property>
+ <signal name="realize" handler="on_label_number_files_realize" swapped="no"/>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">2</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -2300,27 +2529,28 @@
 <child type="tab">
 <object class="GtkLabel" id="label_conversion_notebook_in_file">
 <property name="visible">True</property>
- <property name="label" translatable="yes"> Fichiers </property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">File</property>
 </object>
 <packing>
 <property name="tab_fill">False</property>
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox462">
+ <object class="GtkBox" id="vbox462">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkEventBox" id="eventbox_scrollwindow_file1">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkScrolledWindow" id="scrolledwindow_file_wav">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
 <property name="shadow_type">in</property>
- <signal name="realize" handler="on_scrolledwindow_file_wav_realize"/>
+ <signal name="realize" handler="on_scrolledwindow_file_wav_realize" swapped="no"/>
 <child>
 <placeholder/>
 </child>
@@ -2328,200 +2558,84 @@
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox2760">
+ <object class="GtkBox" id="hbox39">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkTable" id="table1">
+ <object class="GtkLabel" id="label18">
 <property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <child>
- <object class="GtkComboBox" id="combobox_bit_wav">
- <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_bit_wav_changed"/>
- <signal name="realize" handler="on_combobox_bit_wav_realize"/>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="combobox_voie_wav">
- <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_voie_wav_changed"/>
- <signal name="realize" handler="on_combobox_voie_wav_realize"/>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinbutton_frequence_wav">
- <property name="width_request">73</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">adjustment5</property>
- <property name="climb_rate">1</property>
- <signal name="value_changed" handler="on_filewav_spinbutton_frequence_value_changed"/>
- <signal name="realize" handler="on_spinbutton_frequence_wav_realize"/>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label19">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Quantification&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label18">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Voie&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label615">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Frequence - Hertz &lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </object>
- </child>
+ <property name="can_focus">False</property>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label616">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label30">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label33">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label20">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox11">
+ <object class="GtkButton" id="button_apply_wav">
 <property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="border_width">5</property>
+ <signal name="clicked" handler="on_button_apply_file_clicked" swapped="no"/>
 <child>
- <object class="GtkAlignment" id="alignment375">
+ <object class="GtkAlignment" id="alignment74">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
 <child>
- <object class="GtkButton" id="button_apply_wav">
+ <object class="GtkBox" id="hbox71">
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_apply_file_clicked"/>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
 <child>
- <object class="GtkAlignment" id="alignment74">
+ <object class="GtkImage" id="image29">
 <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox71">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image29">
- <property name="visible">True</property>
- <property name="stock">gtk-execute</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label81">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Appliquer les modifications</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-execute</property>
 </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label81">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Apply changes</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
 </child>
 </object>
 </child>
 </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
- <property name="position">5</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -2533,6 +2647,7 @@
 <child type="tab">
 <object class="GtkLabel" id="label436">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> Wav </property>
 </object>
 <packing>
@@ -2541,20 +2656,20 @@
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox463">
+ <object class="GtkBox" id="vbox463">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkEventBox" id="eventbox_scrollwindow_file_mp3ogg">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkScrolledWindow" id="scrolledwindow_file_mp3ogg">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
 <property name="shadow_type">in</property>
- <signal name="realize" handler="on_scrolledwindow_file_mp3ogg_realize"/>
+ <signal name="realize" handler="on_scrolledwindow_file_mp3ogg_realize" swapped="no"/>
 <child>
 <placeholder/>
 </child>
@@ -2562,407 +2677,127 @@
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="padding">5</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox2808">
+ <object class="GtkBox" id="hbox2808">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkFrame" id="frame198">
- <property name="width_request">190</property>
+ <object class="GtkLabel" id="label31">
 <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkAlignment" id="alignment409">
- <property name="visible">True</property>
- <child>
- <object class="GtkTable" id="table9">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <child>
- <object class="GtkLabel" id="label691">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label692">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label693">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment412">
- <property name="visible">True</property>
- <child>
- <object class="GtkEventBox" id="eventbox_combobox_lame_type_bitrate_mp3ogg">
- <property name="visible">True</property>
- <child>
- <object class="GtkComboBox" id="combobox_lame_type_bitrate_mp3ogg">
- <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_lame_type_bitrate_mp3ogg_changed"/>
- <signal name="realize" handler="on_combobox_lame_type_bitrate_mp3ogg_realize"/>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment413">
- <property name="visible">True</property>
- <child>
- <object class="GtkEventBox" id="eventbox_combobox_lame_mode_mp3ogg">
- <property name="visible">True</property>
- <child>
- <object class="GtkComboBox" id="combobox_lame_mode_mp3ogg">
- <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_lame_mode_mp3ogg_changed"/>
- <signal name="realize" handler="on_combobox_lame_mode_mp3ogg_realize"/>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment411">
- <property name="visible">True</property>
- <child>
- <object class="GtkEventBox" id="eventbox_combobox_lame_abr_cbr_vbr_mp3ogg">
- <property name="visible">True</property>
- <child>
- <object class="GtkComboBox" id="combobox_lame_abr_cbr_vbr_mp3ogg">
- <property name="visible">True</property>
- <property name="model">liststore7</property>
- <signal name="changed" handler="on_combobox_lame_abr_cbr_vbr_mp3ogg_changed"/>
- <signal name="realize" handler="on_combobox_lame_abr_cbr_vbr_mp3ogg_realize"/>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext7"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label689">
- <property name="visible">True</property>
- <property name="label" translatable="yes"> &lt;b&gt; Lame (fichier mp3): &lt;/b&gt; </property>
- <property name="use_markup">True</property>
- </object>
- </child>
+ <property name="can_focus">False</property>
 </object>
 <packing>
- <property name="padding">5</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkFrame" id="frame199">
- <property name="width_request">190</property>
+ <object class="GtkButton" id="button_applique_file_mp3ogg">
 <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="border_width">5</property>
+ <signal name="clicked" handler="on_button_apply_file_clicked" swapped="no"/>
 <child>
- <object class="GtkAlignment" id="alignment410">
+ <object class="GtkAlignment" id="alignment89">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
 <child>
- <object class="GtkTable" id="table10">
+ <object class="GtkBox" id="hbox86">
 <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <child>
- <object class="GtkLabel" id="label694">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label695">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label696">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment414">
- <property name="visible">True</property>
- <child>
- <object class="GtkEventBox" id="eventbox_combobox_oggenc_bitrate_mp3ogg">
- <property name="visible">True</property>
- <child>
- <object class="GtkComboBox" id="combobox_oggenc_bitrate_mp3ogg">
- <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_oggenc_bitrate_mp3ogg_changed"/>
- <signal name="realize" handler="on_combobox_oggenc_bitrate_mp3ogg_realize"/>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
 <child>
- <object class="GtkAlignment" id="alignment415">
+ <object class="GtkImage" id="image38">
 <property name="visible">True</property>
- <child>
- <object class="GtkEventBox" id="eventbox_combobox_oggenc_managed_mp3ogg">
- <property name="visible">True</property>
- <child>
- <object class="GtkComboBox" id="combobox_oggenc_managed_mp3ogg">
- <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_oggenc_managed_mp3ogg_changed"/>
- <signal name="realize" handler="on_combobox_oggenc_managed_mp3ogg_realize"/>
- </object>
- </child>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-execute</property>
 </object>
 <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkAlignment" id="alignment416">
+ <object class="GtkLabel" id="label98">
 <property name="visible">True</property>
- <child>
- <object class="GtkEventBox" id="eventbox_combobox_oggenc_downmix_m3ogg">
- <property name="visible">True</property>
- <child>
- <object class="GtkComboBox" id="combobox_oggenc_downmix_m3ogg">
- <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_oggenc_downmix_m3ogg_changed"/>
- <signal name="realize" handler="on_combobox_oggenc_downmix_m3ogg_realize"/>
- </object>
- </child>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Apply</property>
+ <property name="use_underline">True</property>
 </object>
 <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
 </packing>
 </child>
 </object>
 </child>
 </object>
 </child>
- <child type="label">
- <object class="GtkLabel" id="label690">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Oggenc (fichier ogg): &lt;/b&gt; </property>
- <property name="use_markup">True</property>
- </object>
- </child>
 </object>
 <packing>
- <property name="padding">5</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox517">
+ <object class="GtkButton" id="button_efface_bitrate_mp3ogg">
 <property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="border_width">5</property>
+ <signal name="clicked" handler="on_filemp3ogg_button_efface_bitrate_clicked" swapped="no"/>
 <child>
- <object class="GtkButton" id="button_applique_file_mp3ogg">
+ <object class="GtkAlignment" id="alignment91">
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_apply_file_clicked"/>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
 <child>
- <object class="GtkAlignment" id="alignment89">
+ <object class="GtkBox" id="hbox88">
 <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
 <child>
- <object class="GtkHBox" id="hbox86">
+ <object class="GtkImage" id="image40">
 <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image38">
- <property name="visible">True</property>
- <property name="stock">gtk-execute</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label98">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Appliquer</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-clear</property>
 </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
 </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button_efface_bitrate_mp3ogg">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="border_width">5</property>
- <signal name="clicked" handler="on_filemp3ogg_button_efface_bitrate_clicked"/>
- <child>
- <object class="GtkAlignment" id="alignment91">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox88">
+ <object class="GtkLabel" id="label100">
 <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image40">
- <property name="visible">True</property>
- <property name="stock">gtk-clear</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label100">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Effacer</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Delete</property>
+ <property name="use_underline">True</property>
 </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
 </child>
 </object>
 </child>
 </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label31">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
 </child>
 </object>
 <packing>
@@ -2987,6 +2822,7 @@
 <child type="tab">
 <object class="GtkLabel" id="label437">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> Mp3-Ogg </property>
 </object>
 <packing>
@@ -2995,20 +2831,20 @@
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox12">
+ <object class="GtkBox" id="vbox12">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkEventBox" id="eventbox_scrollwindow_tags_file">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkScrolledWindow" id="scrolledwindow_tags_file">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
 <property name="shadow_type">in</property>
- <signal name="realize" handler="on_scrolledwindow_tags_file_realize"/>
+ <signal name="realize" handler="on_scrolledwindow_tags_file_realize" swapped="no"/>
 <child>
 <placeholder/>
 </child>
@@ -3016,231 +2852,236 @@
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox464">
+ <object class="GtkBox" id="vbox464">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="homogeneous">True</property>
 <child>
- <object class="GtkTable" id="table_tag">
+ <object class="GtkGrid" id="table_tag">
 <property name="visible">True</property>
- <property name="n_rows">4</property>
- <property name="n_columns">4</property>
- <signal name="realize" handler="on_table_tag_realize"/>
+ <property name="can_focus">False</property>
+ <signal name="realize" handler="on_table_tag_realize" swapped="no"/>
 <child>
- <object class="GtkLabel" id="label460">
+ <object class="GtkLabel" id="label62">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Titre:</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Title:</property>
 </object>
 <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label461">
+ <object class="GtkLabel" id="label63">
 <property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">Album:</property>
 </object>
 <packing>
+ <property name="left_attach">0</property>
 <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label462">
+ <object class="GtkLabel" id="label64">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Artiste:</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Artist:</property>
 </object>
 <packing>
+ <property name="left_attach">0</property>
 <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label463">
+ <object class="GtkLabel" id="label65">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Commentaire:</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Comment:</property>
 </object>
 <packing>
+ <property name="left_attach">0</property>
 <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label464">
+ <object class="GtkLabel" id="label66">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"> Annee:</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"> Year:</property>
 </object>
 <packing>
 <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="top_attach">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label465">
+ <object class="GtkLabel" id="label67">
 <property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> Genre:</property>
 </object>
 <packing>
 <property name="left_attach">2</property>
- <property name="right_attach">3</property>
 <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label466">
+ <object class="GtkLabel" id="label68">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"> Piste:</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"> Track:</property>
 </object>
 <packing>
 <property name="left_attach">2</property>
- <property name="right_attach">3</property>
 <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label467">
+ <object class="GtkLabel" id="label69">
 <property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> Modif.:</property>
 </object>
 <packing>
 <property name="left_attach">2</property>
- <property name="right_attach">3</property>
 <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
 </packing>
 </child>
 <child>
 <object class="GtkEntry" id="entry_tag_title_file">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <signal name="changed" handler="on_entry_tag_title_file_changed"/>
- <signal name="realize" handler="on_entry_tag_title_file_realize"/>
+ <property name="hexpand">True</property>
+ <signal name="realize" handler="on_entry_tag_title_file_realize" swapped="no"/>
 </object>
 <packing>
 <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="top_attach">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkEntry" id="entry_tag_album_file">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <signal name="changed" handler="on_entry_tag_album_file_changed"/>
- <signal name="realize" handler="on_entry_tag_album_file_realize"/>
+ <signal name="realize" handler="on_entry_tag_album_file_realize" swapped="no"/>
 </object>
 <packing>
 <property name="left_attach">1</property>
- <property name="right_attach">2</property>
 <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
 </packing>
 </child>
 <child>
 <object class="GtkEntry" id="entry_tag_artist_file">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <signal name="changed" handler="on_entry_tag_artist_file_changed"/>
- <signal name="realize" handler="on_entry_tag_artist_file_realize"/>
+ <signal name="realize" handler="on_entry_tag_artist_file_realize" swapped="no"/>
 </object>
 <packing>
 <property name="left_attach">1</property>
- <property name="right_attach">2</property>
 <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
 </packing>
 </child>
 <child>
 <object class="GtkEntry" id="entry_tag_comment_file">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <signal name="changed" handler="on_entry_tag_comment_file_changed"/>
- <signal name="realize" handler="on_entry_tag_comment_file_realize"/>
+ <signal name="realize" handler="on_entry_tag_comment_file_realize" swapped="no"/>
 </object>
 <packing>
 <property name="left_attach">1</property>
- <property name="right_attach">2</property>
 <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <object class="GtkSpinButton" id="spinbutton_tag_track_file">
+ <object class="GtkBox" id="box2">
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">adjustment4</property>
- <property name="climb_rate">1</property>
- <signal name="changed" handler="on_spinbutton_tag_track_file_changed"/>
- <signal name="realize" handler="on_spinbutton_tag_track_file_realize"/>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkEntry" id="entry_tag_genre_file">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <signal name="realize" handler="on_entry_tag_genre_file_realize" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_tag_call_popup_file">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="on_button_tag_call_popup_file_clicked" swapped="no"/>
+ <child>
+ <object class="GtkImage" id="img_button_tag_call_popup1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-info</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
 </object>
 <packing>
 <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">1</property>
 </packing>
 </child>
 <child>
 <object class="GtkSpinButton" id="spinbutton_tag_year_file">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <property name="adjustment">adjustment3</property>
- <property name="climb_rate">1</property>
- <signal name="changed" handler="on_spinbutton_tag_year_file_changed"/>
- <signal name="realize" handler="on_spinbutton_tag_year_file_realize"/>
+ <property name="hexpand">True</property>
+ <signal name="realize" handler="on_spinbutton_tag_year_file_realize" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinbutton_tag_track_file">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <signal name="realize" handler="on_spinbutton_tag_track_file_realize" swapped="no"/>
 </object>
 <packing>
 <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">2</property>
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox2671">
+ <object class="GtkBox" id="box3">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkLabel" id="label_tag_change">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;0&lt;/b&gt;</property>
 <property name="use_markup">True</property>
- <signal name="realize" handler="on_label_tag_change_realize"/>
+ <signal name="realize" handler="on_label_tag_change_realize" swapped="no"/>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -3248,90 +3089,62 @@
 <object class="GtkButton" id="button_tag_appliquer">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <signal name="clicked" handler="on_button_apply_file_clicked"/>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="on_button_apply_file_clicked" swapped="no"/>
 <child>
- <object class="GtkAlignment" id="alignment302">
+ <object class="GtkBox" id="box4">
 <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkHBox" id="hbox2669">
+ <object class="GtkLabel" id="label70">
 <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image149">
- <property name="visible">True</property>
- <property name="stock">gtk-execute</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label468">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Appliquer</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Apply </property>
 </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image32">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-apply</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
 </child>
 </object>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="left_attach">3</property>
- <property name="right_attach">4</property>
 <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkEventBox" id="eventbox_combobox_tag_genre_file">
- <property name="visible">True</property>
- <child>
- <object class="GtkComboBox" id="combobox_tag_genre_file">
- <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_tag_genre_file_changed"/>
- <signal name="realize" handler="on_combobox_tag_genre_file_realize"/>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -3343,6 +3156,7 @@
 <child type="tab">
 <object class="GtkLabel" id="label21">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> Tags </property>
 </object>
 <packing>
@@ -3352,11 +3166,15 @@
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -3368,7 +3186,8 @@
 <child type="tab">
 <object class="GtkLabel" id="label479">
 <property name="visible">True</property>
- <property name="label" translatable="yes"> Fichiers </property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"> Files </property>
 </object>
 <packing>
 <property name="position">2</property>
@@ -3376,40 +3195,47 @@
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox_split">
+ <object class="GtkBox" id="vbox_split">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
- <object class="GtkHBox" id="hbox242">
+ <object class="GtkBox" id="hbox242">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkFrame" id="frame157">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment273">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkButton" id="button_importer_split">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
- <signal name="clicked" handler="on_button_importer_split_clicked"/>
+ <signal name="clicked" handler="on_button_importer_split_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment274">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox260">
+ <object class="GtkBox" id="hbox260">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image129">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-open</property>
 </object>
 <packing>
@@ -3421,6 +3247,7 @@
 <child>
 <object class="GtkLabel" id="label420">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="use_underline">True</property>
 </object>
 <packing>
@@ -3440,7 +3267,8 @@
 <child type="label">
 <object class="GtkLabel" id="label419">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Importer &lt;/b&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt; Import &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
@@ -3454,16 +3282,19 @@
 <child>
 <object class="GtkFrame" id="frame156">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment272">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
- <object class="GtkHBox" id="hbox18">
+ <object class="GtkBox" id="hbox18">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkButton" id="button_destination_split">
 <property name="label">button1</property>
@@ -3471,10 +3302,12 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="use_underline">True</property>
- <signal name="clicked" handler="on_button_destination_split_clicked"/>
- <signal name="realize" handler="on_button_destination_split_realize"/>
+ <signal name="clicked" handler="on_button_destination_split_clicked" swapped="no"/>
+ <signal name="realize" handler="on_button_destination_split_realize" swapped="no"/>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -3485,12 +3318,15 @@
 <child type="label">
 <object class="GtkLabel" id="label418">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Destination des fichiers &lt;/b&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;   File Destination &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -3502,24 +3338,28 @@
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox16">
+ <object class="GtkBox" id="vbox16">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkAlignment" id="alignment16">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkEventBox" id="eventbox_splitspectre_chrono">
 <property name="visible">True</property>
- <signal name="expose_event" handler="on_eventbox_splitspectre_chrono_expose_event"/>
- <signal name="event" handler="on_eventbox_splitspectre_chrono_event"/>
+ <property name="can_focus">False</property>
+ <signal name="draw" handler="on_eventbox_splitspectre_chrono_draw" swapped="no"/>
+ <signal name="event" handler="on_eventbox_splitspectre_chrono_event" swapped="no"/>
 <child>
 <object class="GtkImage" id="image_splitspectre_chrono">
 <property name="height_request">18</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gnome-stock-blank</property>
- <signal name="realize" handler="on_image_splitspectre_chrono_realize"/>
+ <signal name="realize" handler="on_image_splitspectre_chrono_realize" swapped="no"/>
 </object>
 </child>
 </object>
@@ -3527,25 +3367,29 @@
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkAlignment" id="alignment32">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkEventBox" id="eventbox_splitspectre_top">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK</property>
- <signal name="expose_event" handler="on_eventbox_splitspectre_top_expose_event"/>
- <signal name="event" handler="on_eventbox_splitspectre_top_event"/>
+ <signal name="draw" handler="on_eventbox_splitspectre_top_draw" swapped="no"/>
+ <signal name="event" handler="on_eventbox_splitspectre_top_event" swapped="no"/>
 <child>
 <object class="GtkImage" id="image_splitspectre_top">
 <property name="height_request">18</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK</property>
 <property name="stock">gnome-stock-blank</property>
- <signal name="realize" handler="on_image_splitspectre_top_realize"/>
+ <signal name="realize" handler="on_image_splitspectre_top_realize" swapped="no"/>
 </object>
 </child>
 </object>
@@ -3553,21 +3397,25 @@
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
 <object class="GtkViewport" id="viewport_splitspectre">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK | GDK_TOUCH_MASK | GDK_SMOOTH_SCROLL_MASK</property>
 <property name="resize_mode">queue</property>
 <property name="shadow_type">none</property>
 <child>
 <object class="GtkEventBox" id="eventbox_splitspectre">
 <property name="visible">True</property>
- <property name="events">GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK</property>
- <property name="extension_events">all</property>
- <signal name="expose_event" handler="on_eventbox_splitspectre_expose_event"/>
- <signal name="event" handler="on_eventbox_splitspectre_event"/>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK | GDK_TOUCH_MASK | GDK_SMOOTH_SCROLL_MASK</property>
+ <property name="vexpand">True</property>
+ <signal name="draw" handler="on_eventbox_splitspectre_draw" swapped="no"/>
+ <signal name="event" handler="on_eventbox_splitspectre_event" swapped="no"/>
 <child>
 <object class="GtkImage" id="image_splitspectre">
 <property name="visible">True</property>
@@ -3575,62 +3423,68 @@
 <property name="has_focus">True</property>
 <property name="is_focus">True</property>
 <property name="can_default">True</property>
- <property name="events">GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK</property>
- <property name="extension_events">all</property>
 <property name="stock">gnome-stock-blank</property>
- <signal name="realize" handler="on_image_split_spectre_realize"/>
+ <signal name="realize" handler="on_image_split_spectre_realize" swapped="no"/>
 </object>
 </child>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">2</property>
 </packing>
 </child>
 <child>
 <object class="GtkAlignment" id="alignment387">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkScrolledWindow" id="scrolledwindow_splitspectre">
+ <object class="GtkScrollbar" id="scrollbar_split">
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="vscrollbar_policy">never</property>
- <property name="window_placement_set">True</property>
- <signal name="event" handler="on_scrolledwindow_splitspectre_event"/>
- <child>
- <placeholder/>
- </child>
+ <property name="can_focus">False</property>
+ <signal name="event" handler="on_scrollbar_split_event" swapped="no"/>
+ <signal name="realize" handler="on_scrollbar_split_realize" swapped="no"/>
 </object>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">False</property>
 <property name="position">3</property>
 </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox460">
+ <object class="GtkBox" id="vbox460">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
 <child>
- <object class="GtkHBox" id="hbox21">
+ <object class="GtkBox" id="hbox21">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkFrame" id="frame3">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment18">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox8">
+ <object class="GtkBox" id="vbox8">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkButton" id="button_play_begin_split">
@@ -3638,19 +3492,22 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="tooltip_text" translatable="yes">Lecture de 5 secondes apres le marqueur de debut</property>
- <signal name="clicked" handler="on_button_play_begin_split_clicked"/>
+ <signal name="clicked" handler="on_button_play_begin_split_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment26">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox22">
+ <object class="GtkBox" id="hbox22">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image8">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-goto-last</property>
 </object>
 <packing>
@@ -3662,6 +3519,7 @@
 <child>
 <object class="GtkLabel" id="label40">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="use_underline">True</property>
 </object>
 <packing>
@@ -3677,18 +3535,21 @@
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="label_begin_time_split">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="tooltip_text" translatable="yes">Index de debut</property>
 <property name="label" translatable="yes">00h00m00s</property>
 <property name="use_markup">True</property>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="padding">5</property>
 <property name="position">1</property>
 </packing>
@@ -3700,30 +3561,36 @@
 <child type="label">
 <object class="GtkLabel" id="label35">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkFrame" id="frame11">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment21">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox19">
+ <object class="GtkBox" id="vbox19">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
- <object class="GtkHBox" id="hbox24">
+ <object class="GtkBox" id="hbox24">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="homogeneous">True</property>
 <child>
 <object class="GtkButton" id="button_play_split">
@@ -3731,19 +3598,22 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="tooltip_text" translatable="yes">lecture</property>
- <signal name="clicked" handler="on_button_play_split_clicked"/>
+ <signal name="clicked" handler="on_button_play_split_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment28">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox25">
+ <object class="GtkBox" id="hbox25">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image10">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-media-play</property>
 </object>
 <packing>
@@ -3755,6 +3625,7 @@
 <child>
 <object class="GtkLabel" id="label45">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="use_underline">True</property>
 </object>
 <packing>
@@ -3770,6 +3641,7 @@
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -3779,19 +3651,22 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="tooltip_text" translatable="yes">Pause</property>
- <signal name="clicked" handler="on_button_pause_split_clicked"/>
+ <signal name="clicked" handler="on_button_pause_split_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment29">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox29">
+ <object class="GtkBox" id="hbox29">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image12">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-media-pause</property>
 </object>
 <packing>
@@ -3803,6 +3678,7 @@
 <child>
 <object class="GtkLabel" id="label46">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="use_underline">True</property>
 </object>
 <packing>
@@ -3818,6 +3694,7 @@
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -3831,11 +3708,13 @@
 <child>
 <object class="GtkLabel" id="label_curseur_lecture_split">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="tooltip_text" translatable="yes">Index de lecture</property>
 <property name="label" translatable="yes">label</property>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="padding">5</property>
 <property name="position">1</property>
 </packing>
@@ -3847,26 +3726,31 @@
 <child type="label">
 <object class="GtkLabel" id="label38">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
 <object class="GtkFrame" id="frame6">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment19">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox17">
+ <object class="GtkBox" id="vbox17">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkButton" id="button_play_end_split">
@@ -3874,19 +3758,22 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="tooltip_text" translatable="yes">Lecture de 5 secondes avant le marqueur de fin</property>
- <signal name="clicked" handler="on_button_play_end_split_clicked"/>
+ <signal name="clicked" handler="on_button_play_end_split_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment27">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox23">
+ <object class="GtkBox" id="hbox23">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image9">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-goto-first</property>
 </object>
 <packing>
@@ -3898,6 +3785,7 @@
 <child>
 <object class="GtkLabel" id="label44">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="use_underline">True</property>
 </object>
 <packing>
@@ -3913,18 +3801,21 @@
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="label_end_time_split">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="tooltip_text" translatable="yes">Index de fin</property>
 <property name="label" translatable="yes">00h00m00s</property>
 <property name="use_markup">True</property>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="padding">5</property>
 <property name="position">1</property>
 </packing>
@@ -3936,45 +3827,56 @@
 <child type="label">
 <object class="GtkLabel" id="label36">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">2</property>
 </packing>
 </child>
 <child>
 <object class="GtkFrame" id="frame10">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment20">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox18">
+ <object class="GtkBox" id="vbox18">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkLabel" id="label_nmr_plage_split">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">Plage</property>
 <property name="use_markup">True</property>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="label_time_split">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="tooltip_text" translatable="yes">Duree de la plage active</property>
 <property name="label" translatable="yes">00h00m00s</property>
 <property name="use_markup">True</property>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="padding">9</property>
 <property name="position">1</property>
 </packing>
@@ -3986,26 +3888,31 @@
 <child type="label">
 <object class="GtkLabel" id="label37">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">3</property>
 </packing>
 </child>
 <child>
 <object class="GtkFrame" id="frame12">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment22">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkLabel" id="label_temps_actuel_curseur_split">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="use_markup">True</property>
 </object>
 </child>
@@ -4014,25 +3921,31 @@
 <child type="label">
 <object class="GtkLabel" id="label39">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">4</property>
 </packing>
 </child>
 <child>
 <object class="GtkFrame" id="frame13">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment30">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox24">
+ <object class="GtkBox" id="vbox24">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkButton" id="button_del_cut_split">
@@ -4040,19 +3953,22 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="tooltip_text" translatable="yes">Suprimer tous les marqueurs pour les remplacer par un marqueur unique</property>
- <signal name="clicked" handler="on_button_del_cut_split_clicked"/>
+ <signal name="clicked" handler="on_button_del_cut_split_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment12">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox20">
+ <object class="GtkBox" id="hbox20">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image7">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-clear</property>
 </object>
 <packing>
@@ -4064,6 +3980,7 @@
 <child>
 <object class="GtkLabel" id="label2">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="use_underline">True</property>
 </object>
 <packing>
@@ -4093,26 +4010,31 @@
 <child type="label">
 <object class="GtkLabel" id="label48">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">5</property>
 </packing>
 </child>
 <child>
 <object class="GtkFrame" id="frame14">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment31">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox25">
+ <object class="GtkBox" id="vbox25">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkButton" id="button_gen_cue_split">
@@ -4120,19 +4042,22 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="tooltip_text" translatable="yes">Le fichier CUE sera enregistre vers 'Destination des fichiers'.</property>
- <signal name="clicked" handler="on_button_gen_cue_split_clicked"/>
+ <signal name="clicked" handler="on_button_gen_cue_split_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment23">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox26">
+ <object class="GtkBox" id="hbox26">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image14">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-cdrom</property>
 </object>
 <packing>
@@ -4144,7 +4069,8 @@
 <child>
 <object class="GtkLabel" id="label41">
 <property name="visible">True</property>
- <property name="label" translatable="yes">Production fichier Cue</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Production Cue file</property>
 <property name="use_underline">True</property>
 </object>
 <packing>
@@ -4170,19 +4096,22 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="tooltip_text" translatable="yes">Le resultat du Split sera dirige vers 'Destination des fichiers'.</property>
- <signal name="clicked" handler="on_button_action_split_clicked"/>
+ <signal name="clicked" handler="on_button_action_split_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment24">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox27">
+ <object class="GtkBox" id="hbox27">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image15">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-execute</property>
 </object>
 <packing>
@@ -4194,6 +4123,7 @@
 <child>
 <object class="GtkLabel" id="label42">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">Split</property>
 <property name="use_underline">True</property>
 </object>
@@ -4210,6 +4140,7 @@
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -4220,17 +4151,21 @@
 <child type="label">
 <object class="GtkLabel" id="label49">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">6</property>
 </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -4249,6 +4184,7 @@
 <child type="tab">
 <object class="GtkLabel" id="label480">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> Split </property>
 </object>
 <packing>
@@ -4257,18 +4193,21 @@
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox3">
+ <object class="GtkBox" id="vbox3">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
- <object class="GtkHPaned" id="hpaned_poche">
+ <object class="GtkPaned" id="hpaned_poche">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="position">100</property>
+ <property name="position_set">True</property>
 <child>
- <object class="GtkVBox" id="vbox4">
+ <object class="GtkBox" id="vbox4">
 <property name="width_request">360</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">6</property>
 <property name="orientation">vertical</property>
 <child>
@@ -4277,27 +4216,32 @@
 <child>
 <object class="GtkFrame" id="frame5">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">2</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
- <object class="GtkHBox" id="hbox4">
+ <object class="GtkBox" id="hbox4">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkAlignment" id="alignment3">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkEntry" id="entry_titre">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <property name="invisible_char">&#x25CF;</property>
- <signal name="changed" handler="on_entry_titre_changed"/>
- <signal name="realize" handler="on_entry_titre_realize"/>
+ <property name="invisible_char">●</property>
+ <signal name="changed" handler="on_entry_titre_changed" swapped="no"/>
+ <signal name="realize" handler="on_entry_titre_realize" swapped="no"/>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -4308,10 +4252,11 @@
 <property name="receives_default">True</property>
 <property name="tooltip_text" translatable="yes">Importation du titre du CD.</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_import_title_cd_clicked"/>
+ <signal name="clicked" handler="on_button_import_title_cd_clicked" swapped="no"/>
 <child>
 <object class="GtkImage" id="image21">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-cdrom</property>
 </object>
 </child>
@@ -4327,7 +4272,8 @@
 <child type="label">
 <object class="GtkLabel" id="label7">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Titre CD&lt;/b&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Title CD&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
@@ -4339,18 +4285,20 @@
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox3">
+ <object class="GtkBox" id="hbox3">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkButton" id="button_change_font">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">True</property>
 <property name="tooltip_text" translatable="yes">Choix d'une nouvelle police.</property>
- <signal name="clicked" handler="on_button_change_font_clicked"/>
+ <signal name="clicked" handler="on_button_change_font_clicked" swapped="no"/>
 <child>
 <object class="GtkImage" id="image13">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-select-font</property>
 </object>
 </child>
@@ -4368,10 +4316,11 @@
 <property name="can_focus">True</property>
 <property name="receives_default">True</property>
 <property name="tooltip_text" translatable="yes">Texte gras.</property>
- <signal name="clicked" handler="on_togglebutton_font_bold_clicked"/>
+ <signal name="clicked" handler="on_togglebutton_font_bold_clicked" swapped="no"/>
 <child>
 <object class="GtkImage" id="image2">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-bold</property>
 </object>
 </child>
@@ -4389,10 +4338,11 @@
 <property name="can_focus">True</property>
 <property name="receives_default">True</property>
 <property name="tooltip_text" translatable="yes">Texte italique.</property>
- <signal name="clicked" handler="on_togglebutton_font_italic_clicked"/>
+ <signal name="clicked" handler="on_togglebutton_font_italic_clicked" swapped="no"/>
 <child>
 <object class="GtkImage" id="image3">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-italic</property>
 </object>
 </child>
@@ -4405,14 +4355,15 @@
 </packing>
 </child>
 <child>
- <object class="GtkComboBox" id="combobox_choice_get_cd">
+ <object class="GtkComboBoxText" id="combobox_choice_get_cd">
 <property name="visible">True</property>
- <property name="tooltip_text" translatable="yes">Apres une lecture de CD et un ajout d'etiquette, ce menu permet la mise en forme des titres, auteurs ...</property>
- <signal name="changed" handler="on_combobox_choice_get_cd_changed"/>
- <signal name="realize" handler="on_combobox_choice_get_cd_realize"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_choice_get_cd_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_choice_get_cd_realize" swapped="no"/>
 </object>
 <packing>
- <property name="padding">1</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">3</property>
 </packing>
 </child>
@@ -4422,10 +4373,11 @@
 <property name="can_focus">True</property>
 <property name="receives_default">True</property>
 <property name="tooltip_text" translatable="yes">Ajouter du texte editable.</property>
- <signal name="clicked" handler="on_button_text_add_clicked"/>
+ <signal name="clicked" handler="on_button_text_add_clicked" swapped="no"/>
 <child>
 <object class="GtkImage" id="image4">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-add</property>
 </object>
 </child>
@@ -4447,24 +4399,24 @@
 <child>
 <object class="GtkFrame" id="frame_texte_poche">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">2</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment4">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkScrolledWindow" id="scrolledwindow2">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="border_width">5</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
 <child>
 <object class="GtkTextView" id="textview_poche">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <signal name="realize" handler="on_textview_poche_realize"/>
+ <signal name="realize" handler="on_textview_poche_realize" swapped="no"/>
 </object>
 </child>
 </object>
@@ -4474,27 +4426,33 @@
 <child type="label">
 <object class="GtkLabel" id="label6">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Texte&lt;/b&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Text&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">3</property>
 </packing>
 </child>
 <child>
- <object class="GtkFrame" id="frame7">
+ <object class="GtkFrame" id="frame_import_img_web">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">2</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
- <object class="GtkHBox" id="hbox2">
+ <object class="GtkBox" id="hbox2">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkAlignment" id="alignment6">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="left_padding">5</property>
 <property name="right_padding">5</property>
 <child>
@@ -4502,19 +4460,22 @@
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="tooltip_text" translatable="yes">Saisissez ici un critere de recherche d'images.</property>
- <property name="invisible_char">&#x25CF;</property>
- <signal name="changed" handler="on_entry_img_web_changed"/>
- <signal name="realize" handler="on_entry_img_web_realize"/>
+ <property name="invisible_char">●</property>
+ <signal name="changed" handler="on_entry_img_web_changed" swapped="no"/>
+ <signal name="realize" handler="on_entry_img_web_realize" swapped="no"/>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkAlignment" id="alignment7">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkButton" id="button_import_img_web">
 <property name="visible">True</property>
@@ -4522,10 +4483,11 @@
 <property name="receives_default">True</property>
 <property name="tooltip_text" translatable="yes">Importation des images depuis le Web.</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_import_img_web_clicked"/>
+ <signal name="clicked" handler="on_button_import_img_web_clicked" swapped="no"/>
 <child>
 <object class="GtkImage" id="image19">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-yes</property>
 </object>
 </child>
@@ -4543,7 +4505,8 @@
 <child type="label">
 <object class="GtkLabel" id="label8">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Import images web&lt;/b&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Import web images &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
@@ -4561,25 +4524,31 @@
 </packing>
 </child>
 <child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="width_request">600</property>
+ <object class="GtkEventBox" id="eventbox_poche">
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkViewport" id="viewport1">
+ <object class="GtkScrolledWindow" id="scrolledwindow_poche">
 <property name="visible">True</property>
- <property name="resize_mode">queue</property>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">in</property>
+ <signal name="draw" handler="on_scrolledwindow_poche_draw" swapped="no"/>
 <child>
- <object class="GtkDrawingArea" id="drawingareamain">
+ <object class="GtkViewport" id="viewport1">
 <property name="visible">True</property>
- <property name="events">GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK</property>
- <signal name="expose_event" handler="on_drawingareamain_expose_event"/>
- <signal name="button_press_event" handler="on_drawingareamain_button_press_event"/>
- <signal name="realize" handler="on_drawingareamain_realize"/>
- <signal name="button_release_event" handler="on_drawingareamain_button_release_event"/>
- <signal name="motion_notify_event" handler="on_drawingareamain_motion_notify_event"/>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkDrawingArea" id="drawingareamain">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK | GDK_TOUCH_MASK | GDK_SMOOTH_SCROLL_MASK</property>
+ <signal name="button-press-event" handler="on_drawingareamain_button_press_event" swapped="no"/>
+ <signal name="button-release-event" handler="on_drawingareamain_button_release_event" swapped="no"/>
+ <signal name="draw" handler="on_drawingareamain_draw" after="yes" swapped="no"/>
+ <signal name="motion-notify-event" handler="on_drawingareamain_motion_notify_event" swapped="no"/>
+ <signal name="realize" handler="on_drawingareamain_realize" swapped="no"/>
+ </object>
+ </child>
 </object>
 </child>
 </object>
@@ -4587,27 +4556,31 @@
 </object>
 <packing>
 <property name="resize">True</property>
- <property name="shrink">False</property>
+ <property name="shrink">True</property>
 </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox8">
+ <object class="GtkBox" id="hbox8">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkButton" id="button_erase">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">True</property>
 <property name="tooltip_text" translatable="yes">Supprimer l'image en selection</property>
- <signal name="clicked" handler="on_button_erase_clicked"/>
+ <signal name="clicked" handler="on_button_erase_clicked" swapped="no"/>
 <child>
 <object class="GtkImage" id="image5">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-clear</property>
 </object>
 </child>
@@ -4625,10 +4598,11 @@
 <property name="can_focus">True</property>
 <property name="receives_default">True</property>
 <property name="tooltip_text" translatable="yes">AJouter de nouvelles images.</property>
- <signal name="clicked" handler="on_button_load_file_clicked"/>
+ <signal name="clicked" handler="on_button_load_file_clicked" swapped="no"/>
 <child>
 <object class="GtkImage" id="image6">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="tooltip_text" translatable="yes">Ouvre un fichier</property>
 <property name="stock">gtk-open</property>
 </object>
@@ -4647,10 +4621,11 @@
 <property name="can_focus">True</property>
 <property name="receives_default">True</property>
 <property name="tooltip_text" translatable="yes">Enregistrer la page au format png.</property>
- <signal name="clicked" handler="on_button_save_clicked"/>
+ <signal name="clicked" handler="on_button_save_clicked" swapped="no"/>
 <child>
 <object class="GtkImage" id="image11">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="tooltip_text" translatable="yes">Sauvegarde le fichier</property>
 <property name="stock">gtk-save</property>
 </object>
@@ -4669,10 +4644,11 @@
 <property name="can_focus">True</property>
 <property name="receives_default">True</property>
 <property name="tooltip_text" translatable="yes">Diminution de l'echelle.</property>
- <signal name="clicked" handler="on_button_moins_clicked"/>
+ <signal name="clicked" handler="on_button_moins_clicked" swapped="no"/>
 <child>
 <object class="GtkImage" id="image17">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="tooltip_text" translatable="yes">Reduit l'agrandissement</property>
 <property name="stock">gtk-zoom-out</property>
 </object>
@@ -4691,10 +4667,11 @@
 <property name="can_focus">True</property>
 <property name="receives_default">True</property>
 <property name="tooltip_text" translatable="yes">Echelle a 100%.</property>
- <signal name="clicked" handler="on_button_normal_clicked"/>
+ <signal name="clicked" handler="on_button_normal_clicked" swapped="no"/>
 <child>
 <object class="GtkImage" id="image18">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="tooltip_text" translatable="yes">Remet l'echelle a 100%</property>
 <property name="stock">gtk-zoom-100</property>
 </object>
@@ -4713,10 +4690,11 @@
 <property name="can_focus">True</property>
 <property name="receives_default">True</property>
 <property name="tooltip_text" translatable="yes">Augmentation de l'echelle.</property>
- <signal name="clicked" handler="on_button_plus_clicked"/>
+ <signal name="clicked" handler="on_button_plus_clicked" swapped="no"/>
 <child>
 <object class="GtkImage" id="image20">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="tooltip_text" translatable="yes">Augmente l'agrandissement</property>
 <property name="stock">gtk-zoom-in</property>
 </object>
@@ -4735,10 +4713,11 @@
 <property name="can_focus">True</property>
 <property name="receives_default">True</property>
 <property name="tooltip_text" translatable="yes">Echelle compatible avec la taille de la fenetre.</property>
- <signal name="clicked" handler="on_button_ajuster_clicked"/>
+ <signal name="clicked" handler="on_button_ajuster_clicked" swapped="no"/>
 <child>
 <object class="GtkImage" id="image22">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="tooltip_text" translatable="yes">Adapte l'echelle a la taille de la fenetre</property>
 <property name="stock">gtk-zoom-fit</property>
 </object>
@@ -4757,9 +4736,11 @@
 <property name="can_focus">True</property>
 <property name="receives_default">True</property>
 <property name="tooltip_text" translatable="yes">Emplacement de sauvegarde des fichiers.</property>
- <signal name="clicked" handler="on_button_stock_img_clicked"/>
+ <signal name="clicked" handler="on_button_stock_img_clicked" swapped="no"/>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="padding">2</property>
 <property name="position">7</property>
 </packing>
@@ -4769,19 +4750,20 @@
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="tooltip_text" translatable="yes">Nom (sans extention) du fichier a sauvegarder.</property>
- <property name="invisible_char">&#x25CF;</property>
- <signal name="changed" handler="on_entry_name_save_file_changed"/>
- <signal name="realize" handler="on_entry_name_save_file_realize"/>
+ <property name="invisible_char">●</property>
+ <signal name="changed" handler="on_entry_name_save_file_changed" swapped="no"/>
+ <signal name="realize" handler="on_entry_name_save_file_realize" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
 <property name="position">8</property>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="label_percent">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">label</property>
 </object>
 <packing>
@@ -4793,6 +4775,7 @@
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -4805,8 +4788,9 @@
 <child>
 <object class="GtkViewport" id="viewport_stock">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="resize_mode">queue</property>
- <signal name="realize" handler="on_viewport_stock_realize"/>
+ <signal name="realize" handler="on_viewport_stock_realize" swapped="no"/>
 <child>
 <placeholder/>
 </child>
@@ -4815,6 +4799,7 @@
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">2</property>
 </packing>
 </child>
@@ -4826,6 +4811,7 @@
 <child type="tab">
 <object class="GtkLabel" id="label481">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> Pochette </property>
 </object>
 <packing>
@@ -4839,31 +4825,37 @@
 <property name="can_focus">True</property>
 <property name="border_width">5</property>
 <property name="tab_pos">left</property>
- <signal name="switch_page" handler="on_notebook_options_switch_page"/>
+ <signal name="switch-page" handler="on_notebook_options_switch_page" swapped="no"/>
 <child>
- <object class="GtkVBox" id="vbox421">
+ <object class="GtkBox" id="vbox421">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
- <object class="GtkHBox" id="hbox179">
+ <object class="GtkBox" id="hbox179">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkFrame" id="frame8">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment8">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkHBox" id="hbox9">
+ <object class="GtkBox" id="hbox9">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkLabel" id="label11">
 <property name="width_request">50</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0</property>
 <property name="yalign">0.4699999988079071</property>
 <property name="label" translatable="yes">Nice</property>
@@ -4877,22 +4869,19 @@
 <child>
 <object class="GtkEventBox" id="eventbox_combobox_nice">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkComboBox" id="combobox_nice">
+ <object class="GtkComboBoxText" id="combobox_nice">
 <property name="visible">True</property>
- <property name="model">liststore5</property>
- <signal name="changed" handler="on_combobox_nice_changed"/>
- <signal name="realize" handler="on_combobox_nice_realize"/>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext5"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_nice_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_nice_realize" swapped="no"/>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -4903,40 +4892,49 @@
 <child type="label">
 <object class="GtkLabel" id="label9">
 <property name="visible">True</property>
- <property name="label" translatable="yes"> &lt;b&gt;Priorite systeme&lt;/b&gt; </property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"> &lt;b&gt;Priority system&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkFrame" id="frame135">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment230">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox438">
+ <object class="GtkBox" id="vbox438">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkLabel" id="label347">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;i&gt;&lt;b&gt;Indiquez&lt;/b&gt; ici le dossier sur votre systeme qui servira de lieu
-de stockage provisoire pendant les differentes conversions.&lt;/i&gt;
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">
+&lt;i&gt;&lt;b&gt;Enter&lt;/b&gt; here the folder on your system that will serve as
+temporary storage for the different conversions.&lt;/i&gt;
 </property>
 <property name="use_markup">True</property>
 </object>
@@ -4953,8 +4951,8 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="use_underline">True</property>
- <signal name="clicked" handler="on_button_dossier_de_conversion_clicked"/>
- <signal name="realize" handler="on_button_dossier_de_conversion_realize"/>
+ <signal name="clicked" handler="on_button_dossier_de_conversion_clicked" swapped="no"/>
+ <signal name="realize" handler="on_button_dossier_de_conversion_realize" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -4969,37 +4967,43 @@
 <child type="label">
 <object class="GtkLabel" id="label343">
 <property name="visible">True</property>
- <property name="label" translatable="yes"> &lt;b&gt;Dossier provisoire des conversions&lt;/b&gt; </property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"> &lt;b&gt;Provisional file conversions&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
 <object class="GtkFrame" id="frame4">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment5">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkHBox" id="hbox1">
+ <object class="GtkBox" id="hbox1">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkCheckButton" id="checkbutton_end_of_convert">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
+ <property name="xalign">0.5</property>
 <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_end_of_convert_clicked"/>
- <signal name="realize" handler="on_checkbutton_end_of_convert_realize"/>
+ <signal name="clicked" handler="on_checkbutton_end_of_convert_clicked" swapped="no"/>
+ <signal name="realize" handler="on_checkbutton_end_of_convert_realize" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -5014,10 +5018,12 @@
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">True</property>
- <signal name="clicked" handler="on_button_music_file_end_of_convert_clicked"/>
- <signal name="realize" handler="on_button_music_file_end_of_convert_realize"/>
+ <signal name="clicked" handler="on_button_music_file_end_of_convert_clicked" swapped="no"/>
+ <signal name="realize" handler="on_button_music_file_end_of_convert_realize" swapped="no"/>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -5028,7 +5034,8 @@
 <child type="label">
 <object class="GtkLabel" id="label3">
 <property name="visible">True</property>
- <property name="label" translatable="yes"> &lt;b&gt;Jouer une musique en fin de tache&lt;/b&gt; </property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"> &lt;b&gt;Playing a job end music&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
 </child>
@@ -5047,6 +5054,7 @@
 <child type="tab">
 <object class="GtkLabel" id="label160">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> General </property>
 </object>
 <packing>
@@ -5054,44 +5062,104 @@
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox31">
+ <object class="GtkBox" id="vbox31">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
- <object class="GtkHBox" id="hbox2821">
+ <object class="GtkBox" id="hbox2821">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox521">
+ <object class="GtkBox" id="vbox521">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
- <placeholder/>
- </child>
- <child>
 <object class="GtkFrame" id="frame137">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment232">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkHBox" id="hbox218">
+ <object class="GtkBox" id="hbox38">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkRadioButton" id="radiobutton_extract_with_cdparanoia">
- <property name="label" translatable="yes">cdparanoia</property>
+ <object class="GtkBox" id="vbox22">
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="border_width">5</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_radiobutton_choice_extract_with_clicked"/>
- <signal name="realize" handler="on_radiobutton_extract_with_cdparanoia_realize"/>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton_extract_with_cdparanoia">
+ <property name="label" translatable="yes">cdparanoia</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="border_width">5</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_radiobutton_choice_extract_with_clicked" swapped="no"/>
+ <signal name="realize" handler="on_radiobutton_extract_with_cdparanoia_realize" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton_cdparanoia_mode_2">
+ <property name="label" translatable="yes">cdparanoia mode expert</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="border_width">5</property>
+ <property name="xalign">0.5</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radiobutton_extract_with_cdparanoia</property>
+ <signal name="clicked" handler="on_radiobutton_choice_extract_with_clicked" swapped="no"/>
+ <signal name="realize" handler="on_radiobutton_cdparanoia_mode_2_realize" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton_cdparanoia_mode_expert">
+ <property name="label" translatable="yes">cdparanoia mode expert multi passes</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="border_width">5</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.49000000953674316</property>
+ <property name="yalign">0.47999998927116394</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radiobutton_extract_with_cdparanoia</property>
+ <signal name="clicked" handler="on_radiobutton_choice_extract_with_clicked" swapped="no"/>
+ <signal name="realize" handler="on_radiobutton_cdparanoia_mode_expert_realize" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -5103,31 +5171,18 @@
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
 <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
 <property name="draw_indicator">True</property>
 <property name="group">radiobutton_extract_with_cdparanoia</property>
- <signal name="clicked" handler="on_radiobutton_choice_extract_with_clicked"/>
- <signal name="realize" handler="on_radiobutton_extract_with_cdda2wav_realize"/>
+ <signal name="clicked" handler="on_radiobutton_choice_extract_with_clicked" swapped="no"/>
+ <signal name="realize" handler="on_radiobutton_extract_with_cdda2wav_realize" swapped="no"/>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
- <child>
- <object class="GtkRadioButton" id="radiobutton_cdparanoia_mode_expert">
- <property name="label" translatable="yes">cdparanoia mode expert</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">radiobutton_extract_with_cdparanoia</property>
- <signal name="clicked" handler="on_radiobutton_choice_extract_with_clicked"/>
- <signal name="realize" handler="on_radiobutton_cdparanoia_mode_expert_realize"/>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
 </object>
 </child>
 </object>
@@ -5135,37 +5190,46 @@
 <child type="label">
 <object class="GtkLabel" id="label360">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt; Extraction cd-audio avec: &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
- <property name="position">1</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
 </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox519">
+ <object class="GtkBox" id="vbox519">
 <property name="width_request">174</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkFrame" id="frame200">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment427">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox520">
+ <object class="GtkBox" id="vbox520">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkButton" id="button_WebCdparanoia_homepage">
@@ -5173,19 +5237,22 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_WebInformations_clicked"/>
+ <signal name="clicked" handler="on_button_WebInformations_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment214">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox197">
+ <object class="GtkBox" id="hbox197">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image91">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-connect</property>
 </object>
 <packing>
@@ -5197,6 +5264,7 @@
 <child>
 <object class="GtkLabel" id="label315">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;HomePage&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 <property name="use_underline">True</property>
@@ -5224,19 +5292,22 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_WebInformations_clicked"/>
+ <signal name="clicked" handler="on_button_WebInformations_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment215">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox198">
+ <object class="GtkBox" id="hbox198">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image92">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-connect</property>
 </object>
 <packing>
@@ -5248,6 +5319,7 @@
 <child>
 <object class="GtkLabel" id="label316">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;ManPage&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 <property name="use_underline">True</property>
@@ -5276,6 +5348,7 @@
 <child type="label">
 <object class="GtkLabel" id="label783">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> &lt;b&gt;Web cdparanoia&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
@@ -5297,41 +5370,116 @@
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">False</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
+ <object class="GtkFrame" id="frame19">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkAlignment" id="alignment37">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <child>
+ <object class="GtkBox" id="hbox37">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_log_cdparanoia_mode_expert">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="border_width">5</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_log_cdparanoia_mode_expert_clicked" swapped="no"/>
+ <signal name="realize" handler="on_checkbutton_log_cdparanoia_mode_expert_realize" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label57">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;i&gt;Le fichier &lt;b&gt;LogExpertMode.txt&lt;/b&gt; sera cree dans le dossier des extractions&lt;/i&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label56">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Generation of a report for: cdparanoia mode expert multi passes&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
 <object class="GtkFrame" id="frame136">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment231">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox439">
+ <object class="GtkBox" id="vbox439">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="orientation">vertical</property>
 <child>
- <object class="GtkHBox" id="hbox214">
+ <object class="GtkBox" id="hbox214">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkLabel" id="label357">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;%a&lt;/b&gt; - artiste &lt;b&gt;%b&lt;/b&gt; - titre de l'album &lt;b&gt;%c&lt;/b&gt; - numero de la piste
-&lt;b&gt;%d&lt;/b&gt; - titre de la chanson &lt;b&gt;%e&lt;/b&gt; - annee &lt;b&gt;%g&lt;/b&gt; - genre
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;%a&lt;/b&gt; - artist &lt;b&gt;%b&lt;/b&gt; - titre de l'album &lt;b&gt;%c&lt;/b&gt; - numero de la piste
+&lt;b&gt;%d&lt;/b&gt; - titre de la chanson &lt;b&gt;%e&lt;/b&gt; - year &lt;b&gt;%g&lt;/b&gt; - genre
 &lt;b&gt;%na&lt;/b&gt; - &lt;b&gt;n&lt;/b&gt;o &lt;b&gt;a&lt;/b&gt;ccent &lt;b&gt;%Tl&lt;/b&gt; - &lt;b&gt;T&lt;/b&gt;etsumaki &lt;b&gt;l&lt;/b&gt;ower
-&lt;b&gt;%u&lt;/b&gt; - remplacement de caracteres: &lt;b&gt;%u(AB=C) %u( =_)&lt;/b&gt;</property>
+&lt;b&gt;%u&lt;/b&gt; - replacement characters: &lt;b&gt;%u(AB=C) %u( =_)&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -5339,8 +5487,9 @@
 <object class="GtkEntry" id="entry_stockage_cdaudio">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <signal name="changed" handler="on_entry_stockage_cdaudio_changed"/>
- <signal name="realize" handler="on_entry_stockage_cdaudio_realize"/>
+ <property name="invisible_char">●</property>
+ <signal name="changed" handler="on_entry_stockage_cdaudio_changed" swapped="no"/>
+ <signal name="realize" handler="on_entry_stockage_cdaudio_realize" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -5350,8 +5499,9 @@
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox216">
+ <object class="GtkBox" id="hbox216">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkLabel" id="label_stockage_cdaudio_exemple">
@@ -5360,9 +5510,11 @@
 <property name="label">label_dossier_cdaudio_exemple</property>
 <property name="use_markup">True</property>
 <property name="selectable">True</property>
- <signal name="realize" handler="on_label_stockage_cdaudio_exemple_realize"/>
+ <signal name="realize" handler="on_label_stockage_cdaudio_exemple_realize" swapped="no"/>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -5380,6 +5532,7 @@
 <child type="label">
 <object class="GtkLabel" id="label351">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> &lt;b&gt;Dossier de stockage&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
@@ -5388,15 +5541,18 @@
 <packing>
 <property name="expand">False</property>
 <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="label820">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 </object>
 <packing>
- <property name="position">2</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
 </packing>
 </child>
 </object>
@@ -5407,6 +5563,7 @@
 <child type="tab">
 <object class="GtkLabel" id="label161">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> CD </property>
 </object>
 <packing>
@@ -5415,37 +5572,45 @@
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox32">
+ <object class="GtkBox" id="vbox32">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
- <object class="GtkHBox" id="hbox225">
+ <object class="GtkBox" id="hbox225">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox442">
+ <object class="GtkBox" id="vbox442">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkFrame" id="frame115">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment194">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox420">
+ <object class="GtkBox" id="vbox420">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
- <object class="GtkHBox" id="hbox176">
+ <object class="GtkBox" id="hbox176">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkLabel" id="label204">
 <property name="width_request">180</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0</property>
 <property name="label" translatable="yes">ABR / CBR / VBR / VBR-NEW</property>
 </object>
@@ -5458,39 +5623,39 @@
 <child>
 <object class="GtkEventBox" id="eventbox_combobox_lame_abr_cbr_vbr">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkComboBox" id="combobox_lame_abr_cbr_vbr">
+ <object class="GtkComboBoxText" id="combobox_lame_abr_cbr_vbr">
 <property name="visible">True</property>
- <property name="model">liststore4</property>
- <signal name="changed" handler="on_combobox_lame_abr_cbr_vbr_changed"/>
- <signal name="realize" handler="on_combobox_lame_abr_cbr_vbr_realize"/>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext4"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_lame_abr_cbr_vbr_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_lame_abr_cbr_vbr_realize" swapped="no"/>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox177">
+ <object class="GtkBox" id="hbox177">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkLabel" id="label205">
 <property name="width_request">100</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0</property>
 <property name="label" translatable="yes">Debit</property>
 </object>
@@ -5503,39 +5668,39 @@
 <child>
 <object class="GtkEventBox" id="eventbox_combobox_lame_bitrate">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkComboBox" id="combobox_lame_type_bitrate">
+ <object class="GtkComboBoxText" id="combobox_lame_type_bitrate">
 <property name="visible">True</property>
- <property name="model">liststore3</property>
- <signal name="changed" handler="on_combobox_lame_type_bitrate_changed"/>
- <signal name="realize" handler="on_combobox_lame_type_bitrate_realize"/>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext3"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_lame_type_bitrate_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_lame_type_bitrate_realize" swapped="no"/>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox178">
+ <object class="GtkBox" id="hbox178">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkLabel" id="label203">
 <property name="width_request">100</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0</property>
 <property name="label" translatable="yes">Mode</property>
 </object>
@@ -5548,21 +5713,26 @@
 <child>
 <object class="GtkEventBox" id="eventbox_combobox_lame_mode">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkComboBox" id="combobox_lame_mode">
+ <object class="GtkComboBoxText" id="combobox_lame_mode">
 <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_lame_mode_changed"/>
- <signal name="realize" handler="on_combobox_lame_mode_realize"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_lame_mode_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_lame_mode_realize" swapped="no"/>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">2</property>
 </packing>
 </child>
@@ -5573,6 +5743,7 @@
 <child type="label">
 <object class="GtkLabel" id="label265">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> &lt;b&gt; Lame (fichier mp3): &lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
@@ -5580,55 +5751,67 @@
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="label369">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox440">
+ <object class="GtkBox" id="vbox440">
 <property name="width_request">174</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkFrame" id="frame138">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment239">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkButton" id="button_defaut_lame">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_defaut_convertisseur_clicked"/>
+ <signal name="clicked" handler="on_button_defaut_convertisseur_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment238">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox224">
+ <object class="GtkBox" id="hbox224">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image109">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-dialog-info</property>
 </object>
 <packing>
@@ -5640,6 +5823,7 @@
 <child>
 <object class="GtkLabel" id="label366">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">Par defaut</property>
 <property name="use_underline">True</property>
 </object>
@@ -5660,6 +5844,7 @@
 <child type="label">
 <object class="GtkLabel" id="label367">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> &lt;b&gt;Options LAME&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
@@ -5674,15 +5859,18 @@
 <child>
 <object class="GtkFrame" id="frame139">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment240">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox441">
+ <object class="GtkBox" id="vbox441">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkButton" id="button_WebLame_homepage">
@@ -5690,19 +5878,22 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_WebInformations_clicked"/>
+ <signal name="clicked" handler="on_button_WebInformations_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment216">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox199">
+ <object class="GtkBox" id="hbox199">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image93">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-connect</property>
 </object>
 <packing>
@@ -5714,6 +5905,7 @@
 <child>
 <object class="GtkLabel" id="label317">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;Site officiel&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 <property name="use_underline">True</property>
@@ -5741,19 +5933,22 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_WebInformations_clicked"/>
+ <signal name="clicked" handler="on_button_WebInformations_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment217">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox200">
+ <object class="GtkBox" id="hbox200">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image94">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-connect</property>
 </object>
 <packing>
@@ -5765,6 +5960,7 @@
 <child>
 <object class="GtkLabel" id="label318">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;Wiki mp3&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 <property name="use_underline">True</property>
@@ -5792,20 +5988,23 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_WebInformations_clicked"/>
+ <signal name="clicked" handler="on_button_WebInformations_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment218">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <property name="left_padding">5</property>
 <child>
- <object class="GtkHBox" id="hbox201">
+ <object class="GtkBox" id="hbox201">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image95">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-connect</property>
 </object>
 <packing>
@@ -5817,6 +6016,7 @@
 <child>
 <object class="GtkLabel" id="label319">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;Wiki &lt;/b&gt; </property>
 <property name="use_markup">True</property>
 <property name="use_underline">True</property>
@@ -5844,20 +6044,23 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_WebInformations_clicked"/>
+ <signal name="clicked" handler="on_button_WebInformations_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment9">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <property name="left_padding">5</property>
 <child>
- <object class="GtkHBox" id="hbox10">
+ <object class="GtkBox" id="hbox10">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image23">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-connect</property>
 </object>
 <packing>
@@ -5869,6 +6072,7 @@
 <child>
 <object class="GtkLabel" id="label10">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;ManPage&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 <property name="use_underline">True</property>
@@ -5897,12 +6101,15 @@
 <child type="label">
 <object class="GtkLabel" id="label368">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> &lt;b&gt;Web Lame&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -5916,37 +6123,44 @@
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="label332">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
 <object class="GtkFrame" id="frame126">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment205">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox431">
+ <object class="GtkBox" id="vbox431">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkEntry" id="entry_lame_mp3">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <signal name="changed" handler="on_entry_op_internal_changed"/>
- <signal name="realize" handler="on_entry_lame_mp3_realize"/>
+ <signal name="changed" handler="on_entry_op_internal_changed" swapped="no"/>
+ <signal name="realize" handler="on_entry_lame_mp3_realize" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -5956,12 +6170,14 @@
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox188">
+ <object class="GtkBox" id="hbox188">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkLabel" id="label285">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;[&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
@@ -5978,15 +6194,18 @@
 <property name="label" translatable="yes">&lt;b&gt;string option interne&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 <property name="selectable">True</property>
- <signal name="realize" handler="on_label_lame_mp3_realize"/>
+ <signal name="realize" handler="on_label_lame_mp3_realize" swapped="no"/>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="label287">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;]&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
@@ -5998,6 +6217,8 @@
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="padding">5</property>
 <property name="position">1</property>
 </packing>
@@ -6009,7 +6230,8 @@
 <child type="label">
 <object class="GtkLabel" id="label288">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Options experts, definies par l'utilisateur - lame (wav -&gt; mp3) &lt;/b&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt; Experts options defined by the user- lame (wav -&gt; mp3) &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
@@ -6028,6 +6250,7 @@
 <child type="tab">
 <object class="GtkLabel" id="label162">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> Mp3 </property>
 </object>
 <packing>
@@ -6036,135 +6259,120 @@
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox37">
+ <object class="GtkBox" id="vbox37">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
- <object class="GtkHBox" id="hbox226">
+ <object class="GtkBox" id="hbox226">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox445">
+ <object class="GtkBox" id="vbox445">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkFrame" id="frame90">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment140">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkTable" id="table5">
+ <object class="GtkGrid" id="grid1">
 <property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
+ <property name="can_focus">False</property>
+ <property name="column_homogeneous">True</property>
 <child>
- <object class="GtkEventBox" id="eventbox_combobox_oggenc_downmix">
+ <object class="GtkLabel" id="label13">
 <property name="visible">True</property>
- <property name="border_width">5</property>
- <child>
- <object class="GtkComboBox" id="combobox_oggenc_downmix">
- <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_oggenc_downmix_changed"/>
- <signal name="realize" handler="on_combobox_oggenc_downmix_realize"/>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Debit</property>
 </object>
 <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkEventBox" id="eventbox_combobox_oggenc_managed">
+ <object class="GtkLabel" id="label71">
 <property name="visible">True</property>
- <property name="border_width">5</property>
- <child>
- <object class="GtkComboBox" id="combobox_oggenc_managed">
- <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_oggenc_managed_changed"/>
- <signal name="realize" handler="on_combobox_oggenc_managed_realize"/>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Mode flux (streaming)</property>
 </object>
 <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
 <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label359">
- <property name="width_request">160</property>
+ <object class="GtkLabel" id="label72">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"> Mode</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Mode</property>
 </object>
 <packing>
+ <property name="left_attach">0</property>
 <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label358">
- <property name="width_request">160</property>
+ <object class="GtkEventBox" id="eventbox_combobox_oggenc_bitrate">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"> Mode flux (streaming)</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkComboBoxText" id="combobox_oggenc_bitrate">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_oggenc_bitrate_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_oggenc_bitrate_realize" swapped="no"/>
+ </object>
+ </child>
 </object>
 <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkEventBox" id="eventbox_combobox_oggenc_bitrate">
+ <object class="GtkEventBox" id="eventbox_combobox_oggenc_managed">
 <property name="visible">True</property>
- <property name="border_width">5</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkComboBox" id="combobox_oggenc_bitrate">
+ <object class="GtkComboBoxText" id="combobox_oggenc_managed">
 <property name="visible">True</property>
- <property name="model">liststore2</property>
- <signal name="changed" handler="on_combobox_oggenc_bitrate_changed"/>
- <signal name="realize" handler="on_combobox_oggenc_bitrate_realize"/>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext2"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_oggenc_managed_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_oggenc_managed_realize" swapped="no"/>
 </object>
 </child>
 </object>
 <packing>
 <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label13">
- <property name="width_request">160</property>
+ <object class="GtkEventBox" id="eventbox_combobox_oggenc_downmix">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"> Debit</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkComboBoxText" id="combobox_oggenc_downmix">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_oggenc_downmix_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_oggenc_downmix_realize" swapped="no"/>
+ </object>
+ </child>
 </object>
 <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
 </packing>
 </child>
 </object>
@@ -6174,6 +6382,7 @@
 <child type="label">
 <object class="GtkLabel" id="label158">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt; Oggenc (fichier ogg): &lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
@@ -6188,49 +6397,60 @@
 <child>
 <object class="GtkLabel" id="label372">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox443">
+ <object class="GtkBox" id="vbox443">
 <property name="width_request">174</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkFrame" id="frame140">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment241">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkButton" id="button_defaut_oggenc">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_defaut_convertisseur_clicked"/>
+ <signal name="clicked" handler="on_button_defaut_convertisseur_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment237">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox223">
+ <object class="GtkBox" id="hbox223">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image108">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-dialog-info</property>
 </object>
 <packing>
@@ -6242,6 +6462,7 @@
 <child>
 <object class="GtkLabel" id="label365">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">Par defaut</property>
 <property name="use_underline">True</property>
 </object>
@@ -6262,6 +6483,7 @@
 <child type="label">
 <object class="GtkLabel" id="label370">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> &lt;b&gt;Options OGGENC&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
@@ -6276,15 +6498,18 @@
 <child>
 <object class="GtkFrame" id="frame141">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment242">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox444">
+ <object class="GtkBox" id="vbox444">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkButton" id="button_WebOggenc_wiki">
@@ -6292,19 +6517,22 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_WebInformations_clicked"/>
+ <signal name="clicked" handler="on_button_WebInformations_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment219">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox202">
+ <object class="GtkBox" id="hbox202">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image96">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-connect</property>
 </object>
 <packing>
@@ -6316,6 +6544,7 @@
 <child>
 <object class="GtkLabel" id="label320">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;Wiki&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 <property name="use_underline">True</property>
@@ -6343,20 +6572,23 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_WebInformations_clicked"/>
+ <signal name="clicked" handler="on_button_WebInformations_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment220">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <property name="right_padding">15</property>
 <child>
- <object class="GtkHBox" id="hbox203">
+ <object class="GtkBox" id="hbox203">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image97">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-connect</property>
 </object>
 <packing>
@@ -6368,6 +6600,7 @@
 <child>
 <object class="GtkLabel" id="label321">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;ManPage&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 <property name="use_underline">True</property>
@@ -6396,55 +6629,66 @@
 <child type="label">
 <object class="GtkLabel" id="label371">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> &lt;b&gt;Web Oggenc&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="label333">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
 <object class="GtkFrame" id="frame127">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment206">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox432">
+ <object class="GtkBox" id="vbox432">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkEntry" id="entry_oggenc_ogg">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <signal name="changed" handler="on_entry_op_internal_changed"/>
- <signal name="realize" handler="on_entry_oggenc_ogg_realize"/>
+ <signal name="changed" handler="on_entry_op_internal_changed" swapped="no"/>
+ <signal name="realize" handler="on_entry_oggenc_ogg_realize" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -6454,12 +6698,14 @@
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox189">
+ <object class="GtkBox" id="hbox189">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkLabel" id="label289">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;[&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
@@ -6476,15 +6722,18 @@
 <property name="label" translatable="yes">&lt;b&gt;string option interne&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 <property name="selectable">True</property>
- <signal name="realize" handler="on_label_oggenc_ogg_realize"/>
+ <signal name="realize" handler="on_label_oggenc_ogg_realize" swapped="no"/>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="label291">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;]&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
@@ -6496,6 +6745,8 @@
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="padding">5</property>
 <property name="position">1</property>
 </packing>
@@ -6507,7 +6758,8 @@
 <child type="label">
 <object class="GtkLabel" id="label292">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Options experts, definies par l'utilisateur - oggenc (wav -&gt; ogg) &lt;/b&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt; Experts options defined by the user - oggenc (wav -&gt; ogg) &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
@@ -6526,6 +6778,7 @@
 <child type="tab">
 <object class="GtkLabel" id="label181">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> Oggenc </property>
 </object>
 <packing>
@@ -6534,32 +6787,39 @@
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox419">
+ <object class="GtkBox" id="vbox419">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
- <object class="GtkHBox" id="hbox227">
+ <object class="GtkBox" id="hbox227">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox448">
+ <object class="GtkBox" id="vbox448">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkFrame" id="frame57">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment98">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkHBox" id="hbox93">
+ <object class="GtkBox" id="hbox93">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkLabel" id="label115">
 <property name="width_request">150</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0</property>
 <property name="label" translatable="yes">Taux de compression</property>
 </object>
@@ -6573,23 +6833,20 @@
 <child>
 <object class="GtkEventBox" id="eventbox_flac_compression">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
- <object class="GtkComboBox" id="combobox_flac_compression">
+ <object class="GtkComboBoxText" id="combobox_flac_compression">
 <property name="visible">True</property>
- <property name="model">liststore1</property>
- <signal name="changed" handler="on_combobox_flac_compression_changed"/>
- <signal name="realize" handler="on_options_combobox_flac_compression_realize"/>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext1"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_flac_compression_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_flac_compression_realize" swapped="no"/>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -6600,6 +6857,7 @@
 <child type="label">
 <object class="GtkLabel" id="label114">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt; Flac (fichier flac): &lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
@@ -6607,55 +6865,67 @@
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="label375">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox446">
+ <object class="GtkBox" id="vbox446">
 <property name="width_request">174</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkFrame" id="frame142">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment243">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkButton" id="button_defaut_flac">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_defaut_convertisseur_clicked"/>
+ <signal name="clicked" handler="on_button_defaut_convertisseur_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment236">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox222">
+ <object class="GtkBox" id="hbox222">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image107">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-dialog-info</property>
 </object>
 <packing>
@@ -6667,6 +6937,7 @@
 <child>
 <object class="GtkLabel" id="label364">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">Par defaut</property>
 <property name="use_underline">True</property>
 </object>
@@ -6687,6 +6958,7 @@
 <child type="label">
 <object class="GtkLabel" id="label373">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> &lt;b&gt;Options FLAC&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
@@ -6701,15 +6973,18 @@
 <child>
 <object class="GtkFrame" id="frame143">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment244">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox447">
+ <object class="GtkBox" id="vbox447">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkButton" id="button_WebFlac_homepage">
@@ -6717,19 +6992,22 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_WebInformations_clicked"/>
+ <signal name="clicked" handler="on_button_WebInformations_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment221">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox204">
+ <object class="GtkBox" id="hbox204">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image98">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-connect</property>
 </object>
 <packing>
@@ -6741,6 +7019,7 @@
 <child>
 <object class="GtkLabel" id="label322">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;Site officiel&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 <property name="use_underline">True</property>
@@ -6768,19 +7047,22 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_WebInformations_clicked"/>
+ <signal name="clicked" handler="on_button_WebInformations_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment222">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox205">
+ <object class="GtkBox" id="hbox205">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image99">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-connect</property>
 </object>
 <packing>
@@ -6792,6 +7074,7 @@
 <child>
 <object class="GtkLabel" id="label323">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;Framasoft&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 <property name="use_underline">True</property>
@@ -6819,19 +7102,22 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_WebInformations_clicked"/>
+ <signal name="clicked" handler="on_button_WebInformations_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment10">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox11">
+ <object class="GtkBox" id="hbox11">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image24">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-connect</property>
 </object>
 <packing>
@@ -6843,6 +7129,7 @@
 <child>
 <object class="GtkLabel" id="label12">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;ManPage&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 <property name="use_underline">True</property>
@@ -6871,6 +7158,7 @@
 <child type="label">
 <object class="GtkLabel" id="label374">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> &lt;b&gt;Web Flac&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
@@ -6892,37 +7180,44 @@
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="label334">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
 <object class="GtkFrame" id="frame128">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment207">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox433">
+ <object class="GtkBox" id="vbox433">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkEntry" id="entry_flac_flac">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <signal name="changed" handler="on_entry_op_internal_changed"/>
- <signal name="realize" handler="on_entry_flac_flac_realize"/>
+ <signal name="changed" handler="on_entry_op_internal_changed" swapped="no"/>
+ <signal name="realize" handler="on_entry_flac_flac_realize" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -6932,12 +7227,14 @@
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox190">
+ <object class="GtkBox" id="hbox190">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkLabel" id="label293">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;[&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
@@ -6954,15 +7251,18 @@
 <property name="label" translatable="yes">&lt;b&gt;string option interne&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 <property name="selectable">True</property>
- <signal name="realize" handler="on_label_flac_flac_realize"/>
+ <signal name="realize" handler="on_label_flac_flac_realize" swapped="no"/>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="label295">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;]&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
@@ -6974,6 +7274,8 @@
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="padding">5</property>
 <property name="position">1</property>
 </packing>
@@ -6985,13 +7287,15 @@
 <child type="label">
 <object class="GtkLabel" id="label296">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Options experts, definies par l'utilisateur - flac (wav -&gt; flac) &lt;/b&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt; Experts options defined by the user- flac (wav -&gt; flac) &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">2</property>
 </packing>
 </child>
@@ -7003,6 +7307,7 @@
 <child type="tab">
 <object class="GtkLabel" id="label260">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> Flac </property>
 </object>
 <packing>
@@ -7011,32 +7316,39 @@
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox415">
+ <object class="GtkBox" id="vbox415">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
- <object class="GtkHBox" id="hbox228">
+ <object class="GtkBox" id="hbox228">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox450">
+ <object class="GtkBox" id="vbox450">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkFrame" id="frame95">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment151">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkHBox" id="hbox135">
+ <object class="GtkBox" id="hbox135">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkLabel" id="label179">
 <property name="width_request">100</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0</property>
 <property name="label" translatable="yes"> Qualite</property>
 </object>
@@ -7049,16 +7361,20 @@
 <child>
 <object class="GtkEventBox" id="eventbox_combobox_ape_compression">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
- <object class="GtkComboBox" id="combobox_ape_compression">
+ <object class="GtkComboBoxText" id="combobox_ape_compression">
 <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_ape_compression_changed"/>
- <signal name="realize" handler="on_combobox_ape_compression_realize"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_ape_compression_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_ape_compression_realize" swapped="no"/>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -7069,6 +7385,7 @@
 <child type="label">
 <object class="GtkLabel" id="label178">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt; Mac (fichier ape): &lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
@@ -7083,49 +7400,60 @@
 <child>
 <object class="GtkLabel" id="label378">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox449">
+ <object class="GtkBox" id="vbox449">
 <property name="width_request">174</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkFrame" id="frame144">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment245">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkButton" id="button_defaut_mac">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_defaut_convertisseur_clicked"/>
+ <signal name="clicked" handler="on_button_defaut_convertisseur_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment235">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox221">
+ <object class="GtkBox" id="hbox221">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image106">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-dialog-info</property>
 </object>
 <packing>
@@ -7137,6 +7465,7 @@
 <child>
 <object class="GtkLabel" id="label363">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">Par defaut</property>
 <property name="use_underline">True</property>
 </object>
@@ -7157,43 +7486,51 @@
 <child type="label">
 <object class="GtkLabel" id="label376">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> &lt;b&gt;Options MAC&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkFrame" id="frame145">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment246">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkButton" id="button_WebMac_wiki">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_WebInformations_clicked"/>
+ <signal name="clicked" handler="on_button_WebInformations_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment223">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox206">
+ <object class="GtkBox" id="hbox206">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image100">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-connect</property>
 </object>
 <packing>
@@ -7205,6 +7542,7 @@
 <child>
 <object class="GtkLabel" id="label324">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;Wiki&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 <property name="use_underline">True</property>
@@ -7226,12 +7564,15 @@
 <child type="label">
 <object class="GtkLabel" id="label377">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> &lt;b&gt;Web Mac&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -7245,37 +7586,44 @@
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="label335">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
 <object class="GtkFrame" id="frame129">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment208">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox434">
+ <object class="GtkBox" id="vbox434">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkEntry" id="entry_mac_ape">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <signal name="changed" handler="on_entry_op_internal_changed"/>
- <signal name="realize" handler="on_entry_mac_ape_realize"/>
+ <signal name="changed" handler="on_entry_op_internal_changed" swapped="no"/>
+ <signal name="realize" handler="on_entry_mac_ape_realize" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -7285,12 +7633,14 @@
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox191">
+ <object class="GtkBox" id="hbox191">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkLabel" id="label297">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;[&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
@@ -7307,15 +7657,18 @@
 <property name="label" translatable="yes">&lt;b&gt;string option interne&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 <property name="selectable">True</property>
- <signal name="realize" handler="on_label_mac_ape_realize"/>
+ <signal name="realize" handler="on_label_mac_ape_realize" swapped="no"/>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="label299">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;]&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
@@ -7327,6 +7680,8 @@
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="padding">5</property>
 <property name="position">1</property>
 </packing>
@@ -7338,13 +7693,15 @@
 <child type="label">
 <object class="GtkLabel" id="label300">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Options experts, definies par l'utilisateur - mac (wav -&gt; ape) &lt;/b&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt; Experts options defined by the user - mac (wav -&gt; ape) &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">2</property>
 </packing>
 </child>
@@ -7356,6 +7713,7 @@
 <child type="tab">
 <object class="GtkLabel" id="label261">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> Mac </property>
 </object>
 <packing>
@@ -7364,37 +7722,45 @@
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox416">
+ <object class="GtkBox" id="vbox416">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
- <object class="GtkHBox" id="hbox229">
+ <object class="GtkBox" id="hbox229">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox451">
+ <object class="GtkBox" id="vbox451">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkFrame" id="frame98">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
- <object class="GtkVBox" id="vbox38">
+ <object class="GtkBox" id="vbox38">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkAlignment" id="alignment154">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
- <object class="GtkHBox" id="hbox137">
+ <object class="GtkBox" id="hbox137">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkLabel" id="label185">
 <property name="width_request">120</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0</property>
 <property name="label" translatable="yes">Compression</property>
 </object>
@@ -7408,15 +7774,19 @@
 <child>
 <object class="GtkEventBox" id="eventbox_combobox_wavpack">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkComboBox" id="combobox_wavpack">
+ <object class="GtkComboBoxText" id="combobox_wavpack">
 <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_wavpack_changed"/>
- <signal name="realize" handler="on_combobox_wavpack_realize"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_wavpack_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_wavpack_realize" swapped="no"/>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -7424,20 +7794,25 @@
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkAlignment" id="alignment155">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkHBox" id="hbox138">
+ <object class="GtkBox" id="hbox138">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkLabel" id="label186">
 <property name="width_request">120</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0</property>
 <property name="label" translatable="yes">Son</property>
 </object>
@@ -7451,15 +7826,19 @@
 <child>
 <object class="GtkEventBox" id="eventbox_combobox_wavpack_sound">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkComboBox" id="combobox_wavpack_sound">
+ <object class="GtkComboBoxText" id="combobox_wavpack_sound">
 <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_wavpack_sound_changed"/>
- <signal name="realize" handler="on_combobox_wavpack_sound_realize"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_wavpack_sound_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_wavpack_sound_realize" swapped="no"/>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -7467,20 +7846,25 @@
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
 <object class="GtkAlignment" id="alignment156">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkHBox" id="hbox139">
+ <object class="GtkBox" id="hbox139">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkLabel" id="label187">
 <property name="width_request">200</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0</property>
 <property name="label" translatable="yes">Mode hybride</property>
 </object>
@@ -7494,15 +7878,19 @@
 <child>
 <object class="GtkEventBox" id="eventbox_combobox_wavpack_mode_hybride">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkComboBox" id="combobox_wavpack_mode_hybride">
+ <object class="GtkComboBoxText" id="combobox_wavpack_mode_hybride">
 <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_wavpack_mode_hybride_changed"/>
- <signal name="realize" handler="on_combobox_wavpack_mode_hybride_realize"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_wavpack_mode_hybride_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_wavpack_mode_hybride_realize" swapped="no"/>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -7510,20 +7898,25 @@
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">2</property>
 </packing>
 </child>
 <child>
 <object class="GtkAlignment" id="alignment157">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkHBox" id="hbox140">
+ <object class="GtkBox" id="hbox140">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkLabel" id="label188">
 <property name="width_request">200</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0</property>
 <property name="label" translatable="yes">Fichier de correction</property>
 </object>
@@ -7537,15 +7930,19 @@
 <child>
 <object class="GtkEventBox" id="eventbox_combobox_wavpack_fichier_de_correction">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkComboBox" id="combobox_wavpack_fichier_de_correction">
+ <object class="GtkComboBoxText" id="combobox_wavpack_fichier_de_correction">
 <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_wavpack_fichier_de_correction_changed"/>
- <signal name="realize" handler="on_combobox_wavpack_fichier_de_correction_realize"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_wavpack_fichier_de_correction_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_wavpack_fichier_de_correction_realize" swapped="no"/>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -7553,20 +7950,25 @@
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">3</property>
 </packing>
 </child>
 <child>
 <object class="GtkAlignment" id="alignment158">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkHBox" id="hbox141">
+ <object class="GtkBox" id="hbox141">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkLabel" id="label189">
 <property name="width_request">200</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0</property>
 <property name="label" translatable="yes">Compression maximum</property>
 </object>
@@ -7580,15 +7982,19 @@
 <child>
 <object class="GtkEventBox" id="eventbox_combobox_wavpack_compression_maximum">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkComboBox" id="combobox_wavpack_compression_maximum">
+ <object class="GtkComboBoxText" id="combobox_wavpack_compression_maximum">
 <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_wavpack_compression_maximum_changed"/>
- <signal name="realize" handler="on_combobox_wavpack_compression_maximum_realize"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_wavpack_compression_maximum_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_wavpack_compression_maximum_realize" swapped="no"/>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -7596,20 +8002,25 @@
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">4</property>
 </packing>
 </child>
 <child>
 <object class="GtkAlignment" id="alignment159">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkHBox" id="hbox142">
+ <object class="GtkBox" id="hbox142">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkLabel" id="label190">
 <property name="width_request">200</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0</property>
 <property name="label" translatable="yes">Signature MD5</property>
 </object>
@@ -7623,15 +8034,19 @@
 <child>
 <object class="GtkEventBox" id="eventbox_combobox_wavpack_signature_md5">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkComboBox" id="combobox_wavpack_signature_md5">
+ <object class="GtkComboBoxText" id="combobox_wavpack_signature_md5">
 <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_wavpack_signature_md5_changed"/>
- <signal name="realize" handler="on_combobox_wavpack_signature_md5_realize"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_wavpack_signature_md5_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_wavpack_signature_md5_realize" swapped="no"/>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -7639,20 +8054,25 @@
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">5</property>
 </packing>
 </child>
 <child>
 <object class="GtkAlignment" id="alignment160">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkHBox" id="hbox143">
+ <object class="GtkBox" id="hbox143">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkLabel" id="label191">
 <property name="width_request">200</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0</property>
 <property name="label" translatable="yes">Extra encode processing</property>
 </object>
@@ -7666,15 +8086,19 @@
 <child>
 <object class="GtkEventBox" id="eventbox_combobox_wavpack_extra_encoding">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkComboBox" id="combobox_wavpack_extra_encoding">
+ <object class="GtkComboBoxText" id="combobox_wavpack_extra_encoding">
 <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_wavpack_extra_encoding_changed"/>
- <signal name="realize" handler="on_combobox_wavpack_extra_encoding_realize"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_wavpack_extra_encoding_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_wavpack_extra_encoding_realize" swapped="no"/>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -7682,6 +8106,8 @@
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">6</property>
 </packing>
 </child>
@@ -7690,6 +8116,7 @@
 <child type="label">
 <object class="GtkLabel" id="label184">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt; WavPack (fichier wv): &lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
@@ -7704,49 +8131,60 @@
 <child>
 <object class="GtkLabel" id="label381">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox452">
+ <object class="GtkBox" id="vbox452">
 <property name="width_request">174</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkFrame" id="frame146">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment247">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkButton" id="button_defaut_wavpack">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_defaut_convertisseur_clicked"/>
+ <signal name="clicked" handler="on_button_defaut_convertisseur_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment234">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox220">
+ <object class="GtkBox" id="hbox220">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image105">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-dialog-info</property>
 </object>
 <packing>
@@ -7758,6 +8196,7 @@
 <child>
 <object class="GtkLabel" id="label362">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">Par defaut</property>
 <property name="use_underline">True</property>
 </object>
@@ -7778,6 +8217,7 @@
 <child type="label">
 <object class="GtkLabel" id="label379">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> &lt;b&gt;Options WAVPACK&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
@@ -7792,15 +8232,18 @@
 <child>
 <object class="GtkFrame" id="frame147">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment248">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox7">
+ <object class="GtkBox" id="vbox7">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkButton" id="button_WavPack_wiki">
@@ -7808,19 +8251,22 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_WebInformations_clicked"/>
+ <signal name="clicked" handler="on_button_WebInformations_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment213">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox196">
+ <object class="GtkBox" id="hbox196">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image90">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-connect</property>
 </object>
 <packing>
@@ -7832,6 +8278,7 @@
 <child>
 <object class="GtkLabel" id="label314">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;Wiki&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 <property name="use_underline">True</property>
@@ -7848,6 +8295,8 @@
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -7857,19 +8306,22 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_WebInformations_clicked"/>
+ <signal name="clicked" handler="on_button_WebInformations_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment11">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox12">
+ <object class="GtkBox" id="hbox12">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image25">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-connect</property>
 </object>
 <packing>
@@ -7881,6 +8333,7 @@
 <child>
 <object class="GtkLabel" id="label14">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;ManPage&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 <property name="use_underline">True</property>
@@ -7897,6 +8350,8 @@
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -7907,6 +8362,7 @@
 <child type="label">
 <object class="GtkLabel" id="label380">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> &lt;b&gt;Web Wavpack&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
@@ -7928,37 +8384,44 @@
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="label336">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
 <object class="GtkFrame" id="frame130">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment209">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox435">
+ <object class="GtkBox" id="vbox435">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkEntry" id="entry_wavpack_wv">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <signal name="changed" handler="on_entry_op_internal_changed"/>
- <signal name="realize" handler="on_entry_wavpack_wv_realize"/>
+ <signal name="changed" handler="on_entry_op_internal_changed" swapped="no"/>
+ <signal name="realize" handler="on_entry_wavpack_wv_realize" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -7968,12 +8431,14 @@
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox192">
+ <object class="GtkBox" id="hbox192">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkLabel" id="label301">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;[&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
@@ -7990,15 +8455,18 @@
 <property name="label" translatable="yes">&lt;b&gt;string option interne&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 <property name="selectable">True</property>
- <signal name="realize" handler="on_label_wavpack_wv_realize"/>
+ <signal name="realize" handler="on_label_wavpack_wv_realize" swapped="no"/>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="label303">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;]&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
@@ -8010,6 +8478,8 @@
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="padding">5</property>
 <property name="position">1</property>
 </packing>
@@ -8021,13 +8491,15 @@
 <child type="label">
 <object class="GtkLabel" id="label304">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Options experts, definies par l'utilisateur - wavpack (wav -&gt; wv) &lt;/b&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt; Experts options defined by the user - wavpack (wav -&gt; wv) &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">2</property>
 </packing>
 </child>
@@ -8039,6 +8511,7 @@
 <child type="tab">
 <object class="GtkLabel" id="label262">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> Wavpack </property>
 </object>
 <packing>
@@ -8047,41 +8520,51 @@
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox417">
+ <object class="GtkBox" id="vbox417">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
- <object class="GtkHBox" id="hbox230">
+ <object class="GtkBox" id="hbox230">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox453">
+ <object class="GtkBox" id="vbox453">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkFrame" id="frame97">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment153">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
- <object class="GtkHBox" id="hbox136">
+ <object class="GtkBox" id="hbox136">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkEventBox" id="eventbox_combobox_mppenc">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkComboBox" id="combobox_mppenc">
+ <object class="GtkComboBoxText" id="combobox_mppenc">
 <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_mppenc_changed"/>
- <signal name="realize" handler="on_combobox_mppenc_realize"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_mppenc_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_mppenc_realize" swapped="no"/>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -8092,6 +8575,7 @@
 <child type="label">
 <object class="GtkLabel" id="label182">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt; MusePack (fichier mpc): &lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
@@ -8106,49 +8590,60 @@
 <child>
 <object class="GtkLabel" id="label382">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox454">
+ <object class="GtkBox" id="vbox454">
 <property name="width_request">174</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkFrame" id="frame148">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment249">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkButton" id="button_defaut_musepack">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_defaut_convertisseur_clicked"/>
+ <signal name="clicked" handler="on_button_defaut_convertisseur_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment233">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox219">
+ <object class="GtkBox" id="hbox219">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image104">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-dialog-info</property>
 </object>
 <packing>
@@ -8160,6 +8655,7 @@
 <child>
 <object class="GtkLabel" id="label361">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">Par defaut</property>
 <property name="use_underline">True</property>
 </object>
@@ -8180,27 +8676,33 @@
 <child type="label">
 <object class="GtkLabel" id="label383">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> &lt;b&gt;Options MUSEPACK&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkFrame" id="frame149">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment250">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox455">
+ <object class="GtkBox" id="vbox455">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkButton" id="button_WebMusepack_homepage">
@@ -8208,19 +8710,22 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_WebInformations_clicked"/>
+ <signal name="clicked" handler="on_button_WebInformations_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment224">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox207">
+ <object class="GtkBox" id="hbox207">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image101">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-connect</property>
 </object>
 <packing>
@@ -8232,6 +8737,7 @@
 <child>
 <object class="GtkLabel" id="label325">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;Site officiel&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 <property name="use_underline">True</property>
@@ -8259,19 +8765,22 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_WebInformations_clicked"/>
+ <signal name="clicked" handler="on_button_WebInformations_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment225">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox208">
+ <object class="GtkBox" id="hbox208">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image102">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-connect</property>
 </object>
 <packing>
@@ -8283,6 +8792,7 @@
 <child>
 <object class="GtkLabel" id="label326">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;Framasoft&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 <property name="use_underline">True</property>
@@ -8311,12 +8821,15 @@
 <child type="label">
 <object class="GtkLabel" id="label384">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> &lt;b&gt;Web Musepack&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -8330,37 +8843,44 @@
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="label337">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
 <object class="GtkFrame" id="frame131">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment210">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox436">
+ <object class="GtkBox" id="vbox436">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkEntry" id="entry_musepack_mpc">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <signal name="changed" handler="on_entry_op_internal_changed"/>
- <signal name="realize" handler="on_entry_musepack_mpc_realize"/>
+ <signal name="changed" handler="on_entry_op_internal_changed" swapped="no"/>
+ <signal name="realize" handler="on_entry_musepack_mpc_realize" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -8370,12 +8890,14 @@
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox193">
+ <object class="GtkBox" id="hbox193">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkLabel" id="label305">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;[&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
@@ -8392,15 +8914,18 @@
 <property name="label" translatable="yes">&lt;b&gt;string option interne&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 <property name="selectable">True</property>
- <signal name="realize" handler="on_label_musepack_mpc_realize"/>
+ <signal name="realize" handler="on_label_musepack_mpc_realize" swapped="no"/>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="label307">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;]&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
@@ -8412,6 +8937,8 @@
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="padding">5</property>
 <property name="position">1</property>
 </packing>
@@ -8423,13 +8950,15 @@
 <child type="label">
 <object class="GtkLabel" id="label308">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Options experts, definies par l'utilisateur - musepack (wav -&gt; mpc) &lt;/b&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt; Experts options defined by the user- musepack (wav -&gt; mpc) &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">2</property>
 </packing>
 </child>
@@ -8441,6 +8970,7 @@
 <child type="tab">
 <object class="GtkLabel" id="label263">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> Musepack </property>
 </object>
 <packing>
@@ -8449,134 +8979,127 @@
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox429">
+ <object class="GtkBox" id="vbox429">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
- <object class="GtkHBox" id="hbox2725">
+ <object class="GtkBox" id="hbox2725">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox497">
+ <object class="GtkBox" id="vbox497">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkFrame" id="frame123">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
- <object class="GtkVBox" id="vbox495">
+ <object class="GtkBox" id="vbox495">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
- <object class="GtkTable" id="table7">
+ <object class="GtkGrid" id="grid2">
 <property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
+ <property name="can_focus">False</property>
+ <property name="column_homogeneous">True</property>
 <child>
- <object class="GtkEventBox" id="eventbox_combobox_faac_set_choice_vbr_abr">
+ <object class="GtkLabel" id="label73">
 <property name="visible">True</property>
- <child>
- <object class="GtkComboBox" id="combobox_faac_set_choice_vbr_abr">
- <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_faac_set_choice_vbr_abr_changed"/>
- <signal name="realize" handler="on_combobox_faac_set_choice_vbr_abr_realize"/>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Conteneur</property>
 </object>
 <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
- <property name="y_padding">5</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkEventBox" id="eventbox_combobox_faac_choice_vbr_abr">
+ <object class="GtkLabel" id="label74">
 <property name="visible">True</property>
- <child>
- <object class="GtkComboBox" id="combobox_faac_choice_vbr_abr">
- <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_faac_choice_vbr_abr_changed"/>
- <signal name="realize" handler="on_combobox_faac_choice_vbr_abr_realize"/>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">VBR / ABR</property>
 </object>
 <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
 <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
- <property name="y_padding">5</property>
 </packing>
 </child>
 <child>
- <object class="GtkEventBox" id="eventbox_combobox_faac_conteneur">
+ <object class="GtkLabel" id="label75">
 <property name="visible">True</property>
- <child>
- <object class="GtkComboBox" id="combobox_faac_conteneur">
- <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_faac_conteneur_changed"/>
- <signal name="realize" handler="on_combobox_faac_conteneur_realize"/>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Qualite VBR / Debit ABR</property>
 </object>
 <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
- <property name="y_padding">5</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label569">
+ <object class="GtkEventBox" id="eventbox_combobox_faac_set_choice_vbr_abr">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"> Qualite VBR / Debit ABR</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkComboBoxText" id="combobox_faac_set_choice_vbr_abr">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_faac_set_choice_vbr_abr_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_faac_set_choice_vbr_abr_realize" swapped="no"/>
+ </object>
+ </child>
 </object>
 <packing>
+ <property name="left_attach">1</property>
 <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label568">
+ <object class="GtkEventBox" id="eventbox_combobox_faac_choice_vbr_abr">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"> VBR / ABR</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkComboBoxText" id="combobox_faac_choice_vbr_abr">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_faac_choice_vbr_abr_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_faac_choice_vbr_abr_realize" swapped="no"/>
+ </object>
+ </child>
 </object>
 <packing>
+ <property name="left_attach">1</property>
 <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label567">
- <property name="width_request">180</property>
+ <object class="GtkEventBox" id="eventbox_combobox_faac_conteneur">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"> Conteneur</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkComboBoxText" id="combobox_faac_conteneur">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_faac_conteneur_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_faac_conteneur_realize" swapped="no"/>
+ </object>
+ </child>
 </object>
 <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
 </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -8585,61 +9108,75 @@
 <child type="label">
 <object class="GtkLabel" id="label279">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt; Faac (fichier .m4a): &lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="label574">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox494">
+ <object class="GtkBox" id="vbox494">
 <property name="width_request">174</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkFrame" id="frame174">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment341">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkButton" id="button_defaut_faac">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_defaut_convertisseur_clicked"/>
+ <signal name="clicked" handler="on_button_defaut_convertisseur_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment342">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox2726">
+ <object class="GtkBox" id="hbox2726">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image202">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-dialog-info</property>
 </object>
 <packing>
@@ -8651,6 +9188,7 @@
 <child>
 <object class="GtkLabel" id="label565">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">Par defaut</property>
 <property name="use_underline">True</property>
 </object>
@@ -8671,6 +9209,7 @@
 <child type="label">
 <object class="GtkLabel" id="label566">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> &lt;b&gt;Options FAAC&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
@@ -8685,15 +9224,18 @@
 <child>
 <object class="GtkFrame" id="frame175">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment343">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox496">
+ <object class="GtkBox" id="vbox496">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkButton" id="button_faac_homepage">
@@ -8701,19 +9243,22 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_WebInformations_clicked"/>
+ <signal name="clicked" handler="on_button_WebInformations_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment344">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox2727">
+ <object class="GtkBox" id="hbox2727">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image203">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-connect</property>
 </object>
 <packing>
@@ -8725,6 +9270,7 @@
 <child>
 <object class="GtkLabel" id="label570">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;Site officiel&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 <property name="use_underline">True</property>
@@ -8752,20 +9298,23 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_WebInformations_clicked"/>
+ <signal name="clicked" handler="on_button_WebInformations_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment345">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <property name="right_padding">15</property>
 <child>
- <object class="GtkHBox" id="hbox2728">
+ <object class="GtkBox" id="hbox2728">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image204">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-connect</property>
 </object>
 <packing>
@@ -8777,6 +9326,7 @@
 <child>
 <object class="GtkLabel" id="label573">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;Web Info&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 <property name="use_underline">True</property>
@@ -8804,20 +9354,23 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_WebInformations_clicked"/>
+ <signal name="clicked" handler="on_button_WebInformations_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment13">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <property name="right_padding">15</property>
 <child>
- <object class="GtkHBox" id="hbox13">
+ <object class="GtkBox" id="hbox13">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image26">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-connect</property>
 </object>
 <packing>
@@ -8829,6 +9382,7 @@
 <child>
 <object class="GtkLabel" id="label15">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;ManPage&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 <property name="use_underline">True</property>
@@ -8857,6 +9411,7 @@
 <child type="label">
 <object class="GtkLabel" id="label572">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> &lt;b&gt;Web Faac&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
@@ -8885,31 +9440,37 @@
 <child>
 <object class="GtkLabel" id="label338">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
 <object class="GtkFrame" id="frame132">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment211">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox437">
+ <object class="GtkBox" id="vbox437">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkEntry" id="entry_faac_m4a">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <signal name="changed" handler="on_entry_op_internal_changed"/>
- <signal name="realize" handler="on_entry_faac_m4a_realize"/>
+ <signal name="changed" handler="on_entry_op_internal_changed" swapped="no"/>
+ <signal name="realize" handler="on_entry_faac_m4a_realize" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -8919,12 +9480,14 @@
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox194">
+ <object class="GtkBox" id="hbox194">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
 <object class="GtkLabel" id="label309">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;[&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
@@ -8941,15 +9504,18 @@
 <property name="label" translatable="yes">&lt;b&gt;string option interne&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 <property name="selectable">True</property>
- <signal name="realize" handler="on_label_faac_m4a_realize"/>
+ <signal name="realize" handler="on_label_faac_m4a_realize" swapped="no"/>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="label311">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;]&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
@@ -8961,6 +9527,8 @@
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="padding">5</property>
 <property name="position">1</property>
 </packing>
@@ -8972,7 +9540,8 @@
 <child type="label">
 <object class="GtkLabel" id="label312">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Options experts, definies par l'utilisateur - faac (wav -&gt; m4a) &lt;/b&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt; Experts options defined by the user - faac (wav -&gt; m4a) &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
@@ -8991,6 +9560,7 @@
 <child type="tab">
 <object class="GtkLabel" id="label264">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> Faac </property>
 </object>
 <packing>
@@ -8999,101 +9569,98 @@
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox511">
+ <object class="GtkBox" id="vbox511">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
- <object class="GtkHBox" id="hbox2803">
+ <object class="GtkBox" id="hbox2803">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox512">
+ <object class="GtkBox" id="vbox512">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkFrame" id="frame195">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
- <object class="GtkVBox" id="vbox513">
+ <object class="GtkBox" id="vbox513">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="homogeneous">True</property>
 <child>
- <object class="GtkTable" id="table8">
+ <object class="GtkGrid" id="grid3">
 <property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
+ <property name="can_focus">False</property>
+ <property name="column_homogeneous">True</property>
 <child>
- <object class="GtkEventBox" id="eventbox_combobox_accplusenc_mono">
+ <object class="GtkLabel" id="label76">
 <property name="visible">True</property>
- <child>
- <object class="GtkComboBox" id="combobox_accplusenc_mono">
- <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_accplusenc_mono_changed"/>
- <signal name="realize" handler="on_combobox_accplusenc_mono_realize"/>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Mono: Qualite en kbit/s</property>
 </object>
 <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
- <property name="y_padding">5</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkEventBox" id="eventbox_combobox_accplusenc_stereo">
+ <object class="GtkLabel" id="label77">
 <property name="visible">True</property>
- <child>
- <object class="GtkComboBox" id="combobox_accplusenc_stereo">
- <property name="visible">True</property>
- <signal name="changed" handler="on_combobox_accplusenc_stereo_changed"/>
- <signal name="realize" handler="on_combobox_accplusenc_stereo_realize"/>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Stereo: Qualite en kbit/s</property>
 </object>
 <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
 <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">5</property>
- <property name="y_padding">5</property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label697">
- <property name="width_request">210</property>
+ <object class="GtkEventBox" id="eventbox_combobox_accplusenc_stereo">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"> Stereo: Qualite en kbit/s</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkComboBoxText" id="combobox_accplusenc_stereo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_accplusenc_stereo_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_accplusenc_stereo_realize" swapped="no"/>
+ </object>
+ </child>
 </object>
 <packing>
+ <property name="left_attach">1</property>
 <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label671">
- <property name="width_request">210</property>
+ <object class="GtkEventBox" id="eventbox_combobox_accplusenc_mono">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"> Mono: Qualite en kbit/s</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkComboBoxText" id="combobox_accplusenc_mono">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="on_combobox_accplusenc_mono_changed" swapped="no"/>
+ <signal name="realize" handler="on_combobox_accplusenc_mono_realize" swapped="no"/>
+ </object>
+ </child>
 </object>
 <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -9102,6 +9669,7 @@
 <child type="label">
 <object class="GtkLabel" id="label674">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt; AacplusEnc (fichier .aac): &lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
@@ -9116,49 +9684,60 @@
 <child>
 <object class="GtkLabel" id="label675">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox514">
+ <object class="GtkBox" id="vbox514">
 <property name="width_request">174</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkFrame" id="frame196">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment404">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkButton" id="button_defaut_aacplusenc">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_defaut_convertisseur_clicked"/>
+ <signal name="clicked" handler="on_button_defaut_convertisseur_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment405">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox2804">
+ <object class="GtkBox" id="hbox2804">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image247">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-dialog-info</property>
 </object>
 <packing>
@@ -9170,6 +9749,7 @@
 <child>
 <object class="GtkLabel" id="label676">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">Par defaut</property>
 <property name="use_underline">True</property>
 </object>
@@ -9190,6 +9770,7 @@
 <child type="label">
 <object class="GtkLabel" id="label677">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> &lt;b&gt;Options AacPlusEnc&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
@@ -9204,15 +9785,18 @@
 <child>
 <object class="GtkFrame" id="frame197">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment406">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox515">
+ <object class="GtkBox" id="vbox515">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkButton" id="button_aacplusenc_homepage">
@@ -9220,19 +9804,22 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_WebInformations_clicked"/>
+ <signal name="clicked" handler="on_button_WebInformations_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment407">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox2805">
+ <object class="GtkBox" id="hbox2805">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image248">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-connect</property>
 </object>
 <packing>
@@ -9244,6 +9831,7 @@
 <child>
 <object class="GtkLabel" id="label678">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;Site officiel&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 <property name="use_underline">True</property>
@@ -9271,20 +9859,23 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_WebInformations_clicked"/>
+ <signal name="clicked" handler="on_button_WebInformations_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment408">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <property name="right_padding">15</property>
 <child>
- <object class="GtkHBox" id="hbox2806">
+ <object class="GtkBox" id="hbox2806">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image249">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-connect</property>
 </object>
 <packing>
@@ -9296,6 +9887,7 @@
 <child>
 <object class="GtkLabel" id="label679">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;Web Info&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 <property name="use_underline">True</property>
@@ -9323,20 +9915,23 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_WebInformations_clicked"/>
+ <signal name="clicked" handler="on_button_WebInformations_clicked" swapped="no"/>
 <child>
 <object class="GtkAlignment" id="alignment14">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <property name="right_padding">15</property>
 <child>
- <object class="GtkHBox" id="hbox14">
+ <object class="GtkBox" id="hbox14">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
 <child>
 <object class="GtkImage" id="image27">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-connect</property>
 </object>
 <packing>
@@ -9348,6 +9943,7 @@
 <child>
 <object class="GtkLabel" id="label16">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;ManPage&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 <property name="use_underline">True</property>
@@ -9376,6 +9972,7 @@
 <child type="label">
 <object class="GtkLabel" id="label680">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> &lt;b&gt;Web AacPlusEnc&lt;/b&gt; </property>
 <property name="use_markup">True</property>
 </object>
@@ -9404,8 +10001,11 @@
 <child>
 <object class="GtkLabel" id="label681">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -9417,6 +10017,7 @@
 <child type="tab">
 <object class="GtkLabel" id="label266">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> AacplusEnc </property>
 </object>
 <packing>
@@ -9425,21 +10026,25 @@
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox418">
+ <object class="GtkBox" id="vbox418">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkFrame" id="frame91">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment141">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox34">
+ <object class="GtkBox" id="vbox34">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkCheckButton" id="checkbutton_artist_tag">
@@ -9449,9 +10054,10 @@
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
 <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
 <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_tag_clicked"/>
- <signal name="realize" handler="on_checkbutton_artist_tag_realize"/>
+ <signal name="clicked" handler="on_checkbutton_tag_clicked" swapped="no"/>
+ <signal name="realize" handler="on_checkbutton_artist_tag_realize" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -9467,9 +10073,10 @@
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
 <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
 <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_tag_clicked"/>
- <signal name="realize" handler="on_checkbutton_title_tag_realize"/>
+ <signal name="clicked" handler="on_checkbutton_tag_clicked" swapped="no"/>
+ <signal name="realize" handler="on_checkbutton_title_tag_realize" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -9485,9 +10092,10 @@
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
 <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
 <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_tag_clicked"/>
- <signal name="realize" handler="on_checkbutton_album_tag_realize"/>
+ <signal name="clicked" handler="on_checkbutton_tag_clicked" swapped="no"/>
+ <signal name="realize" handler="on_checkbutton_album_tag_realize" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -9503,9 +10111,10 @@
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
 <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
 <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_tag_clicked"/>
- <signal name="realize" handler="on_checkbutton_numerate_tag_realize"/>
+ <signal name="clicked" handler="on_checkbutton_tag_clicked" swapped="no"/>
+ <signal name="realize" handler="on_checkbutton_numerate_tag_realize" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -9521,9 +10130,10 @@
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
 <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
 <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_tag_clicked"/>
- <signal name="realize" handler="on_checkbutton_genre_tag_realize"/>
+ <signal name="clicked" handler="on_checkbutton_tag_clicked" swapped="no"/>
+ <signal name="realize" handler="on_checkbutton_genre_tag_realize" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -9539,9 +10149,10 @@
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
 <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
 <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_tag_clicked"/>
- <signal name="realize" handler="on_checkbutton_year_tag_realize"/>
+ <signal name="clicked" handler="on_checkbutton_tag_clicked" swapped="no"/>
+ <signal name="realize" handler="on_checkbutton_year_tag_realize" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -9557,9 +10168,10 @@
 <property name="receives_default">False</property>
 <property name="border_width">5</property>
 <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
 <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_tag_clicked"/>
- <signal name="realize" handler="on_checkbutton_comment_tag_realize"/>
+ <signal name="clicked" handler="on_checkbutton_tag_clicked" swapped="no"/>
+ <signal name="realize" handler="on_checkbutton_comment_tag_realize" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -9574,6 +10186,7 @@
 <child type="label">
 <object class="GtkLabel" id="label163">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt; Exportation de &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
@@ -9581,6 +10194,7 @@
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -9592,6 +10206,7 @@
 <child type="tab">
 <object class="GtkLabel" id="label670">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> Tags </property>
 </object>
 <packing>
@@ -9607,6 +10222,7 @@
 <child type="tab">
 <object class="GtkLabel" id="label95">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> Preferences </property>
 </object>
 <packing>
@@ -9615,18 +10231,20 @@
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox5">
+ <object class="GtkBox" id="vbox5">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
 <object class="GtkNotebook" id="notebook_app_externes">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="border_width">5</property>
- <signal name="switch_page" handler="on_notebook_app_externes_switch_page"/>
+ <signal name="switch-page" handler="on_notebook_app_externes_switch_page" swapped="no"/>
 <child>
- <object class="GtkVBox" id="vbox9">
+ <object class="GtkBox" id="vbox9">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="orientation">vertical</property>
 <child>
@@ -9634,34 +10252,38 @@
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="border_width">5</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
 <property name="shadow_type">in</property>
- <signal name="realize" handler="on_scrolledwindow_applications_externes_realize"/>
+ <signal name="realize" handler="on_scrolledwindow_applications_externes_realize" swapped="no"/>
 <child>
 <placeholder/>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox501">
+ <object class="GtkBox" id="vbox501">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <child>
- <object class="GtkHBox" id="hbox2745">
+ <object class="GtkBox" id="hbox2745">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkFrame" id="frame179">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment361">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkButton" id="button_scan_without_deb">
 <property name="label" translatable="yes">SCAN</property>
@@ -9669,7 +10291,7 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="use_underline">True</property>
- <signal name="clicked" handler="on_button_scan_without_deb_clicked"/>
+ <signal name="clicked" handler="on_button_scan_without_deb_clicked" swapped="no"/>
 </object>
 </child>
 </object>
@@ -9677,28 +10299,34 @@
 <child type="label">
 <object class="GtkLabel" id="label595">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt; Installation &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkFrame" id="frame180">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment362">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkLabel" id="label_type_package">
 <property name="visible">True</property>
- <signal name="realize" handler="on_label_type_package_realize"/>
+ <property name="can_focus">False</property>
+ <signal name="realize" handler="on_label_type_package_realize" swapped="no"/>
 </object>
 </child>
 </object>
@@ -9706,12 +10334,15 @@
 <child type="label">
 <object class="GtkLabel" id="label596">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Votre systeme utilise ... &lt;/b&gt;</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt; Your system use ... &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -9725,25 +10356,31 @@
 <child>
 <object class="GtkFrame" id="frame181">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment363">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkHBox" id="hbox28">
+ <object class="GtkBox" id="hbox28">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkLabel" id="label599">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">
-&lt;b&gt;&lt;i&gt;Pour installer les programmes externes requis,
-veuillez utiliser l'installateur de votre distribution Gnu/Linux.&lt;/i&gt;&lt;/b&gt;
+&lt;b&gt;&lt;i&gt;To install the required external programs
+Please use the installer to your distribution Gnu / Linux.&lt;/i&gt;&lt;/b&gt;
 </property>
 <property name="use_markup">True</property>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -9755,12 +10392,13 @@
 <property name="receives_default">False</property>
 <property name="tooltip_text" translatable="yes">Le programme XCFA_INSTALL_ALL ecrit en Perl vous sera utile en ligne de commande pour une installation des programmes complementaire.</property>
 <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_see_xcfa_install_clicked"/>
+ <signal name="clicked" handler="on_button_see_xcfa_install_clicked" swapped="no"/>
 <child>
 <object class="GtkImage" id="image30">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-network</property>
- <property name="icon-size">5</property>
+ <property name="icon_size">5</property>
 </object>
 </child>
 </object>
@@ -9777,12 +10415,15 @@
 <child type="label">
 <object class="GtkLabel" id="label597">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt; Informations &lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -9798,35 +10439,43 @@
 <child type="tab">
 <object class="GtkLabel" id="label172">
 <property name="visible">True</property>
- <property name="label" translatable="yes"> Application externes </property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"> External application </property>
 </object>
 <packing>
 <property name="tab_fill">False</property>
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox36">
+ <object class="GtkBox" id="vbox36">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="orientation">vertical</property>
 <property name="spacing">10</property>
 <child>
 <object class="GtkFrame" id="frame9">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment15">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <child>
- <object class="GtkHBox" id="hbox15">
+ <object class="GtkBox" id="hbox15">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkLabel" id="label26">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -9834,10 +10483,12 @@
 <object class="GtkEntry" id="entry_navigateur_extra">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <signal name="changed" handler="on_entry_navigateur_extra_changed"/>
- <signal name="realize" handler="on_entry_navigateur_extra_realize"/>
+ <signal name="changed" handler="on_entry_navigateur_extra_changed" swapped="no"/>
+ <signal name="realize" handler="on_entry_navigateur_extra_realize" swapped="no"/>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -9845,21 +10496,27 @@
 <object class="GtkLabel" id="label_navigateur_extra">
 <property name="width_request">100</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0.10000000149011612</property>
 <property name="use_markup">True</property>
 <property name="justify">right</property>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">2</property>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="label27">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;i&gt;parametres:&lt;/i&gt;</property>
 <property name="use_markup">True</property>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">3</property>
 </packing>
 </child>
@@ -9867,10 +10524,16 @@
 <object class="GtkEntry" id="entry_param_navigateur_extra">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <signal name="changed" handler="on_entry_param_navigateur_extra_changed"/>
- <signal name="realize" handler="on_entry_param_navigateur_extra_realize"/>
+ <property name="tooltip_text" translatable="yes">
+ konqueror : newTab
+ iceweasel : -new-window -new-tab 
+</property>
+ <signal name="changed" handler="on_entry_param_navigateur_extra_changed" swapped="no"/>
+ <signal name="realize" handler="on_entry_param_navigateur_extra_realize" swapped="no"/>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">4</property>
 </packing>
 </child>
@@ -9881,6 +10544,7 @@
 <child type="label">
 <object class="GtkLabel" id="label23">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;Navigateur&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
@@ -9896,20 +10560,26 @@
 <child>
 <object class="GtkFrame" id="frame15">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">in</property>
 <child>
 <object class="GtkAlignment" id="alignment25">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">4</property>
 <child>
- <object class="GtkHBox" id="hbox16">
+ <object class="GtkBox" id="hbox16">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkLabel" id="label28">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -9917,10 +10587,12 @@
 <object class="GtkEntry" id="entry_lecteur_audio_extra">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <signal name="changed" handler="on_entry_lecteur_audio_extra_changed"/>
- <signal name="realize" handler="on_entry_lecteur_audio_extra_realize"/>
+ <signal name="changed" handler="on_entry_lecteur_audio_extra_changed" swapped="no"/>
+ <signal name="realize" handler="on_entry_lecteur_audio_extra_realize" swapped="no"/>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -9928,21 +10600,27 @@
 <object class="GtkLabel" id="label_lecteur_audio_extra">
 <property name="width_request">100</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0.10000000894069672</property>
 <property name="use_markup">True</property>
 <property name="justify">right</property>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">2</property>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="label24">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;i&gt;parametres:&lt;/i&gt;</property>
 <property name="use_markup">True</property>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">3</property>
 </packing>
 </child>
@@ -9950,10 +10628,12 @@
 <object class="GtkEntry" id="entry_param_lecteur_audio_extra">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <signal name="changed" handler="on_entry_param_lecteur_audio_extra_changed"/>
- <signal name="realize" handler="on_entry_param_lecteur_audio_extra_realize"/>
+ <signal name="changed" handler="on_entry_param_lecteur_audio_extra_changed" swapped="no"/>
+ <signal name="realize" handler="on_entry_param_lecteur_audio_extra_realize" swapped="no"/>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">4</property>
 </packing>
 </child>
@@ -9964,6 +10644,7 @@
 <child type="label">
 <object class="GtkLabel" id="label25">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;b&gt;Lecteurs audio&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
@@ -9984,7 +10665,8 @@
 <child type="tab">
 <object class="GtkLabel" id="label173">
 <property name="visible">True</property>
- <property name="label" translatable="yes"> Navigateurs / Lecteurs audio </property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">  Browsers / Audio Players </property>
 </object>
 <packing>
 <property name="position">1</property>
@@ -9993,6 +10675,8 @@
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -10004,6 +10688,7 @@
 <child type="tab">
 <object class="GtkLabel" id="label105">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes"> Applications externes </property>
 </object>
 <packing>
@@ -10013,4767 +10698,28 @@
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="padding">5</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox2672">
+ <object class="GtkBox" id="hbox2672">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="homogeneous">True</property>
 <child>
 <object class="GtkLabel" id="label_statusbar_global">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label">&lt;b&gt;label472&lt;/b&gt;</property>
 <property name="use_markup">True</property>
- <signal name="realize" handler="on_label_statusbar_global_realize"/>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <object class="GtkDialog" id="WindScan">
- <property name="width_request">411</property>
- <property name="border_width">5</property>
- <property name="title" translatable="yes">Scan en cours ...</property>
- <property name="resizable">False</property>
- <property name="modal">True</property>
- <property name="window_position">center-on-parent</property>
- <property name="type_hint">dialog</property>
- <property name="has_separator">False</property>
- <signal name="destroy_event" handler="on_WindScan_destroy_event"/>
- <signal name="delete_event" handler="on_WindScan_delete_event"/>
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkVBox" id="vbox13">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkHBox" id="hbox17">
- <property name="visible">True</property>
- <child>
- <object class="GtkImage" id="image31">
- <property name="visible">True</property>
- <property name="stock">gtk-execute</property>
- <property name="icon-size">6</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_windscan">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Scan du support en cours ...&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- <property name="justify">center</property>
- <signal name="realize" handler="on_label_windscan_realize"/>
- </object>
- <packing>
- <property name="padding">5</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkProgressBar" id="progressbar_windscan">
- <property name="visible">True</property>
- <signal name="realize" handler="on_progressbar_windscan_realize"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="padding">5</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkExpander" id="expander_windscan">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow_windscan">
- <property name="height_request">150</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <signal name="realize" handler="on_scrolledwindow_windscan_realize"/>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label22">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Detail extraction mode expert</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="button_cancel_windscan">
- <property name="label">gtk-cancel</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="on_button_cancel_windscan_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="0">button_cancel_windscan</action-widget>
- </action-widgets>
- </object>
- <object class="GtkWindow" id="wind_treeview">
- <property name="title" translatable="yes">Modification des champs</property>
- <property name="resizable">False</property>
- <property name="modal">True</property>
- <property name="window_position">center-on-parent</property>
- <signal name="destroy_event" handler="on_wind_treeview_destroy_event"/>
- <signal name="delete_event" handler="on_wind_treeview_delete_event"/>
- <child>
- <object class="GtkVBox" id="vbox466">
- <property name="visible">True</property>
- <property name="border_width">2</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkHBox" id="hbox2679">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <child>
- <object class="GtkImage" id="image153">
- <property name="visible">True</property>
- <property name="icon_name">gtk-dialog-info</property>
- <property name="icon-size">5</property>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label482">
- <property name="visible">True</property>
- <property name="label" translatable="yes">
-&lt;b&gt;Modification des champs&lt;/b&gt;
-</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox467">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkNotebook" id="notebook_windtreeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="border_width">5</property>
- <property name="tab_pos">left</property>
- <signal name="switch_page" handler="on_notebook_windtreeview_switch_page"/>
- <child>
- <object class="GtkHBox" id="hbox2684">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <child>
- <object class="GtkFrame" id="frame160">
- <property name="width_request">120</property>
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkAlignment" id="alignment312">
- <property name="visible">True</property>
- <child>
- <object class="GtkVBox" id="vbox468">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkCheckButton" id="checkbutton_titre_dvd">
- <property name="label" translatable="yes">Titre</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_play_dvd">
- <property name="label" translatable="yes">Play</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_temps_dvd">
- <property name="label" translatable="yes">Temps</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_format_dvd">
- <property name="label" translatable="yes">Format</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_choix_dvd">
- <property name="label" translatable="yes">Choix</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_normalise_dvd">
- <property name="label" translatable="yes">Normalise</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_nom_dvd">
- <property name="label" translatable="yes">Nom</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">6</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label492">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Visibilite &lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame161">
- <property name="width_request">143</property>
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkAlignment" id="alignment313">
- <property name="visible">True</property>
- <child>
- <object class="GtkVBox" id="vbox475">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkRadioButton" id="radiobutton_nameleft_dvd">
- <property name="label" translatable="yes">Nom a gauche</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="radiobutton_namecenter_dvd">
- <property name="label" translatable="yes">Nom au centre</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">radiobutton_nameleft_dvd</property>
- <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="radiobutton_nameright_dvd">
- <property name="label" translatable="yes">Nom a droite</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">radiobutton_nameleft_dvd</property>
- <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label493">
- <property name="visible">True</property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label483">
- <property name="visible">True</property>
- <property name="label" translatable="yes">DVD</property>
- </object>
- <packing>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox2685">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <child>
- <object class="GtkFrame" id="frame162">
- <property name="width_request">140</property>
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkAlignment" id="alignment314">
- <property name="visible">True</property>
- <child>
- <object class="GtkVBox" id="vbox469">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkCheckButton" id="checkbutton_play_cd">
- <property name="label" translatable="yes">Play</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_wav_cd">
- <property name="label" translatable="yes">Wav</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_flac_cd">
- <property name="label" translatable="yes">Flac</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_ape_cd">
- <property name="label" translatable="yes">Ape</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_wavpack_cd">
- <property name="label" translatable="yes">Wavpack</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_ogg_cd">
- <property name="label" translatable="yes">Ogg</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_m4a_cd">
- <property name="label" translatable="yes">M4a</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">6</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_aac_cd">
- <property name="label" translatable="yes">Aac</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">7</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_musepack_cd">
- <property name="label" translatable="yes">Musepack</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">8</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_mp3_cd">
- <property name="label" translatable="yes">Mp3</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">9</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_num_cd">
- <property name="label" translatable="yes">Num</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">10</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_time_cd">
- <property name="label" translatable="yes">Time</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">11</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_normalise_cd">
- <property name="label" translatable="yes">Normalise</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">12</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_nom_cd">
- <property name="label" translatable="yes">Nom</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">13</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label494">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Visibilite &lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame163">
- <property name="width_request">140</property>
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkAlignment" id="alignment315">
- <property name="visible">True</property>
- <child>
- <object class="GtkVBox" id="vbox477">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkRadioButton" id="radiobutton_nameleft_cd">
- <property name="label" translatable="yes">Nom a gauche</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="radiobutton_namecenter_cd">
- <property name="label" translatable="yes">Nom au centre</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">radiobutton_nameleft_cd</property>
- <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="radiobutton_nameright_cd">
- <property name="label" translatable="yes">Nom a droite</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">radiobutton_nameleft_cd</property>
- <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label495">
- <property name="visible">True</property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label484">
- <property name="visible">True</property>
- <property name="label" translatable="yes">CD</property>
- </object>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox2686">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <child>
- <object class="GtkFrame" id="frame164">
- <property name="width_request">120</property>
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkAlignment" id="alignment316">
- <property name="visible">True</property>
- <child>
- <object class="GtkVBox" id="vbox470">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkCheckButton" id="checkbutton_play_allfile">
- <property name="label" translatable="yes">Play</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_trash_allfile">
- <property name="label" translatable="yes">Trash</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_type_allfile">
- <property name="label" translatable="yes">Type</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_wav_allfile">
- <property name="label" translatable="yes">Wav</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_flac_allfile">
- <property name="label" translatable="yes">Flac</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_ape_allfile">
- <property name="label" translatable="yes">Ape</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_wavpack_allfile">
- <property name="label" translatable="yes">Wavpack</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">6</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_ogg_allfile">
- <property name="label" translatable="yes">Ogg</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">7</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_m4a_allfile">
- <property name="label" translatable="yes">M4a</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">8</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_aac_allfile">
- <property name="label" translatable="yes">Aac</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">9</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_musepack_allfile">
- <property name="label" translatable="yes">Musepack</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">10</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_mp3_allfile">
- <property name="label" translatable="yes">Mp3</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">11</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_time_allfile">
- <property name="label" translatable="yes">Time</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">12</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_normalise_allfile">
- <property name="label" translatable="yes">Normalise</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">13</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_replaygain_allfile">
- <property name="label" translatable="yes">Replaygain</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">14</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_nom_allfile">
- <property name="label" translatable="yes">Nom</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">15</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label496">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Visibilite &lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame165">
- <property name="width_request">130</property>
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkAlignment" id="alignment317">
- <property name="visible">True</property>
- <child>
- <object class="GtkVBox" id="vbox479">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkRadioButton" id="radiobutton_nameleft_allfile">
- <property name="label" translatable="yes">Nom a gauche</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="radiobutton_namecenter_allfile">
- <property name="label" translatable="yes">Nom au centre</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">radiobutton_nameleft_allfile</property>
- <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="radiobutton_nameright_allfile">
- <property name="label" translatable="yes">Nom a droite</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">radiobutton_nameleft_allfile</property>
- <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label497">
- <property name="visible">True</property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label485">
- <property name="visible">True</property>
- <property name="label" translatable="yes">CONVERSIONS</property>
- </object>
- <packing>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox2687">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <child>
- <object class="GtkFrame" id="frame166">
- <property name="width_request">120</property>
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkAlignment" id="alignment318">
- <property name="visible">True</property>
- <child>
- <object class="GtkVBox" id="vbox471">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkCheckButton" id="checkbutton_hertz_wav">
- <property name="label" translatable="yes">Hertz</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_newhertz_wav">
- <property name="label" translatable="yes">New Hertz</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_voie_wav">
- <property name="label" translatable="yes">Voie</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_newvoie_wav">
- <property name="label" translatable="yes">New Voie</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_bits_wav">
- <property name="label" translatable="yes">Bits</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_newbits_wav">
- <property name="label" translatable="yes">New Bits</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_nom_wav">
- <property name="label" translatable="yes">Nom</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">6</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label498">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Visibilite &lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame167">
- <property name="width_request">130</property>
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkAlignment" id="alignment319">
- <property name="visible">True</property>
- <child>
- <object class="GtkVBox" id="vbox481">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkRadioButton" id="radiobutton_nameleft_wav">
- <property name="label" translatable="yes">Nom a gauche</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="radiobutton_namecenter_wav">
- <property name="label" translatable="yes">Nom au centre</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">radiobutton_nameleft_wav</property>
- <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="radiobutton_nameright_wav">
- <property name="label" translatable="yes">Nom a droite</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">radiobutton_nameleft_wav</property>
- <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label499">
- <property name="visible">True</property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label486">
- <property name="visible">True</property>
- <property name="label" translatable="yes">WAV</property>
- </object>
- <packing>
- <property name="position">3</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox2688">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <child>
- <object class="GtkFrame" id="frame168">
- <property name="width_request">120</property>
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkAlignment" id="alignment320">
- <property name="visible">True</property>
- <child>
- <object class="GtkVBox" id="vbox472">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkCheckButton" id="checkbutton_type_mp3ogg">
- <property name="label" translatable="yes">Type</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_bitrate_mp3ogg">
- <property name="label" translatable="yes">Bitrate</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_nexbitrate_mp3ogg">
- <property name="label" translatable="yes">New Bitrate</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_size_mp3ogg">
- <property name="label" translatable="yes">Size</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_time_mp3ogg">
- <property name="label" translatable="yes">Time</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_nom_mp3ogg">
- <property name="label" translatable="yes">Nom</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">5</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label500">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Visibilite &lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame169">
- <property name="width_request">130</property>
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkAlignment" id="alignment321">
- <property name="visible">True</property>
- <property name="left_padding">1</property>
- <child>
- <object class="GtkVBox" id="vbox483">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkRadioButton" id="radiobutton_nameleft_mp3ogg">
- <property name="label" translatable="yes">Nom a gauche</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="radiobutton_namecenter_mp3ogg">
- <property name="label" translatable="yes">Nom au centre</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">radiobutton_nameleft_mp3ogg</property>
- <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="radiobutton_nameright_mp3ogg">
- <property name="label" translatable="yes">Nom a droite</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">radiobutton_nameleft_mp3ogg</property>
- <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label501">
- <property name="visible">True</property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">4</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label487">
- <property name="visible">True</property>
- <property name="label" translatable="yes">MP3-OGG</property>
- </object>
- <packing>
- <property name="position">4</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox19">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <child>
- <object class="GtkFrame" id="frame16">
- <property name="width_request">120</property>
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkAlignment" id="alignment33">
- <property name="visible">True</property>
- <child>
- <object class="GtkVBox" id="vbox14">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkCheckButton" id="checkbutton_type_tags">
- <property name="label" translatable="yes">Type</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_time_tags">
- <property name="label" translatable="yes">Time</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_nom_tags">
- <property name="label" translatable="yes">Nom</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label17">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt; Visibilite &lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame17">
- <property name="width_request">130</property>
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkAlignment" id="alignment34">
- <property name="visible">True</property>
- <property name="left_padding">1</property>
- <child>
- <object class="GtkVBox" id="vbox15">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkRadioButton" id="radiobutton_nameleft_tags">
- <property name="label" translatable="yes">Nom a gauche</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="radiobutton_namecenter_tags">
- <property name="label" translatable="yes">Nom au centre</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">radiobutton_nameleft_tags</property>
- <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="radiobutton_nameright_tags">
- <property name="label" translatable="yes">Nom a droite</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">radiobutton_nameleft_tags</property>
- <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label29">
- <property name="visible">True</property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">5</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label34">
- <property name="visible">True</property>
- <property name="label" translatable="yes">TAGS</property>
- </object>
- <packing>
- <property name="position">5</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox2680">
- <property name="visible">True</property>
- <child>
- <object class="GtkButton" id="button_select_global_windtreeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_select_global_windtreeview_clicked"/>
- <child>
- <object class="GtkAlignment" id="alignment310">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox2682">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image155">
- <property name="visible">True</property>
- <property name="stock">gtk-redo</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label490">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Selection globale</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button_deselect_global_windtreeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_deselect_global_windtreeview_clicked"/>
- <child>
- <object class="GtkAlignment" id="alignment309">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox2681">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image154">
- <property name="visible">True</property>
- <property name="stock">gtk-clear</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label489">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Deselection globale</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button_quit_windtreeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="border_width">5</property>
- <signal name="clicked" handler="on_button_quit_windtreeview_clicked"/>
- <child>
- <object class="GtkAlignment" id="alignment311">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox2683">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image156">
- <property name="visible">True</property>
- <property name="stock">gtk-quit</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label491">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Retour</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <object class="GtkWindow" id="WindReader">
- <property name="width_request">464</property>
- <property name="resizable">False</property>
- <property name="window_position">center-on-parent</property>
- <signal name="destroy_event" handler="on_WindReader_destroy_event"/>
- <signal name="delete_event" handler="on_WindReader_delete_event"/>
- <child>
- <object class="GtkVBox" id="vbox20">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkHBox" id="hbox32">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <child>
- <object class="GtkButton" id="button_quitter_WindReader">
- <property name="label">gtk-quit</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="on_button_quitter_WindReader_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button_lecture_WindReader">
- <property name="label">gtk-media-play</property>
- <property name="width_request">110</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="on_button_lecture_WindReader_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button_pause_WindReader">
- <property name="label">gtk-media-pause</property>
- <property name="width_request">110</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="on_button_pause_WindReader_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox_WindReader">
- <property name="visible">True</property>
- <signal name="realize" handler="on_hbox_WindReader_realize"/>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <object class="GtkWindow" id="wind_about">
- <property name="title" translatable="yes">About X Convert File Audio</property>
- <property name="resizable">False</property>
- <property name="modal">True</property>
- <property name="window_position">center-on-parent</property>
- <signal name="destroy_event" handler="on_wind_about_destroy_event"/>
- <signal name="delete_event" handler="on_wind_about_delete_event"/>
- <child>
- <object class="GtkVBox" id="vbox486">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkNotebook" id="notebook1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="border_width">5</property>
- <child>
- <object class="GtkVBox" id="vbox487">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkImage" id="image_about">
- <property name="visible">True</property>
- <property name="stock">gtk-missing-image</property>
- <signal name="realize" handler="on_image_about_realize"/>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame172">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkAlignment" id="alignment324">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label_xcfa_about">
- <property name="visible">True</property>
- <property name="use_markup">True</property>
- <signal name="realize" handler="on_label_xcfa_about_realize"/>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label507">
- <property name="visible">True</property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox33">
- <property name="visible">True</property>
- <child>
- <object class="GtkFrame" id="frame173">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkAlignment" id="alignment325">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label_author_about">
- <property name="visible">True</property>
- <property name="use_markup">True</property>
- <signal name="realize" handler="on_label_author_about_realize"/>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label508">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Author&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame18">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkAlignment" id="alignment35">
- <property name="visible">True</property>
- <child>
- <object class="GtkImage" id="image_gpl_xcfa_about">
- <property name="visible">True</property>
- <property name="xpad">10</property>
- <property name="stock">gtk-missing-image</property>
- <signal name="realize" handler="on_image_gpl_xcfa_about_realize"/>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label47">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Licence&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label504">
- <property name="visible">True</property>
- <property name="label" translatable="yes"> Informations </property>
- </object>
- <packing>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow3">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <child>
- <object class="GtkViewport" id="viewport2">
- <property name="visible">True</property>
- <property name="resize_mode">queue</property>
- <child>
- <object class="GtkLabel" id="label_about_machine">
- <property name="visible">True</property>
- <property name="use_markup">True</property>
- <property name="selectable">True</property>
- <signal name="realize" handler="on_label_about_machine_realize"/>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label506">
- <property name="visible">True</property>
- <property name="label" translatable="yes"> Machine </property>
- </object>
- <packing>
- <property name="position">3</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow14">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <child>
- <object class="GtkViewport" id="viewport8">
- <property name="visible">True</property>
- <child>
- <object class="GtkVBox" id="vbox488">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkLabel" id="label_contrib_about">
- <property name="visible">True</property>
- <property name="use_markup">True</property>
- <property name="selectable">True</property>
- <signal name="realize" handler="on_label_contrib_about_realize"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkTable" id="table13">
- <property name="visible">True</property>
- <property name="n_rows">9</property>
- <property name="n_columns">4</property>
- <child>
- <object class="GtkLabel" id="label748">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">@Shankarius
-@Dzef</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label749">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">
-Stephane de la Linuxerie
-@xens</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label750">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">
-@Bapoumba
-@Shankarius
-@Dzef
-Guillaume
-Gerry Butler</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label751">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">
-Karsten Mehrhoff</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label741">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;b&gt;Ingenieurs du son&lt;/b&gt;
-</property>
- <property name="use_markup">True</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label742">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">
-&lt;b&gt;Graphisme&lt;/b&gt;
-</property>
- <property name="use_markup">True</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label743">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;b&gt;Traduction Anglaise&lt;/b&gt;
-
-
-</property>
- <property name="use_markup">True</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label744">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">
-&lt;b&gt;Traduction Allemande&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label756">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label757">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label758">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label759">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label760">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label761">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label755">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label762">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label763">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label764">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label765">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label766">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label767">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label768">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label769">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label770">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label747">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">
-&lt;b&gt;Codeur Xcfa&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label754">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">
-@b52 alias @xcfaudio</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label746">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">
-&lt;b&gt;ElementSpeak pour Xcfa&lt;/b&gt; </property>
- <property name="use_markup">True</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label753">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">
-@Shankarius</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label745">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">
-&lt;b&gt;Codeur pages Web&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label752">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">
-@zarer</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label831">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">
-&lt;b&gt;Traduction Italienne&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label832">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">
-Guillaume</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox2816">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label776">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label773">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">
-
-&lt;b&gt;Pages a visiter&lt;/b&gt;
-</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label777">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="table11">
- <property name="visible">True</property>
- <property name="n_rows">12</property>
- <property name="n_columns">3</property>
- <child>
- <object class="GtkLabel" id="label708">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label709">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label710">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label711">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label712">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label713">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label714">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label715">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label716">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">9</property>
- <property name="bottom_attach">10</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label717">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">10</property>
- <property name="bottom_attach">11</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label719">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label720">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label721">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label722">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label723">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label724">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label725">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label726">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label727">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">9</property>
- <property name="bottom_attach">10</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label728">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">10</property>
- <property name="bottom_attach">11</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button03_contrib_about">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="border_width">3</property>
- <signal name="clicked" handler="on_button_contrib_about_clicked"/>
- <child>
- <object class="GtkAlignment" id="alignment329">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox2694">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image161">
- <property name="visible">True</property>
- <property name="stock">gtk-connect</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_button_5">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Linux On The Root</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button17_contrib_about">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="border_width">3</property>
- <signal name="clicked" handler="on_button_contrib_about_clicked"/>
- <child>
- <object class="GtkAlignment" id="alignment421">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox2814">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image254">
- <property name="visible">True</property>
- <property name="stock">gtk-connect</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label706">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Frugalware</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button01_contrib_about">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="border_width">3</property>
- <signal name="clicked" handler="on_button_contrib_about_clicked"/>
- <child>
- <object class="GtkAlignment" id="alignment326">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox2691">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image158">
- <property name="visible">True</property>
- <property name="stock">gtk-connect</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_button_1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Road2Mayotte</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button15_contrib_about">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="border_width">3</property>
- <signal name="clicked" handler="on_button_contrib_about_clicked"/>
- <child>
- <object class="GtkAlignment" id="alignment392">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox2787">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image238">
- <property name="visible">True</property>
- <property name="stock">gtk-connect</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label656">
- <property name="visible">True</property>
- <property name="label" translatable="yes">La Linuxerie</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button05_contrib_about">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="border_width">3</property>
- <signal name="clicked" handler="on_button_contrib_about_clicked"/>
- <child>
- <object class="GtkAlignment" id="alignment331">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox2696">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image163">
- <property name="visible">True</property>
- <property name="stock">gtk-connect</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_button_7">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Audioptimisation by Dzef</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button06_contrib_about">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="border_width">3</property>
- <signal name="clicked" handler="on_button_contrib_about_clicked"/>
- <child>
- <object class="GtkAlignment" id="alignment332">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox2697">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image164">
- <property name="visible">True</property>
- <property name="stock">gtk-connect</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_button_8">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Tuxfamily</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button07_contrib_about">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="border_width">3</property>
- <signal name="clicked" handler="on_button_contrib_about_clicked"/>
- <child>
- <object class="GtkAlignment" id="alignment333">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox2698">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image165">
- <property name="visible">True</property>
- <property name="stock">gtk-connect</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_button_9">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Framasoft</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button08_contrib_about">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="border_width">3</property>
- <signal name="clicked" handler="on_button_contrib_about_clicked"/>
- <child>
- <object class="GtkAlignment" id="alignment334">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox2699">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image166">
- <property name="visible">True</property>
- <property name="stock">gtk-connect</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_button_10">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ekd (EnKoDeur-Mixeur)</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button02_contrib_about">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="border_width">3</property>
- <signal name="clicked" handler="on_button_contrib_about_clicked"/>
- <child>
- <object class="GtkAlignment" id="alignment328">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox2693">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image160">
- <property name="visible">True</property>
- <property name="stock">gtk-connect</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_button_4">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Bishop's page</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">9</property>
- <property name="bottom_attach">10</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button04_contrib_about">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="border_width">3</property>
- <signal name="clicked" handler="on_button_contrib_about_clicked"/>
- <child>
- <object class="GtkAlignment" id="alignment425">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox2819">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image257">
- <property name="visible">True</property>
- <property name="stock">gtk-connect</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label781">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Je suis libre</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">10</property>
- <property name="bottom_attach">11</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label707">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label718">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button16_contrib_about">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="border_width">3</property>
- <signal name="clicked" handler="on_button_contrib_about_clicked"/>
- <child>
- <object class="GtkAlignment" id="alignment420">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox2813">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image253">
- <property name="visible">True</property>
- <property name="stock">gtk-connect</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label703">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Debian Multimedia</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label52">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">11</property>
- <property name="bottom_attach">12</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label53">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">11</property>
- <property name="bottom_attach">12</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button22_contrib_about">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="border_width">3</property>
- <signal name="clicked" handler="on_button_contrib_about_clicked"/>
- <child>
- <object class="GtkAlignment" id="alignment36">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox35">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="stock">gtk-connect</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label54">
- <property name="visible">True</property>
- <property name="label">Alessio Treglia</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">11</property>
- <property name="bottom_attach">12</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox2815">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label771">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label802">
- <property name="visible">True</property>
- <property name="label" translatable="yes">
-&lt;b&gt;Forum&lt;/b&gt;
-</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label772">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="table15">
- <property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">3</property>
- <child>
- <object class="GtkButton" id="button20_contrib_about">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="border_width">3</property>
- <signal name="clicked" handler="on_button_contrib_about_clicked"/>
- <child>
- <object class="GtkAlignment" id="alignment431">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox2829">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image265">
- <property name="visible">True</property>
- <property name="stock">gtk-connect</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label800">
- <property name="visible">True</property>
- <property name="label" translatable="yes">XCFA Vorstellung </property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button21_contrib_about">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="border_width">3</property>
- <signal name="clicked" handler="on_button_contrib_about_clicked"/>
- <child>
- <object class="GtkAlignment" id="alignment432">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox2830">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image266">
- <property name="visible">True</property>
- <property name="stock">gtk-connect</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label801">
- <property name="visible">True</property>
- <property name="label" translatable="yes">XCFA LinuxForen.de</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label808">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label807">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label806">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label810">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label811">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label809">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button09_contrib_about">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="border_width">3</property>
- <signal name="clicked" handler="on_button_contrib_about_clicked"/>
- <child>
- <object class="GtkAlignment" id="alignment327">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox2692">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image159">
- <property name="visible">True</property>
- <property name="stock">gtk-connect</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_button_3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Forum Xcfa</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">6</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox2831">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label803">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label804">
- <property name="visible">True</property>
- <property name="label" translatable="yes">
-&lt;b&gt;Documentation&lt;/b&gt;
-</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label805">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">7</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="table12">
- <property name="visible">True</property>
- <property name="n_rows">6</property>
- <property name="n_columns">3</property>
- <child>
- <object class="GtkLabel" id="label730">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label731">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label732">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label733">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label734">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label736">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label737">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label738">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label739">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label740">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label729">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label735">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button10_contrib_about">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="border_width">3</property>
- <signal name="clicked" handler="on_button_contrib_about_clicked"/>
- <child>
- <object class="GtkAlignment" id="alignment426">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox2820">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image258">
- <property name="visible">True</property>
- <property name="stock">gtk-connect</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label782">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Wiki Xcfa par Shankarius</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button11_contrib_about">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="border_width">3</property>
- <signal name="clicked" handler="on_button_contrib_about_clicked"/>
- <child>
- <object class="GtkAlignment" id="alignment337">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox2721">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image198">
- <property name="visible">True</property>
- <property name="stock">gtk-connect</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label561">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Doc Xcfa par Patachon</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button12_contrib_about">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="border_width">2</property>
- <signal name="clicked" handler="on_button_contrib_about_clicked"/>
- <child>
- <object class="GtkAlignment" id="alignment340">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox2724">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image201">
- <property name="visible">True</property>
- <property name="stock">gtk-connect</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label564">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ogg Vorbis explique par Shankarius</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button13_contrib_about">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="border_width">3</property>
- <signal name="clicked" handler="on_button_contrib_about_clicked"/>
- <child>
- <object class="GtkAlignment" id="alignment339">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox2723">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image200">
- <property name="visible">True</property>
- <property name="stock">gtk-connect</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label563">
- <property name="visible">True</property>
- <property name="label" translatable="yes">La normalisation expliquee par Dzef</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button14_contrib_about">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="border_width">3</property>
- <signal name="clicked" handler="on_button_contrib_about_clicked"/>
- <child>
- <object class="GtkAlignment" id="alignment338">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox2722">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image199">
- <property name="visible">True</property>
- <property name="stock">gtk-connect</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label562">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Xcfa sur Linux On The Root</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">8</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label505">
- <property name="visible">True</property>
- <property name="label" translatable="yes"> Contributions </property>
- </object>
- <packing>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow16">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTextView" id="textview_label_license_about">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <signal name="realize" handler="on_textview_label_license_about_realize"/>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label51">
- <property name="visible">True</property>
- <property name="label" translatable="yes"> License </property>
- </object>
- <packing>
- <property name="position">3</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox2690">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <child>
- <object class="GtkButton" id="button_ok_about">
- <property name="label" translatable="yes">OK</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">False</property>
- <property name="relief">half</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_button_ok_about_clicked"/>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button_pagexcfa_about">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="relief">none</property>
- <property name="focus_on_click">False</property>
- <signal name="clicked" handler="on_button_contrib_about_clicked"/>
- <child>
- <object class="GtkAlignment" id="alignment430">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox2828">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image264">
- <property name="visible">True</property>
- <property name="stock">gtk-connect</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_button_pagexcfa_about">
- <property name="visible">True</property>
- <property name="label"> Xcfa sur le web</property>
- <property name="use_underline">True</property>
- <signal name="realize" handler="on_label_button_pagexcfa_about_realize"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
+ <signal name="realize" handler="on_label_statusbar_global_realize" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <object class="GtkWindow" id="wind_info">
- <property name="resizable">False</property>
- <property name="modal">True</property>
- <property name="window_position">center-always</property>
- <signal name="destroy_event" handler="on_wind_info_destroy_event"/>
- <signal name="delete_event" handler="on_wind_info_delete_event"/>
- <child>
- <object class="GtkVBox" id="vbox">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkHBox" id="hbox34">
- <property name="visible">True</property>
- <child>
- <object class="GtkVBox" id="vbox28">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkImage" id="image_wininfo">
- <property name="visible">True</property>
- <property name="xpad">11</property>
- <property name="ypad">10</property>
- <property name="stock">gtk-dialog-warning</property>
- <property name="icon-size">6</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox33">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkLabel" id="label_titre_wininfo">
- <property name="visible">True</property>
- <property name="use_markup">True</property>
- <property name="justify">center</property>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_texte_wininfo">
- <property name="visible">True</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox_wininfo">
- <property name="visible">True</property>
- <property name="homogeneous">True</property>
- <child>
- <object class="GtkButton" id="button_quitter_wininfo">
- <property name="label">gtk-quit</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="on_button_quitter_wininfo_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -14781,132 +10727,10 @@
 <packing>
 <property name="expand">False</property>
 <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
 </packing>
 </child>
 </object>
 </child>
 </object>
- <object class="GtkAdjustment" id="adjustment1">
- <property name="value">100</property>
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">1</property>
- </object>
- <object class="GtkAdjustment" id="adjustment2">
- <property name="value">100</property>
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">1</property>
- </object>
- <object class="GtkAdjustment" id="adjustment3">
- <property name="value">1</property>
- <property name="upper">9999</property>
- <property name="step_increment">1</property>
- <property name="page_increment">1</property>
- </object>
- <object class="GtkAdjustment" id="adjustment4">
- <property name="value">2</property>
- <property name="upper">999</property>
- <property name="step_increment">1</property>
- <property name="page_increment">1</property>
- </object>
- <object class="GtkAdjustment" id="adjustment5">
- <property name="value">1</property>
- <property name="lower">1</property>
- <property name="upper">99999</property>
- <property name="step_increment">1</property>
- <property name="page_increment">1</property>
- </object>
- <object class="GtkAdjustment" id="adjustment6">
- <property name="value">-10</property>
- <property name="lower">-24</property>
- <property name="upper">-6</property>
- <property name="step_increment">1</property>
- <property name="page_increment">1</property>
- </object>
- <object class="GtkAdjustment" id="adjustment7">
- <property name="value">1</property>
- <property name="upper">999</property>
- <property name="step_increment">1</property>
- <property name="page_increment">1</property>
- </object>
- <object class="GtkAdjustment" id="adjustment8">
- <property name="value">1962</property>
- <property name="upper">9999</property>
- <property name="step_increment">1</property>
- <property name="page_increment">1</property>
- </object>
- <object class="GtkListStore" id="liststore1">
- <columns>
- 
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="liststore2">
- <columns>
- 
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="liststore3">
- <columns>
- 
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="liststore4">
- <columns>
- 
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="liststore5">
- <columns>
- 
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="liststore6">
- <columns>
- 
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="liststore7">
- <columns>
- 
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="liststore8">
- <columns>
- 
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="liststore9">
- <columns>
- 
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="liststore10">
- <columns>
- 
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="liststore11">
- <columns>
- 
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="liststore12">
- <columns>
- 
- <column type="gchararray"/>
- </columns>
- </object>
 </interface>

xcfa-5.0.2.tar.gz/glade/xcfa_win_about.glade Added

@@ -0,0 +1,2564 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<interface>
+ <requires lib="gtk+" version="3.12"/>
+ <object class="GtkWindow" id="wind_about">
+ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">About X Convert File Audio</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
+ <property name="window_position">center-on-parent</property>
+ <signal name="delete-event" handler="on_wind_about_delete_event" swapped="no"/>
+ <signal name="destroy-event" handler="on_wind_about_destroy_event" swapped="no"/>
+ <child>
+ <object class="GtkBox" id="vbox486">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkNotebook" id="notebook1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">5</property>
+ <child>
+ <object class="GtkBox" id="vbox487">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkImage" id="image_about">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ <signal name="realize" handler="on_image_about_realize" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame172">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkAlignment" id="alignment324">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label_xcfa_about">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_markup">True</property>
+ <signal name="realize" handler="on_label_xcfa_about_realize" swapped="no"/>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label507">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox33">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkFrame" id="frame173">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkAlignment" id="alignment325">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label_author_about">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_markup">True</property>
+ <signal name="realize" handler="on_label_author_about_realize" swapped="no"/>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label508">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Author&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame18">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkAlignment" id="alignment35">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImage" id="image_gpl_xcfa_about">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">10</property>
+ <property name="stock">gtk-missing-image</property>
+ <signal name="realize" handler="on_image_gpl_xcfa_about_realize" swapped="no"/>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label47">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Licence&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label504">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"> Informations </property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow3">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <object class="GtkViewport" id="viewport2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="resize_mode">queue</property>
+ <child>
+ <object class="GtkLabel" id="label_about_machine">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_markup">True</property>
+ <property name="selectable">True</property>
+ <signal name="realize" handler="on_label_about_machine_realize" swapped="no"/>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label506">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"> Machine </property>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow14">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <object class="GtkViewport" id="viewport8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkBox" id="vbox488">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="label_contrib_about">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_markup">True</property>
+ <property name="selectable">True</property>
+ <signal name="realize" handler="on_label_contrib_about_realize" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkTable" id="table13">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">9</property>
+ <property name="n_columns">4</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label748">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">@Shankarius
+@Dzef</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label749">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">
+Stephane de la Linuxerie
+@xens</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label750">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">
+@Bapoumba
+@Shankarius
+@Dzef
+Guillaume
+Gerry Butler</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label751">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">
+Karsten Mehrhoff</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label741">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">&lt;b&gt;Ingenieurs du son&lt;/b&gt;
+</property>
+ <property name="use_markup">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label742">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">
+&lt;b&gt;Graphisme&lt;/b&gt;
+</property>
+ <property name="use_markup">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label743">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">&lt;b&gt;Traduction Anglaise&lt;/b&gt;
+
+
+</property>
+ <property name="use_markup">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label744">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">
+&lt;b&gt;Traduction Allemande&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label756">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label757">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label758">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label759">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label760">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label761">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label755">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label762">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label763">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label764">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label765">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label766">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label767">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label768">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label769">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label770">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label747">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">
+&lt;b&gt;Codeur Xcfa&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label754">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">
+@b52 alias @xcfaudio</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label746">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">
+&lt;b&gt;ElementSpeak pour Xcfa&lt;/b&gt; </property>
+ <property name="use_markup">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label753">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">
+@Shankarius</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label745">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">
+&lt;b&gt;Codeur pages Web&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label752">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">
+@zarer</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label831">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">
+&lt;b&gt;Traduction Italienne&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label832">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">
+Guillaume
+Vincenzo Romano</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox2816">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label776">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label773">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">
+
+&lt;b&gt;Pages a visiter&lt;/b&gt;
+</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label777">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="table11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">10</property>
+ <property name="n_columns">3</property>
+ <child>
+ <object class="GtkLabel" id="label708">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label709">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label710">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label711">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label712">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label713">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label714">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label715">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label716">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="top_attach">9</property>
+ <property name="bottom_attach">10</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label719">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label720">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label721">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label722">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label723">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label724">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label725">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label726">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label727">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">9</property>
+ <property name="bottom_attach">10</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button03_contrib_about">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="border_width">3</property>
+ <signal name="clicked" handler="on_button_contrib_about_clicked" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment329">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkBox" id="hbox2694">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image161">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-connect</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_button_5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Linux On The Root</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button17_contrib_about">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="border_width">3</property>
+ <signal name="clicked" handler="on_button_contrib_about_clicked" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment421">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkBox" id="hbox2814">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image254">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-connect</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label706">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Frugalware</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button01_contrib_about">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="border_width">3</property>
+ <signal name="clicked" handler="on_button_contrib_about_clicked" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment326">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkBox" id="hbox2691">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image158">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-connect</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_button_1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Road2Mayotte</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button15_contrib_about">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="border_width">3</property>
+ <signal name="clicked" handler="on_button_contrib_about_clicked" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment392">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkBox" id="hbox2787">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image238">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-connect</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label656">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">La Linuxerie</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button06_contrib_about">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="border_width">3</property>
+ <signal name="clicked" handler="on_button_contrib_about_clicked" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment332">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkBox" id="hbox2697">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image164">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-connect</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_button_8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Tuxfamily</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button07_contrib_about">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="border_width">3</property>
+ <signal name="clicked" handler="on_button_contrib_about_clicked" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment333">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkBox" id="hbox2698">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image165">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-connect</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_button_9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Framasoft</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button08_contrib_about">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="border_width">3</property>
+ <signal name="clicked" handler="on_button_contrib_about_clicked" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment334">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkBox" id="hbox2699">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image166">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-connect</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_button_10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Ekd (EnKoDeur-Mixeur)</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label707">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label718">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button16_contrib_about">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="border_width">3</property>
+ <signal name="clicked" handler="on_button_contrib_about_clicked" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment420">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkBox" id="hbox2813">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image253">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-connect</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label703">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Debian Multimedia</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button04_contrib_about">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="border_width">3</property>
+ <signal name="clicked" handler="on_button_contrib_about_clicked" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment425">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkBox" id="hbox2819">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image257">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-connect</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label781">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Je suis libre</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">9</property>
+ <property name="bottom_attach">10</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button22_contrib_about">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="border_width">3</property>
+ <signal name="clicked" handler="on_button_contrib_about_clicked" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment36">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkBox" id="hbox35">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-connect</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label54">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Alessio Treglia</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox2815">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label771">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label802">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">
+&lt;b&gt;Forum&lt;/b&gt;
+</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label772">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="table15">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">3</property>
+ <child>
+ <object class="GtkLabel" id="label807">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label806">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label810">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label809">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button09_contrib_about">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="border_width">3</property>
+ <signal name="clicked" handler="on_button_contrib_about_clicked" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment327">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkBox" id="hbox2692">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image159">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-connect</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_button_3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Forum Xcfa</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button21_contrib_about">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="border_width">3</property>
+ <signal name="clicked" handler="on_button_contrib_about_clicked" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment432">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkBox" id="hbox2830">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image266">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-connect</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label801">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">XCFA LinuxForen.de</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox2831">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label803">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label804">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">
+&lt;b&gt;Documentation&lt;/b&gt;
+</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label805">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="table12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">6</property>
+ <property name="n_columns">3</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label730">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label731">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label732">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label733">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label734">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label736">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label737">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label738">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label739">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label740">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label729">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label735">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button10_contrib_about">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="border_width">3</property>
+ <signal name="clicked" handler="on_button_contrib_about_clicked" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment426">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkBox" id="hbox2820">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image258">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-connect</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label782">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Wiki Xcfa par Shankarius</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button11_contrib_about">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="border_width">3</property>
+ <signal name="clicked" handler="on_button_contrib_about_clicked" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment337">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkBox" id="hbox2721">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image198">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-connect</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label561">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Doc Xcfa par Patachon</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button12_contrib_about">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="border_width">2</property>
+ <signal name="clicked" handler="on_button_contrib_about_clicked" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment340">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkBox" id="hbox2724">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image201">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-connect</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label564">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Ogg Vorbis explique par Shankarius</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button13_contrib_about">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="border_width">3</property>
+ <signal name="clicked" handler="on_button_contrib_about_clicked" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment339">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkBox" id="hbox2723">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image200">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-connect</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label563">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">La normalisation expliquee par Dzef</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button14_contrib_about">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="border_width">3</property>
+ <signal name="clicked" handler="on_button_contrib_about_clicked" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment338">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkBox" id="hbox2722">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image199">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-connect</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label562">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Xcfa sur Linux On The Root</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">8</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label505">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"> Contributions </property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow16">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTextView" id="textview_label_license_about">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <signal name="realize" handler="on_textview_label_license_about_realize" swapped="no"/>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label51">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"> License </property>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox2690">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <child>
+ <object class="GtkButton" id="button_ok_about">
+ <property name="label" translatable="yes">OK</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="relief">half</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_button_ok_about_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_pagexcfa_about">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="relief">none</property>
+ <property name="focus_on_click">False</property>
+ <signal name="clicked" handler="on_button_contrib_about_clicked" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment430">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkBox" id="hbox2828">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image264">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-connect</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_button_pagexcfa_about">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"> Xcfa sur le web</property>
+ <property name="use_underline">True</property>
+ <signal name="realize" handler="on_label_button_pagexcfa_about_realize" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+</interface>

xcfa-5.0.2.tar.gz/glade/xcfa_win_info.glade Added

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<interface>
+ <requires lib="gtk+" version="3.12"/>
+ <object class="GtkWindow" id="wind_info">
+ <property name="can_focus">False</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
+ <property name="window_position">center-always</property>
+ <signal name="delete-event" handler="on_wind_info_delete_event" swapped="no"/>
+ <signal name="destroy-event" handler="on_wind_info_destroy_event" swapped="no"/>
+ <child>
+ <object class="GtkBox" id="vbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkBox" id="hbox34">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkBox" id="vbox28">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkImage" id="image_wininfo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">11</property>
+ <property name="ypad">10</property>
+ <property name="stock">gtk-dialog-warning</property>
+ <property name="icon_size">6</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="vbox33">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="label_titre_wininfo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_texte_wininfo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox_wininfo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkButton" id="button_quitter_wininfo">
+ <property name="label">gtk-quit</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="on_button_quitter_wininfo_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+</interface>

xcfa-5.0.2.tar.gz/glade/xcfa_win_reader.glade Added

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<interface>
+ <requires lib="gtk+" version="3.12"/>
+ <object class="GtkWindow" id="WindReader">
+ <property name="width_request">464</property>
+ <property name="can_focus">False</property>
+ <property name="resizable">False</property>
+ <property name="window_position">center-on-parent</property>
+ <signal name="delete-event" handler="on_WindReader_delete_event" swapped="no"/>
+ <signal name="destroy-event" handler="on_WindReader_destroy_event" swapped="no"/>
+ <child>
+ <object class="GtkBox" id="vbox20">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkBox" id="hbox32">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <child>
+ <object class="GtkButton" id="button_quitter_WindReader">
+ <property name="label">gtk-quit</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="on_button_quitter_WindReader_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_lecture_WindReader">
+ <property name="label">gtk-media-play</property>
+ <property name="width_request">110</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="on_button_lecture_WindReader_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_pause_WindReader">
+ <property name="label">gtk-media-pause</property>
+ <property name="width_request">110</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="on_button_pause_WindReader_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox_WindReader">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <signal name="realize" handler="on_hbox_WindReader_realize" swapped="no"/>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+</interface>

xcfa-5.0.2.tar.gz/glade/xcfa_win_scan.glade Added

@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<interface>
+ <requires lib="gtk+" version="3.12"/>
+ <object class="GtkDialog" id="WindScan">
+ <property name="width_request">411</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Scan en cours ...</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <signal name="delete-event" handler="on_WindScan_delete_event" swapped="no"/>
+ <signal name="destroy-event" handler="on_WindScan_destroy_event" swapped="no"/>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button_cancel_windscan">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="on_button_cancel_windscan_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="vbox13">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkBox" id="hbox17">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImage" id="image31">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-execute</property>
+ <property name="icon_size">6</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_windscan">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Scan du support en cours ...&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="justify">center</property>
+ <signal name="realize" handler="on_label_windscan_realize" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkProgressBar" id="progressbar_windscan">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <signal name="realize" handler="on_progressbar_windscan_realize" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkExpander" id="expander_windscan">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow_windscan">
+ <property name="height_request">150</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <signal name="realize" handler="on_scrolledwindow_windscan_realize" swapped="no"/>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label22">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Detail extraction mode expert</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">button_cancel_windscan</action-widget>
+ </action-widgets>
+ </object>
+</interface>

xcfa-5.0.2.tar.gz/glade/xcfa_win_treeview.glade Added

@@ -0,0 +1,2039 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<interface>
+ <requires lib="gtk+" version="3.12"/>
+ <object class="GtkWindow" id="wind_treeview">
+ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">Modification des champs</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
+ <property name="window_position">center-on-parent</property>
+ <signal name="delete-event" handler="on_wind_treeview_delete_event" swapped="no"/>
+ <signal name="destroy-event" handler="on_wind_treeview_destroy_event" swapped="no"/>
+ <child>
+ <object class="GtkBox" id="vbox466">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">2</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkBox" id="hbox2679">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <child>
+ <object class="GtkImage" id="image153">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">gtk-dialog-info</property>
+ <property name="icon_size">5</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label482">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">
+&lt;b&gt;Modification des champs&lt;/b&gt;
+</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="vbox467">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkNotebook" id="notebook_windtreeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">5</property>
+ <property name="tab_pos">left</property>
+ <signal name="switch-page" handler="on_notebook_windtreeview_switch_page" swapped="no"/>
+ <child>
+ <object class="GtkBox" id="hbox2684">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <child>
+ <object class="GtkFrame" id="frame160">
+ <property name="width_request">120</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkAlignment" id="alignment312">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkBox" id="vbox468">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_titre_dvd">
+ <property name="label" translatable="yes">Titre</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_play_dvd">
+ <property name="label" translatable="yes">Play</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_temps_dvd">
+ <property name="label" translatable="yes">Temps</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_format_dvd">
+ <property name="label" translatable="yes">Format</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_choix_dvd">
+ <property name="label" translatable="yes">Choix</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_normalise_dvd">
+ <property name="label" translatable="yes">Normalise</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_nom_dvd">
+ <property name="label" translatable="yes">Nom</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">6</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label492">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt; Visibilite &lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame161">
+ <property name="width_request">143</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkAlignment" id="alignment313">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkBox" id="vbox475">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton_nameleft_dvd">
+ <property name="label" translatable="yes">Nom a gauche</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton_namecenter_dvd">
+ <property name="label" translatable="yes">Nom au centre</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radiobutton_nameleft_dvd</property>
+ <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton_nameright_dvd">
+ <property name="label" translatable="yes">Nom a droite</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radiobutton_nameleft_dvd</property>
+ <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label493">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label483">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">DVD</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox2685">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <child>
+ <object class="GtkFrame" id="frame162">
+ <property name="width_request">140</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkAlignment" id="alignment314">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkBox" id="vbox469">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_play_cd">
+ <property name="label" translatable="yes">Play</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_wav_cd">
+ <property name="label" translatable="yes">Wav</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_flac_cd">
+ <property name="label" translatable="yes">Flac</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_ape_cd">
+ <property name="label" translatable="yes">Ape</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_wavpack_cd">
+ <property name="label" translatable="yes">Wavpack</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_ogg_cd">
+ <property name="label" translatable="yes">Ogg</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_m4a_cd">
+ <property name="label" translatable="yes">M4a</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_aac_cd">
+ <property name="label" translatable="yes">Aac</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_musepack_cd">
+ <property name="label" translatable="yes">Musepack</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">8</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_mp3_cd">
+ <property name="label" translatable="yes">Mp3</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">9</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_num_cd">
+ <property name="label" translatable="yes">Num</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">10</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_time_cd">
+ <property name="label" translatable="yes">Time</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">11</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_normalise_cd">
+ <property name="label" translatable="yes">Normalise</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">12</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_nom_cd">
+ <property name="label" translatable="yes">Nom</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">13</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label494">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt; Visibilite &lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame163">
+ <property name="width_request">140</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkAlignment" id="alignment315">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkBox" id="vbox477">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton_nameleft_cd">
+ <property name="label" translatable="yes">Nom a gauche</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton_namecenter_cd">
+ <property name="label" translatable="yes">Nom au centre</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radiobutton_nameleft_cd</property>
+ <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton_nameright_cd">
+ <property name="label" translatable="yes">Nom a droite</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radiobutton_nameleft_cd</property>
+ <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label495">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label484">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">CD</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox2686">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <child>
+ <object class="GtkFrame" id="frame164">
+ <property name="width_request">120</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkAlignment" id="alignment316">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkBox" id="vbox470">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_play_allfile">
+ <property name="label" translatable="yes">Play</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_trash_allfile">
+ <property name="label" translatable="yes">Trash</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_type_allfile">
+ <property name="label" translatable="yes">Type</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_wav_allfile">
+ <property name="label" translatable="yes">Wav</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_flac_allfile">
+ <property name="label" translatable="yes">Flac</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_ape_allfile">
+ <property name="label" translatable="yes">Ape</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_wavpack_allfile">
+ <property name="label" translatable="yes">Wavpack</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_ogg_allfile">
+ <property name="label" translatable="yes">Ogg</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_m4a_allfile">
+ <property name="label" translatable="yes">M4a</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">8</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_aac_allfile">
+ <property name="label" translatable="yes">Aac</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">9</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_musepack_allfile">
+ <property name="label" translatable="yes">Musepack</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">10</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_mp3_allfile">
+ <property name="label" translatable="yes">Mp3</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">11</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_time_allfile">
+ <property name="label" translatable="yes">Time</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">12</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_normalise_allfile">
+ <property name="label" translatable="yes">Normalise</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">13</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_replaygain_allfile">
+ <property name="label" translatable="yes">Replaygain</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">14</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_nom_allfile">
+ <property name="label" translatable="yes">Nom</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">15</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label496">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt; Visibilite &lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame165">
+ <property name="width_request">130</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkAlignment" id="alignment317">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkBox" id="vbox479">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton_nameleft_allfile">
+ <property name="label" translatable="yes">Nom a gauche</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton_namecenter_allfile">
+ <property name="label" translatable="yes">Nom au centre</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radiobutton_nameleft_allfile</property>
+ <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton_nameright_allfile">
+ <property name="label" translatable="yes">Nom a droite</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radiobutton_nameleft_allfile</property>
+ <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label497">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label485">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">CONVERSIONS</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox2687">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <child>
+ <object class="GtkFrame" id="frame166">
+ <property name="width_request">120</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkAlignment" id="alignment318">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkBox" id="vbox471">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_hertz_wav">
+ <property name="label" translatable="yes">Hertz</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_newhertz_wav">
+ <property name="label" translatable="yes">New Hertz</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_voie_wav">
+ <property name="label" translatable="yes">Voie</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_newvoie_wav">
+ <property name="label" translatable="yes">New Voie</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_bits_wav">
+ <property name="label" translatable="yes">Bits</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_newbits_wav">
+ <property name="label" translatable="yes">New Bits</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_nom_wav">
+ <property name="label" translatable="yes">Nom</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">6</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label498">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt; Visibilite &lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame167">
+ <property name="width_request">130</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkAlignment" id="alignment319">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkBox" id="vbox481">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton_nameleft_wav">
+ <property name="label" translatable="yes">Nom a gauche</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton_namecenter_wav">
+ <property name="label" translatable="yes">Nom au centre</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radiobutton_nameleft_wav</property>
+ <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton_nameright_wav">
+ <property name="label" translatable="yes">Nom a droite</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radiobutton_nameleft_wav</property>
+ <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label499">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label486">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">WAV</property>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox2688">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <child>
+ <object class="GtkFrame" id="frame168">
+ <property name="width_request">120</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkAlignment" id="alignment320">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkBox" id="vbox472">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_type_mp3ogg">
+ <property name="label" translatable="yes">Type</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_bitrate_mp3ogg">
+ <property name="label" translatable="yes">Bitrate</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_nexbitrate_mp3ogg">
+ <property name="label" translatable="yes">New Bitrate</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_size_mp3ogg">
+ <property name="label" translatable="yes">Size</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_time_mp3ogg">
+ <property name="label" translatable="yes">Time</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_nom_mp3ogg">
+ <property name="label" translatable="yes">Nom</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label500">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt; Visibilite &lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame169">
+ <property name="width_request">130</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkAlignment" id="alignment321">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">1</property>
+ <child>
+ <object class="GtkBox" id="vbox483">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton_nameleft_mp3ogg">
+ <property name="label" translatable="yes">Nom a gauche</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton_namecenter_mp3ogg">
+ <property name="label" translatable="yes">Nom au centre</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radiobutton_nameleft_mp3ogg</property>
+ <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton_nameright_mp3ogg">
+ <property name="label" translatable="yes">Nom a droite</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radiobutton_nameleft_mp3ogg</property>
+ <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label501">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label487">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">MP3-OGG</property>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox19">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <child>
+ <object class="GtkFrame" id="frame16">
+ <property name="width_request">120</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkAlignment" id="alignment33">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkBox" id="vbox14">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_type_tags">
+ <property name="label" translatable="yes">Type</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_time_tags">
+ <property name="label" translatable="yes">Time</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_nom_tags">
+ <property name="label" translatable="yes">Nom</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_checkbutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label17">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt; Visibilite &lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame17">
+ <property name="width_request">130</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkAlignment" id="alignment34">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">1</property>
+ <child>
+ <object class="GtkBox" id="vbox15">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton_nameleft_tags">
+ <property name="label" translatable="yes">Nom a gauche</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton_namecenter_tags">
+ <property name="label" translatable="yes">Nom au centre</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radiobutton_nameleft_tags</property>
+ <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton_nameright_tags">
+ <property name="label" translatable="yes">Nom a droite</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radiobutton_nameleft_tags</property>
+ <signal name="clicked" handler="on_radiobutton_modif_treeview_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label29">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label34">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">TAGS</property>
+ </object>
+ <packing>
+ <property name="position">5</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox2680">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkButton" id="button_select_global_windtreeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="border_width">5</property>
+ <signal name="clicked" handler="on_button_select_global_windtreeview_clicked" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment310">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkBox" id="hbox2682">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image155">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-redo</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label490">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Selection globale</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_deselect_global_windtreeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="border_width">5</property>
+ <signal name="clicked" handler="on_button_deselect_global_windtreeview_clicked" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment309">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkBox" id="hbox2681">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image154">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-clear</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label489">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Deselection globale</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_quit_windtreeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="border_width">5</property>
+ <signal name="clicked" handler="on_button_quit_windtreeview_clicked" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment311">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkBox" id="hbox2683">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image156">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-quit</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label491">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Retour</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+</interface>

xcfa-4.2.8.tar.gz/lib/Makefile.am -> xcfa-5.0.2.tar.gz/lib/Makefile.am Changed

xcfa-4.2.8.tar.gz/lib/Makefile.in -> xcfa-5.0.2.tar.gz/lib/Makefile.in Changed

xcfa-4.2.8.tar.gz/lib/combo.c -> xcfa-5.0.2.tar.gz/lib/combo.c Changed

@@ -3,7 +3,7 @@
 * project : xcfa
 * with : Gtk-2
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - Creation d'une base de programmation en langage C de type GNU avec les autotools
 * GNU General Public License
@@ -43,113 +43,19 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <string.h>
 
 #include "lib.h"
 
 
-typedef struct {
-	GtkComboBox	*combo;
-	gboolean	 Bool;
-} ALLOC;
-
-GList *ListAlloc = NULL;
-
-
-// REMOVE ALLOC COMBO
-// 
-void libcombo_remove (void)
-{
-	GList	*list = NULL;
-	ALLOC	*New = NULL;
-	gint	 NbList = 0;
-	
-	list = g_list_first (ListAlloc);
-	while (list) {
-		if (NULL != (New = (ALLOC *)list->data)) {
-			g_free (New);
-			New = NULL;
-			list->data = NULL;
-			
-			NbList ++;
-		}
-		list = g_list_next (list);
-	}
-	g_list_free (ListAlloc);
-	ListAlloc = NULL;
-	if( TRUE == OptionsCommandLine.BoolVerboseMode )
-		g_print ("\tRemove: %d\n", NbList);
-}
-// ALLOC COMBO
-// 
-void libcombo_alloc (GtkComboBox *p_combo)
-{
-	GtkListStore	*store = NULL;
-	GtkCellRenderer *renderer = NULL;
-	GList		*list = NULL;
-	ALLOC		*New = NULL;
-	gboolean	 BoolInListe = FALSE;
-	
-	// CHERCHE SI PAS DANS LA LISTE
-	list = g_list_first (ListAlloc);
-	while (list) {
-		if ((New = (ALLOC *)list->data) != NULL) {
-			if (New->combo == p_combo) {
-				BoolInListe = TRUE;
-				break;
-			}
-		}
-		list = g_list_next (list);
-	}
-	// SI PAS DANS LA LISTE ALORS INSERTION
-	if (BoolInListe == FALSE) {
-		New = (ALLOC *)g_malloc0 (sizeof(ALLOC));
-		New->combo = p_combo;
-		New->Bool = FALSE;
-		ListAlloc = g_list_append (ListAlloc, New);
-	}
-	
-	// RECUP OU CREATION DE store
-	list = g_list_first (ListAlloc);
-	while (list) {
-		if ((New = (ALLOC *)list->data) != NULL) {
-			if (New->combo == p_combo) {
-				if (New->Bool == FALSE) {
-					store = gtk_list_store_new (1, G_TYPE_STRING);
-					gtk_combo_box_set_model (GTK_COMBO_BOX(p_combo), GTK_TREE_MODEL(store));
-					renderer = gtk_cell_renderer_text_new ();
-					gtk_cell_layout_pack_start (GTK_CELL_LAYOUT(p_combo), renderer, TRUE);
-					gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT(p_combo), renderer, "text", 0, NULL);
-					New->Bool = TRUE;
-				}
-				else {
-					store = GTK_LIST_STORE (gtk_combo_box_get_model(p_combo));
-					gtk_list_store_clear (store);
-				}
-				break;
-			}
-		}
-		list = g_list_next (list);
-	}
-}
 // OPTIONS REMOVE COMBO
-// 	libcombo_remove_options (GTK_COMBO_BOX ());
 // 
 void libcombo_remove_options (GtkComboBox *p_combo)
 {
 	gint	Index;
-	
 	while (TRUE) {
 		Index = gtk_combo_box_get_active (GTK_COMBO_BOX (p_combo));		
 		if (Index == -1) break;
-		gtk_combo_box_remove_text (GTK_COMBO_BOX (p_combo), Index);
-		
+		gtk_combo_box_text_remove (GTK_COMBO_BOX_TEXT(p_combo), Index);
 		gtk_combo_box_set_active (GTK_COMBO_BOX (p_combo), 0);
 	}
 }

xcfa-4.2.8.tar.gz/lib/file_is.c -> xcfa-5.0.2.tar.gz/lib/file_is.c Changed

@@ -3,7 +3,7 @@
 * project : xcfa
 * with : Gtk-2
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - Creation d'une base de programmation en langage C de type GNU avec les autotools
 * GNU General Public License
@@ -68,14 +68,13 @@
 gboolean FileIs_vidm4a( gchar *namefile )
 {
 	FILE *fp = NULL;
-	size_t lenread = 0;
 	gchar *buf = NULL;
 	gint cpt;
 	gboolean bool_signature = FALSE;
 	
 	if( (buf = (gchar *)g_malloc0 (sizeof(gchar) * 2048)) == NULL ) return (FALSE);
 	if( (fp = fopen (namefile, "rb")) != NULL ) {
-		lenread = fread( buf, 1, 2000, fp );
+		fread( buf, 1, 2000, fp );
 		fclose (fp);
 	}
 
@@ -97,6 +96,8 @@
 		 break;
 		}
 	}
+	g_free( buf );
+	buf = NULL;
 	return( bool_signature );
 }
 
@@ -105,14 +106,13 @@
 gboolean FileIs_m4a( gchar *namefile )
 {
 	FILE *fp = NULL;
-	size_t lenread = 0;
 	gchar *buf = NULL;
 	gint cpt;
 	gboolean bool_signature = FALSE;
 	
 	if( (buf = (gchar *)g_malloc0 (sizeof(gchar) * 2048)) == NULL ) return (FALSE);
 	if( (fp = fopen (namefile, "rb")) != NULL ) {
-		lenread = fread( buf, 1, 2000, fp );
+		fread( buf, 1, 2000, fp );
 		fclose (fp);
 	}
 
@@ -128,7 +128,8 @@
 		 break;
 		}
 	}
-
+	g_free( buf );
+	buf = NULL;
 	return( bool_signature );
 }
 // FILE IS WAV ?
@@ -137,10 +138,9 @@
 {
 	FILE *fp = NULL;
 	gchar str [ 42 ] = {'\0','\0','\0','\0','\0','\0','\0','\0'};
-	size_t lenread = 0;
 
 	if ((fp = fopen (namefile, "rb")) != NULL) {
-		lenread = fread (&str[0], 1, 40, fp);
+		fread (&str[0], 1, 40, fp);
 		fclose (fp);
 	}
 
@@ -176,13 +176,12 @@
 {
 	FILE *fp = NULL;
 	HEADER_WAV buf;
-	size_t	 Dummy;
 	
 	if ((fp = fopen (namefile, "r")) == NULL) return (FALSE);
-	Dummy = fread(&buf.tag1, 1, 4, fp);
+	fread(&buf.tag1, 1, 4, fp);
 	buf.tag1 [ 4 ] = '\0';
-	Dummy = fread(&buf.tag2, 1, 4, fp);
-	Dummy = fread(&buf.tag2, 1, 14, fp);
+	fread(&buf.tag2, 1, 4, fp);
+	fread(&buf.tag2, 1, 14, fp);
 	fclose (fp);
 	if ((buf.tag1 [ 0 ] == 'R' &&
 	 buf.tag1 [ 1 ] == 'I' &&
@@ -202,10 +201,9 @@
 {
 	FILE *fp = NULL;
 	gchar str [ 8 ] = {'\0','\0','\0','\0','\0','\0','\0','\0'};
-	size_t lenread = 0;
 
 	if ((fp = fopen (namefile, "rb")) != NULL) {
-		lenread = fread (&str[0], 1, 4, fp);
+		fread (&str[0], 1, 4, fp);
 		fclose (fp);
 	}
 
@@ -228,7 +226,6 @@
 gboolean FileIs_rm (gchar *namefile)
 {
 	FILE *fp = NULL;
-	size_t lenread = 0;
 	gchar *buf = NULL;
 	gboolean bool_signature = FALSE;
 	
@@ -236,7 +233,7 @@
 
 	buf = (gchar *)g_malloc0 (sizeof(gchar) * 512);
 	if ((fp = fopen (namefile, "rb")) != NULL) {
-		lenread = fread (buf, 1, 500, fp);
+		fread (buf, 1, 500, fp);
 		fclose (fp);
 	
 		if (buf [ 0 ] == 0x2e &&	// .
@@ -252,10 +249,8 @@
 			bool_signature = TRUE;
 		}
 	}
-
 	g_free (buf);
 	buf = NULL;
-	
 	return (bool_signature);
 }
 // FILE IS OGG ?
@@ -263,14 +258,13 @@
 gboolean FileIs_ogg (gchar *namefile)
 {
 	FILE *fp = NULL;
-	size_t lenread = 0;
 	gchar *buf = NULL;
 	gint cpt;
 	gboolean bool_signature = FALSE;
 	
 	if ((buf = (gchar *)g_malloc0 (sizeof(gchar) * 2048)) == NULL) return (FALSE);
 	if ((fp = fopen (namefile, "rb")) != NULL) {
-		lenread = fread (buf, 1, 2000, fp);
+		fread (buf, 1, 2000, fp);
 		fclose (fp);
 	}
 
@@ -298,10 +292,8 @@
 			}
 		}
 	}
-
 	g_free (buf);
 	buf = NULL;
-	
 	return (bool_signature);
 }
 // FILE IS MPC ?
@@ -309,7 +301,6 @@
 gboolean FileIs_mpc (gchar *namefile)
 {
 	FILE *fp = NULL;
-	size_t lenread = 0;
 	gchar *buf = NULL;
 	gint cpt;
 	gboolean bool_signature = FALSE;
@@ -318,7 +309,7 @@
 
 	buf = (gchar *)g_malloc0 (sizeof(gchar) * 1034);
 	if((fp = fopen (namefile, "rb")) != NULL) {
-		lenread = fread (buf, 1, 1024, fp);
+		fread (buf, 1, 1024, fp);
 		fclose (fp);
 	}
 	// 
@@ -349,10 +340,8 @@
 			}
 		}
 	}
-	
-	g_free (buf);
+	g_free( buf );
 	buf = NULL;
-	
 	return (bool_signature);
 }
 // FILE IS AC3 ?
@@ -360,7 +349,6 @@
 gboolean FileIs_ac3 (gchar *namefile)
 {
 	FILE *fp = NULL;
-	size_t lenread = 0;
 	gchar *buf = NULL;
 	gboolean BoolSignature = FALSE;
 	
@@ -369,7 +357,7 @@
 
 	buf = (gchar *)g_malloc0 (sizeof(gchar) * 100);
 	if((fp = fopen (namefile, "rb")) != NULL) {
-		lenread = fread (buf, 1, 50, fp);
+		fread (buf, 1, 50, fp);
 		fclose (fp);
 	}
 	
@@ -377,7 +365,7 @@
 		BoolSignature = TRUE;
 	}
 	
-	g_free (buf);
+	g_free( buf );
 	buf = NULL;
 	
 	return (BoolSignature);
@@ -404,17 +392,16 @@
 	gboolean bool_signature = FALSE;
 	gint i;
 	size_t size;
-	glong	 Dummy;
 
 	// PRINT_FUNC_LF();
 
 	fp = fopen (namefile, "rb");
 	if (NULL == fp) return (FALSE);
 
-	Dummy = fread ( &begin, 128, 1, fp );
+	fread ( &begin, 128, 1, fp );
 	fseek ( fp, 0, SEEK_END );
 	fseek ( fp, ftell( fp ) - 128, SEEK_SET );
-	Dummy = fread ( &end, 128, 1, fp );
+	fread ( &end, 128, 1, fp );
 	fclose (fp);
 	
 	// TEST SI FICHIER EST: AC3
@@ -433,7 +420,7 @@
 	size = libutils_get_size_file (namefile);
 	buf = g_malloc0 (sizeof (gchar) * (size + 10));
 	if ((fp = fopen (namefile, "rb"))) {
-		Dummy = fread (buf, 1, size, fp);
+		fread (buf, 1, size, fp);
 		fclose (fp);
 		for (i = 0; i < size; i ++) {
 			if (buf[i+0] == 'L' && buf[i+1] == 'A' && buf[i+2] == 'M' && buf[i+3] == 'E') {
@@ -479,9 +466,8 @@
 		}
 	}
 	*/
-	g_free (buf);
+	g_free( buf );
 	buf = NULL;
-
 	return (bool_signature);
 }
 // FILE IS FLAC ?
@@ -489,7 +475,6 @@
 gboolean FileIs_flac (gchar *namefile)
 {
 	FILE *fp = NULL;
-	size_t lenread = 0;
 	gchar *buf = NULL;
 	gint cpt;
 	gboolean bool_signature = FALSE;
@@ -498,7 +483,7 @@
 
 	buf = (gchar *)g_malloc0 (sizeof(gchar) * 5124);
 	if ((fp = fopen (namefile, "rb")) != NULL) {
-		lenread = fread (buf, 1, 5120, fp);
+		fread (buf, 1, 5120, fp);
 		fclose (fp);
 	}
 	
@@ -511,9 +496,8 @@
 		 break;
 		}
 	}
-	g_free (buf);
+	g_free( buf );
 	buf = NULL;
-
 	return (bool_signature);
 }
 /*****************************************************************************************
@@ -552,7 +536,6 @@
 gboolean FileIs_ape (gchar *namefile)
 {
 	FILE *fp = NULL;
-	size_t lenread = 0;
 	gchar *buf = NULL;
 	gint cpt;
 	gboolean bool_signature = FALSE;
@@ -561,7 +544,7 @@
 
 	buf = (gchar *)g_malloc0 (sizeof(gchar) * 5120);
 	if ((fp = fopen (namefile, "rb")) != NULL) {
-		lenread = fread (buf, 1, 5000, fp);
+		fread (buf, 1, 5000, fp);
 		fclose (fp);
 	
 		for (cpt = 0; cpt < 5000; cpt ++) {
@@ -574,9 +557,8 @@
 			}
 		}
 	}
-	g_free (buf);
+	g_free( buf );
 	buf = NULL;
-	
 	return (bool_signature);
 }
 // FILE IS AIFF ?
@@ -603,7 +585,6 @@
 gboolean FileIs_aiff (gchar *namefile)
 {
 	FILE *fp = NULL;
-	size_t lenread = 0;
 	gchar *buf = NULL;
 	gboolean bool_signature = FALSE;
 	
@@ -611,7 +592,7 @@
 
 	buf = (gchar *)g_malloc0 (sizeof(gchar) * 512);
 	if ((fp = fopen (namefile, "rb")) != NULL) {
-		lenread = fread (buf, 1, 500, fp);
+		fread (buf, 1, 500, fp);
 		fclose (fp);
 	
 		if (buf [ 0 ] == 0x46 &&	// F
@@ -631,10 +612,8 @@
 			bool_signature = TRUE;
 		}
 	}
-
-	g_free (buf);
+	g_free( buf );
 	buf = NULL;
-	
 	return (bool_signature);
 }
 // FILE IS DTS ?
@@ -709,7 +688,6 @@
 gboolean FileIs_png (gchar *namefile)
 {
 	FILE *fp = NULL;
-	size_t lenread = 0;
 	gchar *buf = NULL;
 	gint cpt;
 	gboolean bool_signature = FALSE;
@@ -718,7 +696,7 @@
 
 	buf = (gchar *)g_malloc0 (sizeof(gchar) * 5124);
 	if ((fp = fopen (namefile, "rb")) != NULL) {
-		lenread = fread (buf, 1, 5120, fp);
+		fread (buf, 1, 5120, fp);
 		fclose (fp);
 	}
 	
@@ -732,43 +710,8 @@
 		 break;
 		}
 	}
-	g_free (buf);
+	g_free( buf );
 	buf = NULL;
-
-	return (bool_signature);
-}
-// FILE IS JPG / JPEG ?
-//
-gboolean FileIs_jpg (gchar *namefile)
-{
-	FILE *fp = NULL;
-	size_t lenread = 0;
-	gchar *buf = NULL;
-	gint cpt;
-	gboolean bool_signature = FALSE;
-	
-	/*PRINT_FUNC_LF();*/
-
-	buf = (gchar *)g_malloc0 (sizeof(gchar) * 5124);
-	if ((fp = fopen (namefile, "rb")) != NULL) {
-		lenread = fread (buf, 1, 5120, fp);
-		fclose (fp);
-	}
-	
-	for (cpt = 0; cpt < 5120; cpt ++) {
-		if(
-			buf [ cpt + 0 ] == 0x4A &&	// 'J'
-			buf [ cpt + 1 ] == 0x46 &&	// 'F'
-			buf [ cpt + 2 ] == 0x49	&&	// 'I'
-			buf [ cpt + 3 ] == 0x46		// 'F'
-		 ) {	
-		 bool_signature = TRUE;
-		 break;
-		}
-	}
-	g_free (buf);
-	buf = NULL;
-
 	return (bool_signature);
 }
 // 
@@ -784,6 +727,50 @@
 	}
 	return( FALSE );
 }
+// 
+// FILE IS JPG / JPEG ?
+// L'EXTENTION 'JPG' OU 'JPEG' OBLIGATOIRE
+// ([ BYTE 00 ] & 0xd8ff ) == 0xd8ff
+// 
+gboolean FileIs_jpg( gchar *p_PathName )
+{
+	gchar		*PtrExtPathName = NULL;
+	gchar		*StrExtPathName = NULL;
+	FILE		*fp = NULL;
+	guint		buf[ 4 ] = { 0,0,0,0 };
+	gboolean	BoolRet = FALSE;
+	
+	// TEST PARAMETRE
+	if( NULL != p_PathName && NULL != ( PtrExtPathName = strrchr( p_PathName, '.' ))) {
+			
+		PtrExtPathName ++;
+		
+		if( strlen( PtrExtPathName ) >= 3 ) {
+			
+			StrExtPathName = g_strdup( PtrExtPathName );
+			PtrExtPathName = StrExtPathName;
+
+			// EXTENTIONS TO UPPER 
+			while( *PtrExtPathName ) {
+				*PtrExtPathName = g_unichar_toupper( *PtrExtPathName );
+				PtrExtPathName ++;
+			}
+			
+			if( 0 == g_ascii_strncasecmp( StrExtPathName, "JPG", 3 ) || 0 == g_ascii_strncasecmp( StrExtPathName, "JPEG", 4 ) ) {
+	
+				if( NULL != ( fp = g_fopen( p_PathName, "rb" ))) {
+					fread (buf, 1, 2, fp);
+					fclose( fp );
+					if( (buf [ 0 ] & 0xd8ff ) == 0xd8ff ) BoolRet = TRUE;
+				}
+			}
+			
+			g_free( StrExtPathName );	StrExtPathName = NULL;
+		}
+	}
+	
+	return( BoolRet );
+}

xcfa-4.2.8.tar.gz/lib/lib.c -> xcfa-5.0.2.tar.gz/lib/lib.c Changed

@@ -3,13 +3,13 @@
 * project : xcfa
 * with : Gtk-2
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - Creation d'une base de programmation en langage C de type GNU avec les autotools
 * GNU General Public License
 *
 * This file is part of XCFA.
- * 
+ *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
@@ -29,7 +29,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * 
+ *
 */
 
 
@@ -45,6 +45,7 @@
 #include <gtk/gtk.h>
 #include <glib.h>
 #include <glib/gstdio.h>
+
 #include <string.h>
 #include <unistd.h>
 #include <dirent.h>
@@ -61,14 +62,23 @@
 };
 
 
+/*
+typedef struct {
+	guint32 pixel;
+	guint16 red;
+	guint16 green;
+	guint16 blue;
+} GdkColor;
+*/
+GdkColor YellowColor = { 0, 63479,63479,48830 };
 
-// 
-// 
+//
+//
 gchar *libutils_dup_chomp( gchar *p_str )
 {
 	gchar	*StrNew = g_strdup( p_str );
 	gchar	*Ptr = StrNew;
-	
+
 	while( *Ptr ) {
 		if( '\n' == *Ptr ) *Ptr = '\0';
 		if( '\r' == *Ptr ) *Ptr = '\0';
@@ -76,8 +86,8 @@
 	}
 	return( StrNew );
 }
-// 
-// 
+//
+//
 gchar *libutils_chomp( gchar *p_str )
 {
 	gchar	*Ptr = p_str;
@@ -88,21 +98,21 @@
 	}
 	return( p_str );
 }
-// 
-// 
+//
+//
 gchar *libutils_get_prefix (gchar *PathNameFile)
 {
 	gchar	*Prefix = g_strdup (PathNameFile);
 	gchar	*Ptr = NULL;
-	
+
 	if (NULL != (Ptr = strrchr (Prefix, '/'))) {
 		*Ptr = '\0';
 	}
-	
+
 	return (Prefix);
 }
-// 
-// 
+//
+//
 gboolean libutils_access_mode (gchar *PathNameFile)
 {
 	gboolean	FileAccessModeFileExist = access (PathNameFile, F_OK) == -1 ? FALSE : TRUE;
@@ -110,24 +120,31 @@
 }
 // CREATION D UN DOSSIER TEMPORAIRE
 //
-gchar *libutils_create_temporary_rep (gchar *SrcTmp, gchar *NewRepTmp)
+gchar *libutils_create_temporary_rep( gchar *SrcTmp, gchar *NewRepTmp )
 {
-	//gchar	*LineCommand = NULL;
 	gchar	*Path = NULL;
-	
-	if (NewRepTmp != NULL) {
-		Path = g_strdup_printf ("%s/%s", SrcTmp, NewRepTmp);
-		if (FALSE == libutils_test_dir_exist (Path)) {
+	gint	NumPath = 0;
+
+	// FIXED
+	// Mon, 20 Jan 2014 16:33:36 +0100
+	// Plusieurs instances de XCFA peuvent être activées sans collision pour les conversions et extractions
+	//
+	while( TRUE ) {
+		Path = g_strdup_printf( "%s/%s_%d", SrcTmp, NewRepTmp, NumPath );
+		if( TRUE == g_file_test( Path, G_FILE_TEST_IS_DIR ) ) {
+			g_free( Path );
+			Path = NULL;
+		}
+		else {
 			if( TRUE == OptionsCommandLine.BoolVerboseMode )
-				g_print ("CREATE TEMPORARY REP:\n\t%s\n", Path);
-			g_mkdir_with_parents (Path, 0700);
-			// LineCommand = g_strdup_printf ("mkdir -p %s", Path);
-			// Dummy = system (LineCommand);
-			// g_free (LineCommand);
-			// LineCommand = NULL;
+				g_print( "CREATE TEMPORARY REP:\n\t%s\n", Path );
+			g_mkdir_with_parents( Path, 0700 );
+			break;
 		}
+		NumPath ++;
 	}
-	return ((gchar *)Path);
+
+	return( (gchar *)Path );
 }
 // SUPPRESSION D UN DOSSIER TEMPORAIRE
 //
@@ -163,12 +180,12 @@
 	return (g_file_test (File, G_FILE_TEST_IS_REGULAR));
 }
 // RENVOIE LE PAHTNAME AVEC LA NOUVELLE EXTENTION
-// 
+//
 gchar *libutils_get_pathname_with_new_ext (gchar *PathName, gchar *NewExt)
 {
 	gchar	*NewPathName = g_strdup_printf ("%s0123456789", PathName);
 	gchar	*Ptr = strrchr (NewPathName, '.');
-	
+
 	if (NULL == Ptr) {
 		for (Ptr = NewPathName; *Ptr; Ptr ++);
 		*Ptr ++ = '.';
@@ -178,21 +195,21 @@
 		Ptr ++;
 	}
 	strcpy (Ptr, NewExt);
-	
+
 	return (NewPathName);
 }
 // RENVOIE TRUE SI LE FICHIER EXISTE SINON FALSE
-// 
+//
 gboolean libutils_test_file_with_new_ext_exist (gchar *PathName, gchar *NewExt)
 {
 	gchar		*NewPathName = libutils_get_pathname_with_new_ext (PathName, NewExt);
 	gboolean	BoolFileExist;
-	
+
 	BoolFileExist = libutils_test_file_exist (NewPathName);
-	
+
 	g_free (NewPathName);
 	NewPathName = NULL;
-	
+
 	return (BoolFileExist);
 }
 // TRUE SI LE DOSSIER EXISTE SINON FALSE
@@ -206,16 +223,16 @@
 	return (g_file_test (File, G_FILE_TEST_IS_DIR));
 }
 // AFFICHE L ICONE A GAUCHE DANS LA BARRE DE TITRE
-// 
+//
 gchar *libutils_get_pathname_pixmaps (gchar *p_name_pixmap)
 {
 	gchar *LineCommand = NULL;
-	
+
 	LineCommand = xdg_search_data_xdg( p_name_pixmap );
 	return (LineCommand);
 }
 // AFFICHE L ICONE A GAUCHE DANS LA BARRE DE TITRE
-// 
+//
 void libutils_set_default_icone_to_win (GtkWidget *win)
 {
 	gchar *LineCommand = NULL;
@@ -234,18 +251,18 @@
 }
 // Execute WHICH Name_Prg et si 'gchar **Pathname_Prg' est non null retourne le resultat
 //	gchar *g_find_program_in_path( const gchar *program );
-// 
+//
 gboolean libutils_find_file (gchar *p_find_file)
 {
 	gchar *PathName = NULL;
-	
+
 	if( NULL != p_find_file ) {
 		if( NULL != (PathName = g_find_program_in_path( p_find_file ))) {
 			g_free( PathName );	PathName = NULL;
 			return( TRUE );
 		}
 	}
-	
+
 	return( FALSE );
 }
 /* utils_hexa_to_int : convertit en entier la chaine pointee par 'gchar *Ptr_Hexa' en hexa
@@ -290,7 +307,7 @@
 	return (Gint_Ret);
 }
 // SUPPRESSION SIMPLE ALLOC POINTEE PAR LE GLIST ANSI QUE LE GLIST
-// 
+//
 GList *libutils_remove_glist (GList *New)
 {
 	GList *list = NULL;
@@ -312,7 +329,7 @@
 	return ((GList *)NULL);
 }
 // SUPPRESSION SIMPLE ALLOC POINTEE PAR LE GSLIST ANSI QUE LE GSLIST
-// 
+//
 GSList *libutils_remove_gslist (GSList *New)
 {
 	GSList *gslist = NULL;
@@ -331,7 +348,7 @@
 	return ((GSList *)NULL);
 }
 // RETOURNE LA TAILLE DU FICHIER EN OCTETS
-// 
+//
 size_t libutils_get_size_file (gchar *PathName)
 {
 	FILE *fp;
@@ -345,21 +362,22 @@
 	return (size);
 }
 // Ecriture de datas sur disk, recuperation puis effacement du fichier
-// 
+//
 void libutils_add_datas_on_disk (gchar *data)
 {
 	FILE *fp = NULL;
-	
+
 	fp = fopen ("/tmp/data_xcfa.txt", "a");
 	fprintf (fp, "%s", data);
 	fclose (fp);
 }
 gchar *libutils_get_datas_on_disk (void)
 {
+	/*
 	FILE *fp = NULL;
 	gchar *buf = NULL;
 	size_t size;
-	
+
 	size = libutils_get_size_file ("/tmp/data_xcfa.txt");
 	buf = (gchar *)g_malloc0 (sizeof(gchar) * (size + 10));
 	if ((fp = fopen ("/tmp/data_xcfa.txt", "r")) != NULL) {
@@ -369,19 +387,37 @@
 		g_free (buf);
 		buf = NULL;
 	}
-	
+
+	g_unlink ("/tmp/data_xcfa.txt");
+
+	return ((gchar *)buf);
+	*/
+	FILE *fp = NULL;
+	gchar *buf = NULL;
+	size_t size;
+
+	if( (size = libutils_get_size_file( "/tmp/data_xcfa.txt" )) > 10 ) {
+		buf = (gchar *)g_malloc0 (sizeof(gchar) * (size + 10));
+		if ((fp = fopen ("/tmp/data_xcfa.txt", "r")) != NULL) {
+			size = fread (buf, 1, size, fp);
+			fclose (fp);
+		} else {
+			g_free (buf);
+			buf = NULL;
+		}
+	}
 	g_unlink ("/tmp/data_xcfa.txt");
 
 	return ((gchar *)buf);
 }
 // TRUE SI ECRITURE OK SINON FALSE
-// 
+//
 gboolean libutils_test_write (gchar *path)
 {
 	gboolean BoolWriteOk = FALSE;
 	FILE *fp = NULL;
 	gchar *str = NULL;
-	
+
 	if (path[ 0 ] == '/' && path[ 1 ] != '\0') {
 		str = g_strdup_printf ("%s/xcfa_tst_write.txt", path);
 		fp = fopen (str, "w");
@@ -393,11 +429,11 @@
 		g_free (str);
 		str = NULL;
 	}
-	
+
 	return (BoolWriteOk);
 }
 // INIT PIXBUF
-// 
+//
 GdkPixbuf *libutils_init_pixbufs (gchar *NameFilePixbuf)
 {
 	GdkPixbuf *NewPixbuf = NULL;
@@ -420,48 +456,47 @@
 
 	return (NewPixbuf);
 }
-// 
-// 
-gint *libutils_get_tab_selected_line (GtkTreeSelection *AdrLine, GtkTreeModel *AdrTreeModel)
+//
+// typedef enum {
+// 	TYPE_ALL_FILE = 0,
+// 	TYPE_WAV_FILE,
+// 	TYPE_MP3_OGG_FILE,
+// 	TYPE_TAG_FILE
+// } TYPE_FILE;
+//
+gint libutils_get_first_line_is_selected( GtkTreeSelection *AdrLine, GtkTreeModel *AdrTreeModel )
 {
-	guint		NbSelect;
-	guint		tt = 0;
 	gboolean	valid;
 	GtkTreeIter	iter;
-	gint		*TabInt = NULL;
-	gint		Cpt = 0;
-	
-	if (NULL != AdrLine) {
-		if ((NbSelect = gtk_tree_selection_count_selected_rows (AdrLine)) > 0) {
-			TabInt = (gint *)g_malloc0 (sizeof (gint) * (NbSelect + 10));
-			valid = gtk_tree_model_get_iter_first (AdrTreeModel, &iter);
-			while (valid) {
-				if (TRUE == gtk_tree_selection_iter_is_selected (AdrLine, &iter)) {
-					*(TabInt + Cpt) = tt;
-					Cpt ++;
-				}
-				tt ++;
-				valid = gtk_tree_model_iter_next (AdrTreeModel, &iter);
+	gint		Cpt = -1;
+
+	if (NULL != AdrLine && NULL != AdrTreeModel ) {
+		valid = gtk_tree_model_get_iter_first( AdrTreeModel, &iter );
+		while (valid) {
+			if (TRUE == gtk_tree_selection_iter_is_selected( AdrLine, &iter) ) {
+				Cpt ++;
+				return( Cpt );
 			}
-			*(TabInt + Cpt) = -1;
+			valid = gtk_tree_model_iter_next( AdrTreeModel, &iter );
+			if( TRUE == valid ) Cpt ++;
 		}
 	}
-	return ((gint *)TabInt);
+	return( -1 );
 }
-// 
-// 
+//
+//
 gchar *libutils_get_name_without_ext_with_amp( gchar *p_PathNameFile )
 {
 	gchar *NewName = g_strnfill (strlen(p_PathNameFile) * 4, '\0');
 	gchar *NewPtr = NewName;
 	gchar *NameRet = NULL;
 	gchar *ptr = NULL;
-	
+
 	// POINTEUR SUR LE DEBUT DU NOM REEL
 	if (NULL != (ptr = strrchr (p_PathNameFile, '/')))
 		ptr ++;
 	else	ptr = p_PathNameFile;
-	
+
 	// COPIE DE p_PathNameFile VERS NewName
 	while (*ptr) {
 		if (*ptr == '&') {
@@ -475,7 +510,7 @@
 			*NewPtr ++ = *ptr ++;
 		}
 	}
-	
+
 	// DUPLIQUER NewName VERS name
 	NameRet = g_strdup (NewName);
 	g_free (NewName);
@@ -486,18 +521,18 @@
 
 	return ((gchar *)NameRet);
 }
-// 
-// 
+//
+//
 gchar *libutils_get_name_without_ext( gchar *p_PathNameFile )
 {
 	gchar *NewName = NULL;
 	gchar *Ptr = NULL;
-	
+
 	// POINTEUR SUR LE DEBUT DU NOM REEL
 	if( NULL != (Ptr = strrchr (p_PathNameFile, '/' )))
 		Ptr ++;
 	else	Ptr = p_PathNameFile;
-	
+
 	// COPIE
 	NewName = g_strdup( Ptr );
 
@@ -506,42 +541,21 @@
 
 	return( (gchar *)NewName );
 }
-// 
-// RETOURNE LE NOMBRE DE PROCESSUS ACTIF
-// http://geekiroxx.free.fr/weblog/index.php?article8/fonction-c-retournant-le-nombre-de-processus-actif-linux
-// 
-gint libutils_getNbProcess( void )
-{
-	struct dirent	*Read;
-	DIR		*Repo;
-	gint		pNbr = 0;
-	
-	Repo = opendir("/proc");
-	while( (Read = readdir(Repo)) ) {
-		if( atoi(Read->d_name) > 0 && atoi(Read->d_name) < 32768 ) {
-			// g_print( "[ %4d ] Read->d_name = %s\n", pNbr+1, Read->d_name );
-			pNbr ++;
-		}
-	}
-	closedir( Repo );
-	return( pNbr );
-}
-// 
-// 
+//
+//
 gchar *libutils_string_toupper( gchar *p_str )
 {
 	gchar	*Str = g_strdup( p_str );
 	gchar	*Ptr = Str;
-	
+
 	while( Ptr && *Ptr ) {
 		*Ptr = g_ascii_toupper( *Ptr );
 		Ptr ++;
 	}
-	
+
 	return( Str );
 }
 
 
 
 
-

xcfa-4.2.8.tar.gz/lib/lib.h -> xcfa-5.0.2.tar.gz/lib/lib.h Changed

@@ -3,7 +3,7 @@
  * project   : xcfa
  * with      : Gtk-2
  *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
  *
  * xcfa - GTK+ implementation of the GNU shell command
  * GNU General Public License
@@ -35,6 +35,8 @@
 #ifndef libH_h
 #define libH_h 1
 
+
+
 // /usr/include/gtk-2.0/gdk/gdkkeysyms.h
 typedef struct {
 	gboolean	BoolVerboseMode;
@@ -44,6 +46,10 @@
 
 extern OPTIONS_COMMAND_LINE OptionsCommandLine;
 
+extern GdkColor YellowColor;
+
+
+
 // FILE_IS.C
 // 
 gboolean	FileIs_vidm4a( gchar *namefile );
@@ -86,18 +92,15 @@
 GdkPixbuf	*libutils_init_pixbufs (gchar *NameFilePixbuf);
 gchar		*libutils_get_pathname_with_new_ext (gchar *PathName, gchar *NewExt);
 gboolean	libutils_test_file_with_new_ext_exist (gchar *PathName, gchar *NewExt);
-gint		*libutils_get_tab_selected_line (GtkTreeSelection *AdrLine, GtkTreeModel *AdrTreeModel);
+gint		libutils_get_first_line_is_selected( GtkTreeSelection *AdrLine, GtkTreeModel *AdrTreeModel );
 gchar		*libutils_get_name_without_ext_with_amp( gchar *p_PathNameFile );
 gchar		*libutils_get_name_without_ext( gchar *p_PathNameFile );
 gchar		*libutils_create_temporary_rep (gchar *SrcTmp, gchar *NewRepTmp);
 gchar		*libutils_remove_temporary_rep (gchar *path_tmprep);
-gint		libutils_getNbProcess( void );
 gchar		*libutils_string_toupper( gchar *p_str );
 
 // COMBO.C
 // 
-void		libcombo_remove (void);
-void		libcombo_alloc (GtkComboBox *p_combo);
 void		libcombo_remove_options (GtkComboBox *p_combo);
 
 // UTF8.C

xcfa-4.2.8.tar.gz/lib/utf8.c -> xcfa-5.0.2.tar.gz/lib/utf8.c Changed

xcfa-4.2.8.tar.gz/lib/xdg.c -> xcfa-5.0.2.tar.gz/lib/xdg.c Changed

xcfa-4.2.8.tar.gz/man/Makefile.am -> xcfa-5.0.2.tar.gz/man/Makefile.am Changed

xcfa-4.2.8.tar.gz/man/Makefile.in -> xcfa-5.0.2.tar.gz/man/Makefile.in Changed

xcfa-4.2.8.tar.gz/man/xcfa.gz -> xcfa-5.0.2.tar.gz/man/xcfa.gz Changed

@@ -1,5 +1,5 @@
 .\" xcfa_man
-.\" Copyright (C) 2003,2004,2005,2006,2007,2008,2009,2010,2011,2012 Claude Bulin
+.\" Copyright (C) 2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015 Claude Bulin
 .\"
 .\" xcfa! is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 .\" MA 02111-1307, USA.
 .\"
 
-.TH xcfa 1 "Sun, 25 Dec 2011" 4.2.8 "Manual: Xcfa"
+.TH xcfa 1 "Fri, 16 Jan 2015" 5.0.0 "Manual: Xcfa"
 
 .SH NAME
 \fBxcfa\fP \- GTK+ Implementation of the GNU shell command.
@@ -25,17 +25,15 @@
 .SH SYNOPSIS
 \fBxcfa\fP [\fIOPTION\fR]... [\fIFILE\fR]...
 .TP
-\fB-h, \-help\fR
+\fB-h, \-\-help\fR
 Displays this help section and exits.
 .TP
-\fB\-version\fR
+\fB\-\-version\fR
 Displays the version of the program and exits.
 .TP	
-\fB\-verbose\fR
+\fB\-\-verbose\fR
 Activate verbose mode
 .TP
-\fB$HOME/Music/file.wav ...\fR
-.TP	
 
 .SH DESCRIPTION
 \fBInterface\fP contains console tools (cdparanoia, lame, oggenc, ...).

xcfa-5.0.2.tar.gz/man/xcfa_cli.1.gz Added

@@ -0,0 +1,289 @@
+.\" xcfa_cli
+.\" Copyright (C) 2014 BULIN Claude
+.\"
+.\" xcfa_cli! is free software; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2, or
+.\" (at your option) any later version.
+.\"
+.\" xcfa_cli! is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+.\" General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with program; see the file COPYING. If not, write to the
+.\" Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+.\" MA 02111-1307, USA.
+.\"
+
+.TH xcfa_cli 1 "Thu, 06 Nov 2014" 0.0.6 "Manual: 0.0.6"
+
+.SH NAME
+\fBxcfa_cli\fR \- This program is an implementation of xcfa in command line.
+
+.SH DESCRIPTION
+.br
+\fBxcfa_cli\fR is an application for conversion, normalization, reconfiguring wav files and cut audio files ...
+.br
+What \fBxcfa_cli\fR can do:
+.br
+ - replaygain on files: flac, mp3, ogg, wavpack
+.br
+ - conversions:
+.br
+	 - from files:
+.br
+		 wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, aif, ac3
+.br
+	 - to files:
+.br
+		wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, aac
+.br
+	- conversion settings for file management:
+.br
+		flac, ape, wavpack, ogg, m4a, aac, mpc, mp3
+.br
+ - management tags
+.br
+ - management cue wav file
+.br
+ - manipulation of the frequency, track and bit wav files
+.br
+ - standardization on files: wav, mp3, ogg
+.br
+ - cuts (split) wav files
+.br
+ - displaying information on files
+
+.SH SYNOPSIS
+\fBxcfa_cli\fP [\fI \fB\-i\fP "file.*"\fR ][\fI \fB\-d\fP wav\fB,\fImpc\fB,\fI...\fR ][\fI OPTIONS \fR]
+
+.SH OPTIONS
+.TP
+\fB\-\-verbose\fR
+Verbose mode
+.TP
+\fB\-h \-\-help\fR
+Print help mode and quit
+.TP
+\fB\-i \fI<"file.type">\fB \-\-input \fI<"file.type">\fR
+Input name file to convert in inverted commas: \fB\-\-input \fI"*.flac"\fR
+.br
+Type input files: wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, aif, ac3
+.TP
+\fB\-o \fI<path_dest/>\fB \-\-output \fI<path_dest/>\fR
+Destination folder. By default in the source file folder.
+.TP
+\fB\-d \fI<wav\fB,\fIflac\fB,\fIape\fB,\fI...>\fB \-\-dest \fI<wav\fB,\fIflac\fB,\fIape\fB,\fI...>\fR
+Destination file: wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, aac
+.TP
+\fB\-r \-\-recursion\fR
+Recursive search
+.TP
+\fB\-e \-\-ext2src\fR
+Extract in the source folder. This option is useful with '\fB\-\-recursion\fR'
+.TP
+\fB\-\-nice <priority>\fR
+Change the priority of running processes in the interval: 0 .. 20
+
+.TP
+Management options with default parameters:
+.TP
+\fB\-\-op_flac \fI<"\-5">\fR
+.TP
+\fB\-\-op_ape \fI<"c2000">\fR
+.TP
+\fB\-\-op_wavpack \fI<"\-y \-j1">\fR
+.TP
+\fB\-\-op_ogg \fI<"\-\-quality=3">\fR
+.TP
+\fB\-\-op_m4a \fI<"\-q 100">\fR
+.TP
+\fB\-\-op_aac \fI<"48">\fR
+.TP
+\fB\-\-op_mpc \fI<"\-\-verbose \-\-overwrite \-\-insane">\fR
+.TP
+\fB\-\-op_mp3 \fI<"\-h \-\-nohist \-\-noreplaygain \-b 128">\fR
+
+.TP
+Displays information about the files:
+.TP
+\fB\-\-info_files\fR
+Displays time, level dBFS, frequency/track/quantification
+.TP
+\fB\-\-info_tags\fR
+Displays tags
+.TP
+\fB\-\-info_head\fR
+Displays head
+
+.TP
+Management tags:
+.TP
+\fB\-\-no_tag\fR
+The tags will not be carried
+.TP
+\fB\-\-tag_album \fI<"tags">\fR
+Tag of album
+.TP
+\fB\-\-tag_artist \fI<"tags">\fR
+Tag of artist
+.TP
+\fB\-\-tag_title \fI<"tags">\fR
+Tag of title
+.TP
+\fB\-\-tag_number \fI<"tags">\fR
+Tag of number
+.TP
+\fB\-\-tag_genre \fI<"tags">\fR
+Tag of genre
+.TP
+\fB\-\-tag_year \fI<"tags">\fR
+Tag of year
+.TP
+\fB\-\-tag_comment \fI<"tags">\fR
+Tag of comment
+.TP
+\fB\-\-tag_description \fI<"tags">\fR
+Tag of description
+
+.TP
+Management cue file:
+.TP
+\fB\-c \fI<info\fB|\fIextract\fB> \fB\-\-cue \fI<info\fB|\fIextract>\fR
+.br
+\fBinfo\fR Provides information on a WAV or CUE file.
+.br
+\fBextract\fR Extract all tracks of a WAV file.
+
+.TP
+Management split:
+.TP
+\fB\-s \fI<hh\fB:\fImm\fB:\fIss> \fB\-\-split \fI<hh\fB:\fImm\fB:\fIss>\fR
+Mark the beginning of the file to be cut.
+.TP
+\fB\-l \fI<sec> \fB\-\-length \fI<sec>\fR
+Specifies the length of the file to cut with the seconds parameter.
+
+.TP
+Changing the settings of a WAV file:
+.TP
+\fB\-f \fI<num> \fB\-\-frequency \fI<num>\fR
+Changing the frequency: 8000, 22000, 32000, 44056, 44100, 48000, 88200, 96000 or other
+.TP
+\fB\-t \fI<num> \fB\-\-track \fI<num>\fR
+Changing the number of tracks: 1, 2, 4, 6
+.TP
+\fB\-q \fI<num> \fB\-\-quantification \fI<num>\fR
+Changing the quantification: 8, 16, 24, 32, 64
+
+.TP
+Replaygain: dynamic modification for next files: FLAC, MP3, OGG, WAVPACK
+.TP
+\fB\-g \fI<clear\fB|\fIalbum\fB|\fItrack> \fB\-\-replaygain \fI<clear\fB|\fIalbum\fB|\fItrack>\fR
+FLAC [ \fIclear\fR | \fIalbum\fR ]
+.br
+MP3 [ \fIclear\fR | \fIalbum\fR | \fItrack\fR ]
+.br
+OGG [ \fIclear\fR | \fIalbum\fR | \fItrack\fR ]
+.br
+WAVPACK [ \fIclear\fR | \fIalbum\fR | \fItrack\fR ]
+
+.TP
+Normalize: static modification for next files: MP3, WAV, OGG
+See an excellent article by @Dzef on standardization: http://ubunteros.tuxfamily.org/spip.php?article159
+.TP
+\fB\-\-peak\fR
+.br
+Action on a single file.
+.br
+Maximum volume amplification for each file.
+.br
+Increase the overall level of the signal so as to bring the level to 0 dBFS peak without changing dynamics.
+.TP
+\fB\-\-peak_album\fR
+.br
+Action on a group of files.
+.br
+Maximum volume boost for a group of files in accordance with the level of differences between each of them.
+.br
+If the maximum level of one or more files is already at 0 dBFS, the level of all the selected files remain unchanged
+after normalization. So this mode can be safely used almost systematically.
+.TP
+\fB\-\-mix_rms_album \fI<dBFS>\fR
+.br
+Action on a group of files.
+.br
+Adjusting the average volume for a group of files respecting average level of the differences between each of them.
+.br
+The selecting a value for a file modifies the other files in the group.
+.TP
+\fB\-\-fix_rms \fI<dBFS>\fR
+.br
+Action on a single file.
+.br
+Adjusting the average volume of each file..
+The selecting a value for a file.
+
+.SH NOTE
+The options of conversions of externals programs can be seen from the manpages: $ \fBman prog\fR or $ \fBprog \-\-help\fR
+.br
+See: \fBop_flac, op_ape, op_wavpack,op_ogg, op_m4a, op_aac, op_mpc, op_mp3\fR
+
+.SH EXAMPLES convertion
+$ xcfa_cli \-\-input "file.wav" \-d ogg \-\-dest flac,mpc \-\-output newfolder/
+.br
+$ xcfa_cli \-\-input "*.wav" \-\-dest ogg,flac,mp3 \-\-output newfolder/ \-\-recursive \-\-op_mp3 "\-\-preset fast extreme"
+.br
+$ xcfa_cli \-\-input "*.*" -d mp3 \-\-split 00:00:00 \-l 30 -o newfolder/ \-\-verbose \-\-frequency 44100 \-\-track 2 \-\-quantification 16
+
+.SH CONVERSION example with two inputs
+$ xcfa_cli \-\-input "file.wav" \-\-input "other_file.mp3" \-d ogg \-\-dest flac,mpc, \-\-output newfolder/
+
+.SH EXAMPLES split
+$ xcfa_cli \-\-input "file.wav" \-\-split_info
+.br
+$ xcfa_cli \-\-input "file.wav" \-d ogg,mpc \-\-split 00:00:32 \-\-length 22 \-\-output newfolder/
+.br
+$ xcfa_cli \-\-input "file.wav" \-d ogg,mpc \-\-split 00:01:00 \-\-length 22 \-\-output newfolder/
+
+.SH EXAMPLES setting wav
+$ xcfa_cli \-i "file.wav" \-d wav \-o newfolder/ \-\-frequency 96000 \-\-track 6 \-\-quantification 32 \-\-verbose
+
+.SH EXAMPLES replaygain:
+$ xcfa_cli \-i "*.*" \-\-replaygain clear
+.br
+$ xcfa_cli \-i "*.*" \-\-replaygain album
+
+.SH EXAMPLES normalize:
+$ xcfa_cli \-i "*.*" \-\-info_files
+.br
+$ xcfa_cli \-i "*.*" \-\-peak_album
+.br
+$ xcfa_cli \-i "*.*" \-\-peak
+.br
+$ xcfa_cli \-i "*.*" \-\-mix_rms_album \-10
+.br
+$ xcfa_cli \-i "*.*" \-\-fix_rms \-4
+
+.SH EXAMPLES info
+$ xcfa_cli \-i "*.*" \-\-info_files \-\-info_tags \-\-info_head
+
+.SH EXAMPLES cue
+$ xcfa_cli \-i "file.cue" \-\-cue info
+.br
+$ xcfa_cli \-i "file.cue" \-\-cue extract
+.br
+$ xcfa_cli \-i "file.wav" \-\-cue info
+.br
+$ xcfa_cli \-i "file.wav" \-\-cue extract
+
+.SH SEE ALSO
+Consult the documentation of:
+.br
+a52dec, aacplusenc, mp3check, faac, faad, flac, lame, mac, mpcdec, mpcenc, mplayer, mp3gain, normalize, shorten, shntool, sox, oggenc, vorbisgain, wavpack
+
+
+.SH AUTHOR
+\fBxcfa_cli\fP is developed by BULIN Claude

xcfa-4.2.8.tar.gz/menu/Makefile.in -> xcfa-5.0.2.tar.gz/menu/Makefile.in Changed

xcfa-4.2.8.tar.gz/menu/xcfa.desktop -> xcfa-5.0.2.tar.gz/menu/xcfa.desktop Changed

xcfa-4.2.8.tar.gz/pixmaps/Makefile.in -> xcfa-5.0.2.tar.gz/pixmaps/Makefile.in Changed

xcfa-4.2.8.tar.gz/po/Makefile.in.in -> xcfa-5.0.2.tar.gz/po/Makefile.in.in Changed

xcfa-4.2.8.tar.gz/po/POTFILES.in -> xcfa-5.0.2.tar.gz/po/POTFILES.in Changed

xcfa-4.2.8.tar.gz/po/de.gmo -> xcfa-5.0.2.tar.gz/po/de.gmo Changed

xcfa-4.2.8.tar.gz/po/de.po -> xcfa-5.0.2.tar.gz/po/de.po Changed

@@ -5,241 +5,190 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xcfa 4.2.8\n"
+"Project-Id-Version: xcfa 5.0.2\n"
 "Report-Msgid-Bugs-To: xcfa@tuxfamily.org\n"
-"POT-Creation-Date: 2012-02-03 13:22+0100\n"
-"PO-Revision-Date: 2009-08-02 19:09+0100\n"
+"POT-Creation-Date: 2015-05-16 14:03+0200\n"
+"PO-Revision-Date: 2015-02-06 16:42+0100\n"
 "Last-Translator: BULIN Claude xcfa@tuxfamily.org\n"
 "Language-Team: xcfa-Team\n"
-"Language: \n"
+"Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: German\n"
-"X-Poedit-Country: GERMANY\n"
+"X-Generator: Poedit 1.7.3\n"
 
-#: src/cd_audio.c:815 src/dvd.c:684 src/dvd.c:1327
-msgid "MPLAYER deja en action"
-msgstr "Track-Auswahl"
+#: src/cd_audio.c:814 src/dvd.c:686 src/dvd.c:1345
+msgid "MPLAYER already in action"
+msgstr "Beschreibung"
 
-#: src/cd_audio.c:816 src/dvd.c:685 src/dvd.c:1328
-msgid "MPLAYER est deja utilise !!"
+#: src/cd_audio.c:815 src/dvd.c:687 src/dvd.c:1346
+msgid "MPLAYER is already in use !!"
 msgstr "MPlayer ist bereits im Einsatz"
 
-#: src/cd_audio.c:1227 src/cd_audio.c:1233 src/dvd.c:871 src/file.c:2830
-msgid "(Click Droit = Menu) / En attente de selection."
-msgstr "(Rechtsklick = Menü) / Bitte eine Auswahl treffen."
+#: src/cd_audio.c:1227 src/cd_audio.c:1233 src/file.c:2837
+msgid "(Right click = Menu) / Waiting for selection."
+msgstr "(Right Click = Menu) / Anzahl der Titel Select (Kanäle)"
 
-#: src/cd_audio.c:1230 src/file.c:2827
-msgid "Le programme externe d'extraction est absent."
-msgstr "Das externe Programm Extraktion fehlt."
+#: src/cd_audio.c:1230
+msgid "The external ripping program is missing."
+msgstr "Die externe Ripping-Programm fehlt."
 
-#: src/cd_audio.c:1236 src/file.c:2833
-msgid "(Click Droit = Menu) / En attente de selection. Le fichier existe."
-msgstr "(Rechtsklick = Menü) / Bitte eine Auswahl treffen. Datei existiert."
+#: src/cd_audio.c:1236
+msgid "(Right click = Menu) / Waiting for Selection. File exists.."
+msgstr "(Rechtsklick = Menü) / Auswahl. Datei existiert."
 
-#: src/cd_audio.c:1239 src/file.c:2836
-msgid "(Click Droit = Menu) / En selection."
-msgstr "(Rechtsklick = Menü) / Auswahl"
+#: src/cd_audio.c:1239
+msgid "(Right click = Menu) / Selected files."
+msgstr "(Right Click = Menu) / Anzahl der Titel Select (Kanäle)"
 
-#: src/cd_audio.c:1242 src/file.c:2842
-msgid "(Click Droit = Menu) / Selection avec options expert."
+#: src/cd_audio.c:1242 src/file.c:2849
+msgid "(Right click = Menu) / Selection - expert mode."
 msgstr "(Rechtsklick = Menü) / Auswahl im Expertenmodus."
 
-#: src/cd_audio.c:1245 src/file.c:2839
-msgid "(Click Droit = Menu) / En selection. Le fichier existe."
+#: src/cd_audio.c:1245 src/file.c:2846
+msgid "(Right click = Menu) / Selected files. File exists."
 msgstr "(Rechtsklick = Menü) / Auswahl. Datei existiert."
 
-#: src/cd_audio.c:1248 src/file.c:2845
-msgid ""
-"(Click Droit = Menu) / Selection avec options expert. Le fichier existe."
+#: src/cd_audio.c:1248 src/file.c:2852
+msgid "(Right click = Menu) / Selection - expert mode. File exists."
 msgstr "(Rechtsklick = Menü) / Auswahl im Expertenmodus. Datei existiert."
 
 #: src/cd_audio.c:1257
 msgid ""
-"(Click Droit = Menu) / Possibilite d'ajustement INDIVIDUEL ou COLLECTIF "
-"maximal du volume"
+"(Right click = Menu) / Possibilities for individual adaptation or maximum "
+"collection volume"
 msgstr ""
-"(Rechtsklick = Menü) / Möglichkeiten zur individuellen Anpassung oder "
+"(Right click = Menu) / Möglichkeiten zur individuellen Anpassung oder "
 "maximale Auffangvolumen"
 
 #: src/cd_audio.c:1262
-msgid "(Click Droit = Menu) / Ajustement INDIVIDUEL maximal du volume"
-msgstr "(Rechtsklick = Menü) / Individuelle maximale Lautstärke"
+msgid "(Right click = Menu) / INDIVIDUAL maximum volume adjustment"
+msgstr ""
+"(Right click = Menu) / Möglichkeiten zur individuellen Anpassung oder "
+"maximale Auffangvolumen"
 
 #: src/cd_audio.c:1265
-msgid "(Click Droit = Menu) / Ajustement COLLECTIF maximal du volume"
-msgstr "(Rechtsklick = Menü) / COLLECTIVE maximale Lautstärke"
-
-#: src/cd_audio.c:1505 src/dvd.c:1103 src/file.c:3139 src/translate.c:336
-#: src/translate.c:347 src/translate.c:366
-msgid "Play"
-msgstr "Play"
-
-#: src/cd_audio.c:1546 src/file.c:3204 src/translate.c:348 src/translate.c:369
-msgid "Wav"
-msgstr "Wav"
-
-#: src/cd_audio.c:1567 src/file.c:3223 src/translate.c:349 src/translate.c:370
-msgid "Flac"
-msgstr "Flac"
-
-#: src/cd_audio.c:1587 src/file.c:3242 src/translate.c:350 src/translate.c:371
-msgid "Ape"
-msgstr "Ape"
-
-#: src/cd_audio.c:1607 src/file.c:3261
-msgid "WavP"
-msgstr "WavP"
-
-#: src/cd_audio.c:1627 src/file.c:3280 src/translate.c:352 src/translate.c:373
-msgid "Ogg"
-msgstr "Ogg"
-
-#: src/cd_audio.c:1648 src/file.c:3299 src/translate.c:353 src/translate.c:374
-msgid "M4a"
-msgstr "M4a"
-
-#: src/cd_audio.c:1669 src/file.c:3318 src/translate.c:354 src/translate.c:375
-msgid "Aac"
-msgstr "Aac"
-
-#: src/cd_audio.c:1689 src/file.c:3337
-msgid "Mpc"
-msgstr "Mpc"
-
-#: src/cd_audio.c:1709 src/file.c:3356 src/translate.c:356 src/translate.c:377
-msgid "Mp3"
-msgstr "Mp3"
-
-#: src/cd_audio.c:1730 src/translate.c:357
-msgid "Num"
-msgstr "Nr."
-
-#: src/cd_audio.c:1745 src/translate.c:358 src/translate.c:378
-#: src/translate.c:403 src/translate.c:411
-msgid "Time"
-msgstr "Dauer"
+msgid "(Right click = Menu) / COLLECTIVE maximum volume adjustment"
+msgstr ""
+"(Right click = Menu) / Möglichkeiten zur individuellen Anpassung oder "
+"maximale Auffangvolumen"
 
-#: src/cd_audio.c:1760 src/dvd.c:1171 src/file.c:3392 src/translate.c:340
-#: src/translate.c:359 src/translate.c:379
+#: src/cd_audio.c:1764 src/dvd.c:1187 src/file.c:3403
+#: glade/xcfa_win_treeview.glade:180 glade/xcfa_win_treeview.glade:560
+#: glade/xcfa_win_treeview.glade:961
 msgid "Normalise"
 msgstr "Normalisieren"
 
-#: src/cd_audio.c:1785 src/dvd.c:1191 src/file.c:3434 src/file_mp3ogg.c:1287
-#: src/file_tags.c:1209 src/file_wav.c:952 src/prg_init.c:614
-#: src/translate.c:341 src/translate.c:360 src/translate.c:381
-#: src/translate.c:393 src/translate.c:404 src/translate.c:412
-msgid "Nom"
+#: src/cd_audio.c:1789 src/dvd.c:1207 src/file.c:3445 src/file_mp3ogg.c:964
+#: src/file_tags.c:1253 src/file_wav.c:830 src/prg_init.c:609
+msgid "Name"
 msgstr "Name"
 
-#: src/cd_audio.c:2507
-msgid " Parametrage CDDB: [ Nom du serveur ]"
+#: src/cd_audio.c:2517
+msgid " Setting up CDDB: [ Server name ]"
 msgstr " Einrichten CDDB: [ Server name ]"
 
-#: src/cd_audio.c:2516
-msgid " Parametrage PROXY: [ serveur ] [ port ]"
+#: src/cd_audio.c:2526
+msgid " Proxy settings: [ server ] [ port ] "
 msgstr " Proxy-Einstellungen: [ server ] [ port ]"
 
-#: src/cd_audio.c:2526 src/translate.c:99
-msgid " Serveur "
-msgstr " Server "
+#: src/cd_audio.c:2536 glade/xcfa.glade:1842
+msgid " Server "
+msgstr " Auswurf "
 
-#: src/cd_audio_extract.c:661
+#: src/cd_audio_extract.c:673
 #, c-format
-msgid ""
-"[Erreur du segment numero: %d]\n"
-"%d) Lecture PASS 1/2\n"
+msgid "[Error on segment #%d] %d) Playing PASS 1/2\n"
 msgstr ""
 "[Fehler im Segment Nummer: %d]\n"
 "%d) Lesedurchgang 1/2\n"
 
-#: src/cd_audio_extract.c:668
+#: src/cd_audio_extract.c:680
 #, c-format
 msgid ""
-"--> Deja %d fois 2 lectures du segment %d!\n"
+"--> Segment %d already read two %d times!\n"
 " Abandon :/\n"
 msgstr ""
 "--> Bereits %d Mal das Segment %d doppelt gelesen\n"
 " Abbruch :/\n"
 
-#: src/cd_audio_extract.c:688
+#: src/cd_audio_extract.c:700
 #, c-format
-msgid "%d) Lecture PASS 2/2\n"
+msgid "%d) Read PASS 2/2\n"
 msgstr "%d) Lesedurchang 2 von 2\n"
 
-#: src/cd_audio_extract.c:769
+#: src/cd_audio_extract.c:780
 #, c-format
 msgid ""
 "\n"
-"[Piste: %d]\n"
+"[Track: %d]\n"
 msgstr ""
 "\n"
-"[Track: %d]\n"
+"[Spur: %d]\n"
 
-#: src/cd_audio_extract.c:773
-msgid "Extraction mode expert PASS 1/2\n"
+#: src/cd_audio_extract.c:784
+msgid "Ripping expert mode PASS 1/2\n"
 msgstr "- Rippen im Expertenmodus (Durchgang 1 von 2)\n"
 
-#: src/cd_audio_extract.c:784
-msgid "Extraction mode expert PASS 2/2\n"
+#: src/cd_audio_extract.c:795
+msgid "Ripping expert mode PASS 2/2\n"
 msgstr "- Rippen im Expertenmodus (Durchgang 2 von 2)\n"
 
-#: src/cd_audio_extract.c:792
-msgid "Controle du contenu des fichiers extraits\n"
+#: src/cd_audio_extract.c:803
+msgid "Control the content of the extracted files\n"
 msgstr "-- Überprüfung der gerippten Dateien\n"
 
-#: src/cd_audio_extract.c:1678 src/cd_audio_extract.c:1680
+#: src/cd_audio_extract.c:1710 src/cd_audio_extract.c:1712
 msgid "XCFA: Extraction CD"
 msgstr "XCFA: Rippen der CD"
 
-#: src/cd_audio_extract.c:1678 src/dvd_extract.c:412 src/file_action.c:190
-#: src/file_mp3ogg_conv.c:300 src/file_wav_conv.c:349
+#: src/cd_audio_extract.c:1710 src/dvd_extract.c:412 src/file_action.c:183
+#: src/file_mp3ogg_conv.c:329 src/file_wav_conv.c:343
 msgid "Ok"
 msgstr "Fertig"
 
-#: src/cd_audio_extract.c:1680 src/dvd_extract.c:414 src/file_action.c:192
-#: src/file_mp3ogg_conv.c:302 src/file_wav_conv.c:351
-msgid "Arret par l'utilisateur"
-msgstr "Vom User angehalten"
+#: src/cd_audio_extract.c:1712 src/dvd_extract.c:414 src/file_action.c:185
+#: src/file_mp3ogg_conv.c:331 src/file_wav_conv.c:345
+msgid "Stop by user"
+msgstr "Schauen Sie vorbei Benutzer"
 
-#: src/cd_audio_extract.c:1938
-msgid "Nom de fichier unique absent"
+#: src/cd_audio_extract.c:1983
+msgid "File name not found"
 msgstr "Dateiname nicht gefunden"
 
-#: src/cd_audio_extract.c:1939
-msgid "Veuillez saisir un nom pour le fichier unique"
-msgstr "Bitte geben Sie einen Namen für die Datei an"
+#: src/cd_audio_extract.c:1984
+msgid "Please enter a file name"
+msgstr "Bitte geben Sie einen Dateinamen"
 
-#: src/cd_audio_toc.c:160
+#: src/cd_audio_toc.c:156
 msgid "cdda2wav and icedax NOT FOUND"
 msgstr "cdda2wav und icedax NICHT GEFUNDEN"
 
-#: src/cd_audio_toc.c:161
+#: src/cd_audio_toc.c:157
 msgid "Please, install packages [ icedax, cdda2wav ]"
 msgstr "Bitte installieren Pakete [icedax, cdda2wav]"
 
-#: src/cd_audio_toc.c:166
+#: src/cd_audio_toc.c:163
 msgid "icedax NOT FOUND"
 msgstr "icedax nicht gefunden!"
 
-#: src/cd_audio_toc.c:167
+#: src/cd_audio_toc.c:164
 msgid "Please, install package [ icedax ]"
 msgstr "Bitte installieren Sie das Paket [ icedax ]"
 
-#: src/cd_audio_toc.c:172
+#: src/cd_audio_toc.c:170
 msgid "cdda2wav NOT FOUND"
 msgstr "cdda2wav NICHT GEFUNDEN"
 
-#: src/cd_audio_toc.c:173
+#: src/cd_audio_toc.c:171
 msgid "Please, install package [ cdda2wav ]"
 msgstr "Bitte installieren Paket [cdda2wav]"
 
-#: src/cd_audio_toc.c:181
+#: src/cd_audio_toc.c:180
 msgid "cdparanoia NOT FOUND"
 msgstr "cdparanoia nicht gefunden!"
 
-#: src/cd_audio_toc.c:182
+#: src/cd_audio_toc.c:181
 msgid "Please, install package [ cdparanoia ]"
 msgstr "Bitte installieren Sie das Paket [ cdparanoia ]"
 
@@ -251,668 +200,656 @@
 msgid "Please, install packages [ cd-discid ]"
 msgstr "Bitte installieren Sie das Paket [ cd-discid ]"
 
-#: src/cd_audio_toc.c:202
-msgid "ERREUR datas proxy"
+#: src/cd_audio_toc.c:203
+msgid "ERROR datas proxy"
 msgstr "ERROR Daten Proxy"
 
-#: src/cd_audio_toc.c:203
-msgid "Veuillez renseigner les champs du proxy"
-msgstr "Bitte füllen Sie alle Felder Proxy"
+#: src/cd_audio_toc.c:204
+msgid "Please complete all fields proxy"
+msgstr "Bitte füllen Sie alle Felder Proxy-"
 
-#: src/cd_curl.c:718 src/web.c:160
-msgid "La liaison internet est absente"
-msgstr "Es besteht keine Internetverbindung"
+#: src/cd_curl.c:734 src/web.c:187
+msgid "A web connection is missing"
+msgstr "Ist eine Internetverbindung fehlt"
 
-#: src/cd_curl.c:1122
+#: src/cd_curl.c:1204
 msgid "Couldn't find CD"
 msgstr "Konnte nicht gefunden CD"
 
-#: src/cd_curl.c:1185
+#: src/cd_curl.c:1267
 msgid "No Audio CD"
 msgstr "Keine Audio-CD"
 
-#: src/dvd.c:863
+#: src/dvd.c:877
 msgid ""
-"(Click Droit = Menu) / PEAK-ALBUM: Amplification maximale du volume pour un "
-"groupe de fichiers en respectant les ecarts de niveau entre chacun d'eux."
+"(Right click = Menu) / Maximum volume amplification of a group of files "
+"keeping the level difference between each of them."
 msgstr ""
-"(Rechtsklick = Menü) / PEAK-ALBUM: Verstärkung der maximalen Lautstärke für "
-"eine Gruppe von Dateien, wobei die Unterschiede zwischen den einzelnen "
-"berücksichtigt werden."
+"(Right click = Menu) / Maximalvolumen Amplifikation einer Gruppe von "
+"Dateien halten die Pegeldifferenz zwischen jedem von ihnen."
 
-#: src/dvd.c:866
-msgid ""
-"(Click Droit = Menu) / PEAK: Amplification maximale du volume pour chaque de "
-"fichier."
-msgstr "(Rechtsklick = Menü) / PEAK: Maximale Lautstärke für jede Datei."
+#: src/dvd.c:882 src/file.c:2882
+msgid "PEAK: Maximum volume amplification of each file."
+msgstr "PEAK: Maximale Lautstärke Verstärkung der einzelnen Dateien."
 
-#: src/dvd.c:904 src/dvd.c:924
-msgid "En attente de selection. Un click activera la conversion vers 2 canaux."
+#: src/dvd.c:887
+msgid "(Right click = Menu) / ReplayGain: Waiting for selection."
+msgstr "(Rechtsklick = Menü) / ReplayGain: Warten auf Auswahl."
+
+#: src/dvd.c:920 src/dvd.c:940
+msgid ""
+"Waiting for selection. A click will activate the conversion to 2 channels."
 msgstr ""
 "Warte auf Ihre Auswahl. Ein Klick aktiviert die Konvertierung in 2 Kanäle."
 
-#: src/dvd.c:916
-msgid "Conversion vers 2 canaux."
+#: src/dvd.c:932
+msgid "Conversion to 2 channels."
 msgstr "Konvertierung in 2 Kanälen"
 
-#: src/dvd.c:928
+#: src/dvd.c:944
 #, c-format
-msgid "Conversion vers %s canaux."
+msgid "Conversion to %s channels."
 msgstr "Konvertierung in %s Kanäle"
 
-#: src/dvd.c:933
+#: src/dvd.c:949
 #, c-format
 msgid ""
-"Conversion vers 2 canaux. Un second click activera la conversion vers %s "
-"canaux."
+"Conversion to 2 channels. A second click will activate the conversion to %s "
+"channels."
 msgstr ""
 "Konvertierung in 2 Kanäle. Ein zweiter Klick aktiviert die Konvertierung in "
 "%s Kanäle."
 
-#: src/dvd.c:948
-msgid "Musique en ecoute."
-msgstr "Musik hören."
+#: src/dvd.c:964
+msgid "Playing music."
+msgstr "Musikwiedergabe."
 
-#: src/dvd.c:951
-msgid "Musique en attente."
-msgstr "Warte auf die Datei."
+#: src/dvd.c:967
+msgid "Music paused."
+msgstr "Musik angehalten."
 
-#: src/dvd.c:966
+#: src/dvd.c:982
 #, c-format
 msgid "Total selection%s: %d, 2ch: %d"
 msgstr "Komplette Auswahl %s: %d, 2ch: %d"
 
-#: src/dvd.c:967
+#: src/dvd.c:983
 msgid "s"
 msgstr "s"
 
-#: src/dvd.c:973
-msgid "Ce fichier ne peut etre extrait !"
-msgstr "Diese Datei kann nicht gerippt werden!"
+#: src/dvd.c:989
+msgid "This file can not be ripped !"
+msgstr " Diese Datei kann nicht gerissen werden! "
 
-#: src/dvd.c:1091
-msgid "Titres"
+#: src/dvd.c:1107
+msgid "Titles"
 msgstr "Titel"
 
-#: src/dvd.c:1115 src/file.c:3375 src/file_mp3ogg.c:1272 src/file_tags.c:1193
-#: src/translate.c:337
-msgid "Temps"
+#: src/dvd.c:1119 glade/xcfa_win_treeview.glade:112
+#: glade/xcfa_win_treeview.glade:356 glade/xcfa_win_treeview.glade:740
+msgid "Play"
+msgstr "Play"
+
+#: src/dvd.c:1131 src/file.c:3386 src/file_mp3ogg.c:949 src/file_tags.c:1237
+#: glade/xcfa_win_treeview.glade:543 glade/xcfa_win_treeview.glade:944
+#: glade/xcfa_win_treeview.glade:1491 glade/xcfa_win_treeview.glade:1689
+msgid "Time"
 msgstr "Dauer"
 
-#: src/dvd.c:1127 src/translate.c:338
+#: src/dvd.c:1143 glade/xcfa_win_treeview.glade:146
 msgid "Format"
 msgstr "Format"
 
-#: src/dvd.c:1139 src/translate.c:339
-msgid "Choix"
+#: src/dvd.c:1155
+msgid "Choice"
 msgstr "Auswahl"
 
-#: src/dvd.c:1253
-msgid "Fichier structure DVD"
+#: src/dvd.c:1267
+msgid "DVD file structure"
 msgstr "Dateienstruktur der DVD"
 
-#: src/dvd.c:1303
-msgid "Le DVD est absent du lecteur."
-msgstr "Der DVD-Player ist nicht vorhanden."
-
-#: src/dvd.c:1338
-msgid "Scan ..."
-msgstr "Scan ..."
+#: src/dvd.c:1320
+msgid "The DVD player is absent."
+msgstr "Sox und Mplayer abwesend"
 
-#: src/dvd.c:1387
-msgid "lsdvd est absent !"
+#: src/dvd.c:1410
+msgid "lsdvd is missing !"
 msgstr "lsdvd fehlt !"
 
-#: src/dvd.c:1388
-msgid "Il faut installer le programme: lsdvd"
+#: src/dvd.c:1411
+msgid "You must install the program: lsdvd"
 msgstr "Sie müssen das Programm installieren: lsdvd"
 
 #: src/dvd_extract.c:412 src/dvd_extract.c:414
-msgid "XCFA: Extraction DVD"
-msgstr "XCFA: Rippen der DVD"
+msgid "XCFA: DVD rip"
+msgstr "XCFA: DVD rip"
 
-#: src/dvd_read.c:267
+#: src/dvd_read.c:226
 #, c-format
-msgid "Titre [%02d ** ]"
+msgid "Title [%02d ** ]"
 msgstr "Titel [%02d ** ]"
 
-#: src/dvd_read.c:270
+#: src/dvd_read.c:227
 #, c-format
-msgid "Titre [%02d]"
+msgid "Title [%02d]"
 msgstr "Titel [%02d]"
 
-#: src/dvd_read.c:313
-#, c-format
-msgid "Fichier_complet_%02d_%s"
-msgstr "Datei_komplett_%02d_%s"
-
-#: src/dvd_read.c:357
+#: src/dvd_read.c:252
 #, c-format
-msgid "Chapitre: [%02d]"
+msgid "Chapter: [%02d]"
 msgstr "Abschnitt: [%02d]"
 
-#: src/dvd_read.c:402
-#, c-format
-msgid "Titre_%02d_Chapitre_%02d_audio_%02d_%s"
-msgstr "Titel_%02d_Abschnitt_%02d_Audio_%02d_%s"
-
-#: src/file_action.c:190 src/file_action.c:192
-msgid "XCFA: Traitement fichiers"
-msgstr "XCFA: Verarbeitung von Dateien"
+#: src/file_action.c:183 src/file_action.c:185
+msgid "XCFA: Processing files"
+msgstr "XCFA: Verarbeitungsdateien"
 
-#: src/file_analyze.c:624
+#: src/file_analyze.c:731
 msgid "Package checkmp3 (mp3check) NOT FOUND !"
 msgstr "Paket checkmp3 (mp3check) nicht gefunden !"
 
-#: src/file_analyze.c:625
+#: src/file_analyze.c:732
 msgid ""
-"Veuillez installer checkmp3 ou mp3check pour\n"
-"la prise en compte des fichiers mp3"
+"Please install or checkmp3 mp3check for\n"
+"consideration of mp3 files"
 msgstr ""
 "Bitte installieren oder checkmp3 mp3check\n"
 "zur Prüfung von mp3-Dateien"
 
 # c-format
-#: src/file.c:332
+#: src/file.c:327
 #, c-format
-msgid "Total fichiers: %d, Selections: %d"
+msgid "Total files: %d, Selections: %d"
 msgstr "Gesamte Dateien: %d, Auswahl: %d"
 
-#: src/file.c:445
-msgid "CAPACITE DOSSIER TEMPORAIRE TROP FAIBLE"
-msgstr "Kapazität im temporärem Verzeichnis zu gering"
+#: src/file.c:441
+msgid "TEMPORARY CAPACITY TOO LOW"
+msgstr "TEMPORARY Leistung zu gering"
 
-#: src/file.c:446
-msgid "Pas assez de place dans le dossier temporaire"
-msgstr "Nicht genügend Platz im temporären Verzeichnis"
+#: src/file.c:442 src/file.c:2875
+msgid "WARNING: Not enough space available in the temp folder."
+msgstr "WARNUNG: Nicht genug Speicher im temporären Ordner."
 
-#: src/file.c:452
-msgid "Veuillez deselectionner des PeakGroup."
+#: src/file.c:448
+msgid "Please deselect PeakGroup."
 msgstr "Bitte deaktivieren Sie die PeakGroup."
 
-#: src/file.c:1439
-msgid "Conversion(s) vers la source"
+#: src/file.c:1431
+msgid "Conversion(s) to source"
 msgstr "Konvertierung(en) von der Ausgangsdatei"
 
-#: src/file.c:1440
-msgid "Choix d'une nouvelle destination"
-msgstr "Neue Auswahl des Verzeichnisses"
+#: src/file.c:1432
+msgid "Select a new destination"
+msgstr "Wählen Sie ein neues Ziel"
 
-#: src/file.c:1510
+#: src/file.c:1501
 msgid "Select type: --"
 msgstr "Typ auswählen: --"
 
-#: src/file.c:1595
+#: src/file.c:1584
 msgid "Peak/album"
 msgstr "Peak/Album"
 
-#: src/file.c:1596
+#: src/file.c:1585
 msgid "Peak"
 msgstr "Peak"
 
-#: src/file.c:1597
+#: src/file.c:1586
 msgid "Mix (scan)Rms/album"
 msgstr "Mix (scan)Rms/Album"
 
-#: src/file.c:1598
+#: src/file.c:1587
 msgid "Fix (scan)Rms"
 msgstr "Fix (scan)Rms"
 
-#: src/file.c:2854
+#: src/file.c:2834
+msgid "The external ripping program is missing"
+msgstr "Die externe Ripping-Programm fehlt"
+
+#: src/file.c:2840
+msgid "(Right click = Menu) / Waiting for Selection. File exists."
+msgstr "(Rechtsklick = Menü) / Auswahl. Datei existiert."
+
+#: src/file.c:2843
+msgid "(Right click = Menu) / Selected files"
+msgstr "(Rechtsklick = Menü) / Auswahl"
+
+#: src/file.c:2861
 #, c-format
-msgid "MAX FICHIERS ATTEINT = %d"
+msgid "MAX FILES REACHED = %d"
 msgstr "FILES ERREICHT MAX =% d"
 
-#: src/file.c:2864
-msgid "Normalise: En attente de selection."
+#: src/file.c:2871
+msgid "Normalise: Waiting for selection."
 msgstr "Normalisierte: Warten auf Auswahl."
 
-#: src/file.c:2868
-msgid "ATTENTION: Pas assez de place dans le dossier temporaire."
-msgstr "ACHTUNG: Nicht genug Speicher im temporären Ordner."
-
-#: src/file.c:2871
+#: src/file.c:2878
 msgid ""
-"PEAK-ALBUM: Amplification maximale du volume pour un groupe de fichiers en "
-"respectant les ecarts de niveau entre chacun d'eux."
+"PEAK-ALBUM: Maximum volume amplification for a group of files according to "
+"the deviations in level between them"
 msgstr ""
-"PEAK-ALBUM: Verstärkung der maximalen Lautstärke für eine Gruppe von "
-"Dateien, wobei die Unterschiede zwischen den einzelnen berücksichtigt werden."
-
-#: src/file.c:2875
-msgid "PEAK: Amplification maximale du volume pour chaque de fichier."
-msgstr "PEAK: Maximale Lautstärke für jede Datei."
+"PEAK-ALBUM: Maximale Lautstärke Verstärkung für eine Gruppe von Dateien nach "
+"den Abweichungen in der Höhe zwischen ihnen"
 
-#: src/file.c:2878
+#: src/file.c:2885
 msgid ""
-"RMS-ALBUM: Ajustement du volume moyen pour un groupe de fichiers en "
-"respectant les ecarts de niveau moyen entre chacun d'eux."
+"RMS-ALBUM: Adjusting the average volume for a group of files according to "
+"the average level of deviation between them."
 msgstr ""
-"RMS-ALBUM: Einstellen der Lautstärke für eine Gruppe von Dateien, wobei die "
-"Abweichungen von der mittleren Lautstärke bei jeder von ihnen respektiert "
-"wird"
+"RMS-ALBUM: Einstellen des durchschnittlichen Volumens für eine Gruppe von "
+"Dateien nach dem Durchschnittsniveau der Abweichung zwischen ihnen."
 
-#: src/file.c:2881
-msgid "RMS: Ajustement du volume moyen de chaque de fichier."
-msgstr "RMS: Einstellen der mittleren Lautstärke jeder einzelnen Datei"
+#: src/file.c:2888
+msgid "RMS: Average volume amplification of each file."
+msgstr "RMS: Normal Volumenverstärkung der einzelnen Dateien."
 
-#: src/file.c:2895
-msgid "(Click Droit = Menu) / ReplayGain: En attente de selection."
+#: src/file.c:2902
+msgid "(Right Click = Menu) / ReplayGain: Waiting for selection."
 msgstr "(Rechtsklick = Menü) / ReplayGain: Warten auf Auswahl."
 
-#: src/file.c:2898
-msgid "(Click Droit = Menu) / Mode piste."
+#: src/file.c:2905
+msgid "(Right Click = Menu) / Track mode."
 msgstr "(Rechtsklick = Menü) / Trackmodus"
 
-#: src/file.c:2901
-msgid "(Click Droit = Menu) / Mode album."
+#: src/file.c:2908
+msgid "(Right Click = Menu) / Album mode."
 msgstr "(Rechtsklick = Menü) / Albummodus"
 
-#: src/file.c:2904
-msgid "(Click Droit = Menu) / Mode effacer."
-msgstr "(Rechtsklick = Menü) / Löschmodus"
+#: src/file.c:2911
+msgid "(Right Click = Menu) / Erase mode."
+msgstr "(Rechtsklick = Menü) / Auswahl"
 
-#: src/file.c:3016
+#: src/file.c:3026
 msgid ""
-"(Click Droit = Menu) / Cliquez ici pour envoyer ce fichier apres traitement "
-"a la corbeille"
-msgstr ""
-"(Rechtsklick = Menü) / Klicken Sie hier, um diese Datei in den Papierkorb "
-"senden nach der Behandlung"
+"(Click Droit = Menu) / Click here to send the processed file to the trash"
+msgstr "(Rechtsklick = Menü) / Auswahl der Kodierung und der Bitrate"
 
-#: src/file.c:3019
+#: src/file.c:3029
 msgid ""
-"(Click Droit = Menu) / Ce fichier sera dirige apres traitement vers la "
-"corbeille"
+"(Right Click = Menu) / This file will be sent to the trash after processing"
 msgstr ""
-"(Rechtsklick = Menü) / Diese Datei wird in den Papierkorb nach der "
-"Behandlung gerichtet werden"
+"(Right Click = Menu) / Diese Datei wird in den Papierkorb nach der "
+"Verarbeitung gesendet werden"
 
-#: src/file.c:3152 src/file_trash.c:367 src/translate.c:367
+#: src/file.c:3163 src/file_trash.c:208 glade/xcfa_win_treeview.glade:757
 msgid "Trash"
 msgstr "Papierkorb"
 
-#: src/file.c:3172 src/file_mp3ogg.c:1212 src/file_tags.c:1178
-#: src/translate.c:368 src/translate.c:399 src/translate.c:410
+#: src/file.c:3183 src/file_mp3ogg.c:889 src/file_tags.c:1222
+#: glade/xcfa_win_treeview.glade:774 glade/xcfa_win_treeview.glade:1423
+#: glade/xcfa_win_treeview.glade:1672
 msgid "Type"
 msgstr "Typ"
 
-#: src/file.c:3411
-msgid "ReplayGain"
-msgstr "Lautstärkepegel"
-
-#: src/file_mp3ogg.c:771
-msgid "128 -defaut"
-msgstr "128 (Standard)"
-
-#: src/file_mp3ogg.c:787
-msgid "V0 -meilleure qualite"
-msgstr "V0 (Beste Qualität)"
-
-#: src/file_mp3ogg.c:791 src/file_mp3ogg.c:811
-msgid "V4 -defaut"
-msgstr "V4 (Standard)"
-
-#: src/file_mp3ogg.c:796
-msgid "V9 -moins bonne qualite"
-msgstr "V9 (Schlechte Qualität)"
-
-#: src/file_mp3ogg.c:849
-msgid "Defaut"
-msgstr "Standard"
-
-#: src/file_mp3ogg.c:884
-msgid "Qualite -1 -Moins bonne qualite"
-msgstr "Klangqualität -1 (Weniger gute Qualität)"
-
-#: src/file_mp3ogg.c:885 src/options_oggenc.c:149
-msgid "Qualite 0"
-msgstr "Klangqualität 0"
-
-#: src/file_mp3ogg.c:886 src/options_oggenc.c:150
-msgid "Qualite 1"
-msgstr "Klangqualität 1"
-
-#: src/file_mp3ogg.c:887 src/options_oggenc.c:151
-msgid "Qualite 2"
-msgstr "Klangqualität 2"
-
-#: src/file_mp3ogg.c:888
-msgid "Qualite 3 -Defaut"
-msgstr "Klangqualität 3 (Standard)"
-
-#: src/file_mp3ogg.c:889 src/options_oggenc.c:153
-msgid "Qualite 4"
-msgstr "Klangqualität 4"
-
-#: src/file_mp3ogg.c:890 src/options_oggenc.c:154
-msgid "Qualite 5"
-msgstr "Klangqualität 5"
-
-#: src/file_mp3ogg.c:891 src/options_oggenc.c:155
-msgid "Qualite 6"
-msgstr "Klangqualität 6"
-
-#: src/file_mp3ogg.c:892 src/options_oggenc.c:156
-msgid "Qualite 7"
-msgstr "Klangqualität 7"
-
-#: src/file_mp3ogg.c:893 src/options_oggenc.c:157
-msgid "Qualite 8"
-msgstr "Klangqualität 8"
-
-#: src/file_mp3ogg.c:894 src/options_oggenc.c:158
-msgid "Qualite 9"
-msgstr "Klangqualität 9"
+#: src/file_conv.c:1187
+msgid "Error since MPLAYER !"
+msgstr "Fehler da MPlayer !"
 
-#: src/file_mp3ogg.c:895
-msgid "Qualite 10 -Meilleure qualite"
-msgstr "Klangqualität 10 (Beste Qualität)"
+#: src/file_conv.c:1188 src/file_conv.c:1200 src/file_mp3ogg_conv.c:337
+#: src/file_mp3ogg_conv.c:349
+msgid "You can enable XCFA command line with: "
+msgstr "Sie können XCFA Kommandozeile aktivieren: "
 
-#: src/file_mp3ogg.c:926 src/options_oggenc.c:189 src/options_wavpack.c:186
-#: src/options_wavpack.c:209 src/options_wavpack.c:232
-msgid "Oui"
-msgstr "Ja"
+#: src/file_conv.c:1190 src/file_conv.c:1202 src/file_mp3ogg_conv.c:339
+#: src/file_mp3ogg_conv.c:351
+msgid "$ xcfa -verbose"
+msgstr "$ xcfa -verbose"
 
-#: src/file_mp3ogg.c:927 src/options_oggenc.c:190 src/options_wavpack.c:153
-#: src/options_wavpack.c:185 src/options_wavpack.c:208
-#: src/options_wavpack.c:231 src/options_wavpack.c:252
-msgid "Non"
-msgstr "Nein"
+#: src/file_conv.c:1192 src/file_mp3ogg_conv.c:341
+msgid "to see the type of error returned by mplayer."
+msgstr "auf die Art des Fehlers durch mplayer kehrte zu sehen."
 
-#: src/file_mp3ogg.c:949 src/options_oggenc.c:211
-msgid "Mono force"
-msgstr "Mono erzwingen"
+#: src/file_conv.c:1199
+msgid "Error since SOX !"
+msgstr "Fehler seit SOX !"
 
-#: src/file_mp3ogg.c:950 src/options_oggenc.c:212
-msgid "Stereo"
-msgstr "Stereo"
+#: src/file_conv.c:1204 src/file_mp3ogg_conv.c:353
+msgid "to see the type of error returned by sox."
+msgstr "auf die Art des Fehlers siehe kehrte von sox"
 
-#: src/file_mp3ogg.c:1228 src/translate.c:400
-msgid "Bitrate"
-msgstr "Bitrate"
+#: src/file_mp3ogg.c:670
+msgid "Right click: access popup"
+msgstr "Rechte Maustaste: Popup-Zugang"
 
-#: src/file_mp3ogg.c:1244
-msgid "Nouveau bitrate"
+#: src/file_mp3ogg.c:921
+msgid "New bitrate"
 msgstr "Neue Bitrate"
 
-#: src/file_mp3ogg.c:1258
-msgid "Taille"
+#: src/file_mp3ogg.c:935 glade/xcfa_win_treeview.glade:1474
+msgid "Size"
 msgstr "Dauer"
 
-#: src/file_mp3ogg_conv.c:300 src/file_mp3ogg_conv.c:302
-msgid "XCFA: Modification bitrate"
-msgstr "XCFA: Modifizierung der Bitrate"
+#: src/file_mp3ogg_conv.c:329 src/file_mp3ogg_conv.c:331
+msgid "XCFA: Bitrate change"
+msgstr "XCFA: Verarbeitung von Dateien"
+
+#: src/file_mp3ogg_conv.c:336
+msgid "Error from MPLAYER !"
+msgstr "Fehler da MPlayer !"
 
-#: src/file_mp3ogg_conv.c:379
+#: src/file_mp3ogg_conv.c:348
+msgid "Error from SOX !"
+msgstr "Fehler seit SOX !"
+
+#: src/file_mp3ogg_conv.c:432
 #, c-format
-msgid " ATTENTION: Il faut installer %s%s%s"
+msgid " WARNING : you need to install %s%s%s"
 msgstr " ACHTUNG: Bitte installieren Sie %s%s%s"
 
-#: src/file_mp3ogg_conv.c:387
+#: src/file_mp3ogg_conv.c:440
 #, c-format
-msgid " ATTENTION: Il faut installer %s%s"
+msgid " WARNING : you need to install %s%s"
 msgstr " ACHTUNG: Bitte installieren Sie %s%s"
 
-#: src/file_mp3ogg_conv.c:394
+#: src/file_mp3ogg_conv.c:447
 #, c-format
-msgid " ATTENTION: Il faut installer %s"
+msgid " WARNING : you need to install %s"
 msgstr " ACHTUNG: Bitte installieren Sie %s"
 
-#: src/file_mp3ogg_conv.c:400
+#: src/file_mp3ogg_conv.c:454
 msgid "Package NOT FOUND !"
 msgstr "Package NOT FOUND !"
 
-#: src/fileselect.c:116
-msgid "Choix d'un dossier de destination"
+#: src/fileselect.c:105
+msgid "Choosing a destination folder"
 msgstr "Die Wahl eines Zielordner"
 
-#: src/fileselect.c:117
-msgid "Choix d'un fichier CUE WAV FLAC OGG MP3 APE WMA"
+#: src/fileselect.c:106
+msgid "Choosing a file CUE WAV FLAC OGG MP3 APE WMA"
 msgstr "Import der Dateien CUE WAV FLAC OGG MP3 APE WMA"
 
-#: src/fileselect.c:118
-msgid "Choix d'un fichier musical"
+#: src/fileselect.c:107
+msgid "Choosing a file musical"
 msgstr "Auswahl einer Musikdatei"
 
-#: src/fileselect.c:119
-msgid "Choix d'un fichier"
-msgstr "Durch Auswahl einer Datei"
-
-#: src/fileselect.c:120
-msgid "Choix de fichiers"
-msgstr "Import der Dateien"
+#: src/fileselect.c:108 src/fileselect.c:109
+msgid "Choosing a file"
+msgstr "Auswählen eines Datei"
 
-#: src/fileselect.c:121
-msgid "Choix de fichiers WAV"
-msgstr "Import der Dateien WAV"
+#: src/fileselect.c:110
+msgid "Choosing a WAV file"
+msgstr "Die Auswahl einer WAV-Datei"
 
-#: src/fileselect.c:122
-msgid "Choix de fichiers MP3/OGG"
-msgstr "Import der Dateien MP3/OGG"
+#: src/fileselect.c:111
+msgid "Choosing a MP3 OGG file"
+msgstr "Die Wahl eines MP3 OGG-Datei"
 
-#: src/fileselect.c:123
-msgid "Choix de fichiers FLAC MPC OGG MP3"
+#: src/fileselect.c:112
+msgid "Choosing a FLAC MPC OGG MP3 file"
 msgstr "Import der Dateien FLAC MPC OGG MP3"
 
-#: src/fileselect.c:124
-msgid "Importer des images pour la pochette"
-msgstr "Bilddateien für das Cover importieren"
+#: src/fileselect.c:113
+msgid "Import pictures for the cover"
+msgstr "Importieren von Bildern für die Abdeckung"
+
+#: src/fileselect.c:114
+msgid "Choosing an Image Storage path"
+msgstr "Auswählen eines Bildspeicherpfad"
+
+#: src/fileselect.c:115
+msgid "Choosing a place for backup"
+msgstr "Wahl eines Aufstellungsorts für die Sicherung"
 
-#: src/fileselect.c:125
-msgid "Choix d'un chemin de stockage des images"
-msgstr "Die Wahl eines Speicherpfad der Bilder"
+#: src/fileselect.c:396 src/fileselect.c:415 src/fileselect.c:703
+msgid "Cancel"
+msgstr "stornieren"
 
-#: src/fileselect.c:126
-msgid "Choix d'un lieu de sauvegarde"
-msgstr "Die Wahl eines Lagerort"
+#: src/fileselect.c:398 src/fileselect.c:417 src/fileselect.c:705
+msgid "Open"
+msgstr "geöffnet"
 
-#: src/fileselect.c:475 src/fileselect.c:591 src/fileselect.c:599
-#: src/fileselect.c:622
+#: src/fileselect.c:494 src/fileselect.c:617 src/fileselect.c:627
+#: src/fileselect.c:650
 msgid "All Files (*.*)"
 msgstr "Alle Dateien (*.*)"
 
-#: src/file_trash.c:368
+#: src/file_trash.c:211
 msgid "Trash files ..."
 msgstr "Trash files ..."
 
-#: src/file_wav.c:629
-msgid "(Click Droit = Menu) / Choix de la frequence"
+#: src/file_wav.c:485
+msgid "(Right Click = Menu) / Select frequency"
 msgstr "(Rechtsklick = Menü) / Frequenzauswahl"
 
-#: src/file_wav.c:632
-msgid "(Click Droit = Menu) / Choix du nombre de pistes (voies)"
-msgstr "(Rechtsklick = Menü) / Auswahl der Tracks (Wege)"
+#: src/file_wav.c:488
+msgid "(Right Click = Menu) / Select number of tracks (channels)"
+msgstr "(Right Click = Menu) / Anzahl der Titel Select (Kanäle)"
 
-#: src/file_wav.c:635
-msgid "(Click Droit = Menu) / Choix du codage en nombre de bits"
-msgstr "(Rechtsklick = Menü) / Auswahl der Kodierung und der Bitrate"
+#: src/file_wav.c:491
+msgid "(Right Click = Menu) / Encoding selection in number of bits"
+msgstr "(Rechtsklick = Menü) / Auswahl. Datei existiert."
 
-#: src/file_wav.c:861
-msgid "Frequence"
+#: src/file_wav.c:739
+msgid "Frequency"
 msgstr "Frequenz"
 
-#: src/file_wav.c:877
-msgid "FREQUENCE"
+#: src/file_wav.c:755
+msgid "FREQUENCY"
 msgstr "FREQUENZ"
 
-#: src/file_wav.c:891
-msgid "Piste"
-msgstr "Spuren"
+#: src/file_wav.c:769
+msgid "Track"
+msgstr "Spur"
 
-#: src/file_wav.c:907
-msgid "PISTE"
-msgstr "SPUREN"
+#: src/file_wav.c:785
+msgid "TRACK"
+msgstr "TRACK"
 
-#: src/file_wav.c:921
+#: src/file_wav.c:799
 msgid "Quantification"
 msgstr "Quantisierung"
 
-#: src/file_wav.c:937
+#: src/file_wav.c:815
 msgid "QUANTIFICATION"
 msgstr "QUANTISIERUNG"
 
-#: src/file_wav_conv.c:265
+#: src/file_wav_conv.c:261
 #, c-format
-msgid "%s Copie fichier: %d%%"
+msgid "%s Copy file: %d%%"
 msgstr "%s Kopiere Datei: %d%%"
 
-#: src/file_wav_conv.c:275
+#: src/file_wav_conv.c:271
 #, c-format
-msgid "%s Restitution fichier: %d%%"
+msgid "%s Return file: %d%%"
 msgstr "%s Rückgabe-Datei: %d%%"
 
-#: src/file_wav_conv.c:285
+#: src/file_wav_conv.c:281
 #, c-format
-msgid "%s Traitement Sox: %d%%"
+msgid "%s Use Sox: %d%%"
 msgstr "%s Sox-Verabeitung: %d%%"
 
-#: src/file_wav_conv.c:302
+#: src/file_wav_conv.c:298
 #, c-format
-msgid "%s Traitement Mplayer: %d%%"
+msgid "%s Use Mplayer: %d%%"
 msgstr "%s Mplayer-Verarbeitung: %d%%"
 
-#: src/file_wav_conv.c:349 src/file_wav_conv.c:351
+#: src/file_wav_conv.c:343 src/file_wav_conv.c:345
 msgid "XCFA: Conversions WAV TO WAV"
 msgstr "XCFA: Konvertieren von WAV zu WAV"
 
-#: src/main.c:372
-msgid "= Adressage memoire invalide\n"
-msgstr "= Ungültiger Adressraum\n"
-
-#: src/main.c:375
-msgid "= Vous avez probablement trouve un bug dans XCFA\n"
-msgstr "= Sie haben möglicherweise einen Bug in XCFA gefunden\n"
-
-#: src/main.c:676
-msgid "MODE ADMINISTRATEUR"
+#: src/main.c:644
+msgid "ADMINISTRATOR MODE"
 msgstr "Administrator-Modus"
 
-#: src/main.c:678
-msgid " Vous ne devriez pas utiliser "
-msgstr " Sie sollten nicht "
+#: src/main.c:646
+msgid " You should not use "
+msgstr " Sie sollten nicht "
 
-#: src/main.c:680
-msgid " XCFA sous ROOT !"
+#: src/main.c:648
+msgid " XCFA under ROOT !"
 msgstr " XCFA als Root ! "
 
-#: src/options.c:175
-msgid "ERREUR: Lieu de stockage non autorise !"
-msgstr "FEHLER: Speicherort ist nicht zulässig !"
+#: src/options.c:169
+msgid "ERROR : storage location not permitted !"
+msgstr "ERROR: Speicherort nicht zulässig!"
 
-#: src/options.c:176
-msgid "Veuillez recommencer."
-msgstr "Bitte versuchen Sie es erneut."
+#: src/options.c:170
+msgid "Please start again."
+msgstr "Bitte starten Sie erneut."
 
-#: src/options_cd.c:120
-msgid "Pour evaluer les templates, vous devez activer une lecture de cdaudio"
-msgstr "Zur Beurteilung der Vorlagen, müssen Sie eine Lesung cdaudio"
+#: src/options_cd.c:122
+msgid "To assess the templates, you must enable a reading cdaudio"
+msgstr "Um die Vorlagen zu bewerten, müssen Sie eine Lese cdaudio aktivieren"
 
-#: src/options_faac.c:101
+#: src/options_faac.c:94
 msgid "Transport Stream (ADTS) - Extension .aac"
 msgstr "Transport-Stream (ADTS) - *.aac"
 
-#: src/options_faac.c:102
+#: src/options_faac.c:95
 msgid "MPEG-4 File Format (MP4) - Extension .m4a"
 msgstr "MPEG-4 Dateienformat (MP4) - *.m4a"
 
-#: src/options_flac.c:72
-msgid "0 (Rapide)"
+#: src/options_flac.c:65
+msgid "0 (Fast)"
 msgstr "0 (Schnell)"
 
-#: src/options_flac.c:80
-msgid "8 (Lent)"
+#: src/options_flac.c:73
+msgid "8 (Low)"
 msgstr "8 (Langsam)"
 
-#: src/options_mp3.c:298
-msgid "V0 (meilleure qualite)"
+#: src/options_mp3.c:276
+msgid "V0 (Best quality)"
 msgstr "V0 (Beste Qualität)"
 
-#: src/options_mp3.c:307
-msgid "V9 (moins bonne qualite)"
+#: src/options_mp3.c:285
+msgid "V9 (Poor quality)"
 msgstr "V9 (Weniger gute Qualität)"
 
-#: src/options_musepack.c:75
+#: src/options_musepack.c:68
 msgid "telephone: lowest quality : 32 .. 48 kbit/s"
 msgstr "32...48 kbit/s - Telefon: Geringste Klangqualität"
 
-#: src/options_musepack.c:76
+#: src/options_musepack.c:69
 msgid "thumb : low quality/internet : 58 .. 86 kbit/s"
 msgstr "58...86 kbit/s - Thumb: Geringe Klangqualität (Internet)"
 
-#: src/options_musepack.c:77
+#: src/options_musepack.c:70
 msgid "radio : medium (MP3) quality : 112 .. 152 kbit/s"
 msgstr "112...152 kbit/s - Radio: Mittlere Klangqualität (MP3)"
 
-#: src/options_musepack.c:78
+#: src/options_musepack.c:71
 msgid "standard : high quality (dflt) : 142 .. 184 kbit/s"
 msgstr "142...184 kbit/s - Standard: Hohe Klangqualität (dflt)"
 
-#: src/options_musepack.c:79
+#: src/options_musepack.c:72
 msgid "xtreme : extreme high quality : 168 .. 212 kbit/s"
 msgstr "168...212 kbit/s - Xtreme: Extrem hohe Klangqualität"
 
-#: src/options_musepack.c:80
+#: src/options_musepack.c:73
 msgid "insane : extreme high quality : 232 .. 268 kbit/s"
 msgstr "232...268 kbit/s - Insane: Extrem hohe Klangqualität"
 
-#: src/options_musepack.c:81
+#: src/options_musepack.c:74
 msgid "braindead : extreme high quality : 232 .. 278 kbit/s"
 msgstr "232...278 kbit/s - Brainded: Extrem hohe Klangqualität"
 
-#: src/options_oggenc.c:148
-msgid "Qualite -1 (Moins bonne qualite)"
+#: src/options_oggenc.c:137
+msgid "Quality -1 (Poor quality)"
 msgstr "Klangqualität -1 (Weniger gute Qualität)"
 
-#: src/options_oggenc.c:152
-msgid "Qualite 3"
+#: src/options_oggenc.c:138 src/popup.c:1294
+msgid "Quality 0"
+msgstr "Klangqualität 0"
+
+#: src/options_oggenc.c:139 src/popup.c:1294
+msgid "Quality 1"
+msgstr "Klangqualität 1"
+
+#: src/options_oggenc.c:140 src/popup.c:1294
+msgid "Quality 2"
+msgstr "Klangqualität 2"
+
+#: src/options_oggenc.c:141
+msgid "Quality 3"
 msgstr "Klangqualität 3"
 
-#: src/options_oggenc.c:159
-msgid "Qualite 10 (Meilleure qualite)"
+#: src/options_oggenc.c:142 src/popup.c:1295
+msgid "Quality 4"
+msgstr "Klangqualität 4"
+
+#: src/options_oggenc.c:143 src/popup.c:1295
+msgid "Quality 5"
+msgstr "Klangqualität 5"
+
+#: src/options_oggenc.c:144 src/popup.c:1295
+msgid "Quality 6"
+msgstr "Klangqualität 6"
+
+#: src/options_oggenc.c:145 src/popup.c:1295
+msgid "Quality 7"
+msgstr "Klangqualität 7"
+
+#: src/options_oggenc.c:146 src/popup.c:1296
+msgid "Quality 8"
+msgstr "Klangqualität 8"
+
+#: src/options_oggenc.c:147 src/popup.c:1296
+msgid "Quality 9"
+msgstr "Klangqualität 9"
+
+#: src/options_oggenc.c:148
+msgid "Quality 10 (Best quality)"
 msgstr "Klangqualität 10 (Beste Qualität)"
 
-#: src/options_wavpack.c:105
-msgid "Mode normal"
-msgstr "Normal-Modus"
+#: src/options_oggenc.c:176 src/options_wavpack.c:173
+#: src/options_wavpack.c:194 src/options_wavpack.c:215 src/popup.c:1298
+msgid "Yes"
+msgstr "ja"
+
+#: src/options_oggenc.c:177 src/options_wavpack.c:142
+#: src/options_wavpack.c:172 src/options_wavpack.c:193
+#: src/options_wavpack.c:214 src/options_wavpack.c:233 src/popup.c:1298
+msgid "No"
+msgstr "No"
+
+#: src/options_oggenc.c:196
+msgid "Force mono"
+msgstr "Force mono"
+
+#: src/options_oggenc.c:197
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/options_wavpack.c:98
+msgid "Standard"
+msgstr "Standard"
 
-#: src/options_wavpack.c:106
-msgid "Mode rapide de compression"
-msgstr "Schnelle Komprimierung"
+#: src/options_wavpack.c:99
+msgid "Fast (Faster encode and decode)"
+msgstr "Fast (Faster Codieren und Decodieren)"
 
-#: src/options_wavpack.c:107
-msgid "Bonne qualite de compression"
+#: src/options_wavpack.c:100
+msgid "High quality (Better compression ratio)"
 msgstr "Gute Komprimierung"
 
-#: src/options_wavpack.c:108
-msgid "Meilleure qualite de compression"
-msgstr "Beste Komprimierung"
+#: src/options_wavpack.c:101
+msgid "Very high quality (Best compression but slowest)"
+msgstr "Sehr hohe Qualität (beste Kompression, aber am langsamsten)"
 
-#: src/options_wavpack.c:134
+#: src/options_wavpack.c:125
 msgid "stereo left/right"
 msgstr "Stereo (Links/Rechts)"
 
-#: src/options_wavpack.c:135
+#: src/options_wavpack.c:126
 msgid "stereo mid/side"
 msgstr "Stereo (Mitte/Seiten)"
 
-#: src/options_wavpack.c:253
+#: src/options_wavpack.c:234
 msgid "1 (fast / rapide)"
 msgstr "1 (Schnell)"
 
-#: src/options_wavpack.c:258
+#: src/options_wavpack.c:239
 msgid "6 (very slow / tres lent)"
 msgstr "6 (Sehr langsam)"
 
-#: src/play_file.c:112
-msgid "PAS de lecteur audio present"
-msgstr "Es ist kein Internet-Browser installiert"
+#: src/play_file.c:107
+msgid "NO audio player present"
+msgstr "NO vorhanden Audio-Player"
 
-#: src/play_file.c:113
-msgid "Veuillez installez un lecteur audio."
-msgstr "Bitte deaktivieren Sie die PeakGroup."
+#: src/play_file.c:108
+msgid "Please install an audio player."
+msgstr "Bitte installieren Sie das Paket [ cdparanoia ]"
 
-#: src/poche_dir.c:436
+#: src/poche_dir.c:433
 msgid ""
 "Utilisez le glisser / deplacer - Effacer une image avec Ctrl + "
 "Click"
@@ -920,664 +857,639 @@
 "Drag / Drop - löschen Sie ein Bild mit Strg +Click"
 
 #: src/poche_save.c:117
-msgid "Nom de fichier absent !!"
-msgstr "File Name fehlt !!"
+msgid "File name not found !!"
+msgstr "Dateiname nicht gefunden !!"
 
-#: src/poche_save.c:118 src/poche_web.c:361 src/poche_web.c:382
-msgid "Pour resoudre ce probleme:"
+#: src/poche_save.c:118 src/poche_web.c:323 src/poche_web.c:345
+msgid "To solve this problem :"
 msgstr "Um dieses Problem zu lösen:"
 
 #: src/poche_save.c:121
-msgid "Saisissez un nom de fichier sans extention"
+msgid "Enter a file name without extension"
 msgstr "Geben Sie einen Dateinamen ohne Erweiterung"
 
-#: src/poche_save.c:132
-msgid "Sauvegarde aux formats PDF et PostScript"
-msgstr "Speichern als PDF und PostScript"
-
-#: src/poche_save.c:157
-msgid "Sauvegarde au format PNG"
-msgstr "Speichern als PNG"
+#: src/poche_save.c:131
+msgid "Saving to PDF"
+msgstr "Speichern in PDF"
 
-#: src/poche_web.c:360
-msgid "Aucun fichier trouve !"
+#: src/poche_web.c:322
+msgid "No file found !"
 msgstr "Keine Datei gefunden!"
 
-#: src/poche_web.c:364
-msgid "Modifiez la chaine de recherche et"
-msgstr "Ändern Sie bitte die Suchbegriff und"
+#: src/poche_web.c:326 src/poche_web.c:348
+msgid "Modify the search parameters and"
+msgstr "Ändern Sie die Suchparameter und"
 
-#: src/poche_web.c:366 src/poche_web.c:387
-msgid "recommencez."
-msgstr "versuchen Sie es erneut."
+#: src/poche_web.c:328 src/poche_web.c:350
+msgid "start again."
+msgstr "wieder anfangen."
 
-#: src/poche_web.c:381
-msgid "Critere de recherche absent !!"
-msgstr "Suchkriterien fehlt"
+#: src/poche_web.c:344
+msgid "Search criteria away !!"
+msgstr "Suchkriterien weg !!"
 
-#: src/poche_web.c:385
-msgid "Saisissez une chaine de recherche et"
-msgstr "Geben Sie einen Suchbegriff ein und"
+#: src/poche_web.c:362
+msgid "[Search images files]"
+msgstr "[Bilder-Dateien anzeigen]"
 
-#: src/poche_web.c:394
-msgid "[Recherche des fichiers images]"
-msgstr "[Suche nach Bild-Dateien]"
-
-#: src/popup.c:87 src/popup.c:106
+#: src/popup.c:81 src/popup.c:100
 msgid " Deselection globale"
 msgstr " Alles abwählen"
 
-#: src/popup.c:88 src/popup.c:107 src/popup.c:168
+#: src/popup.c:82 src/popup.c:101 src/popup.c:162
 msgid " Deselection verticale"
 msgstr " Senkrecht alles abwählen"
 
-#: src/popup.c:89 src/popup.c:108
+#: src/popup.c:83 src/popup.c:102
 msgid " Deselection horizontale"
 msgstr " Waagerecht alles abwählen"
 
-#: src/popup.c:90 src/popup.c:93 src/popup.c:109 src/popup.c:112
-#: src/popup.c:126 src/popup.c:139 src/popup.c:153
+#: src/popup.c:84 src/popup.c:87 src/popup.c:103 src/popup.c:106
+#: src/popup.c:120 src/popup.c:133 src/popup.c:147
 msgid " ---"
 msgstr " ---"
 
-#: src/popup.c:91 src/popup.c:110
+#: src/popup.c:85 src/popup.c:104
 msgid " Selection verticale"
 msgstr " Senkrecht alles auswählen"
 
-#: src/popup.c:92 src/popup.c:111
+#: src/popup.c:86 src/popup.c:105
 msgid " Selection Expert verticale"
 msgstr " Senkrechte Auswahl (Vorschlag)"
 
-#: src/popup.c:94 src/popup.c:113
+#: src/popup.c:88 src/popup.c:107
 msgid " Selection horizontale"
 msgstr " Waagerecht alles auswählen"
 
-#: src/popup.c:95 src/popup.c:114
+#: src/popup.c:89 src/popup.c:108
 msgid " Selection Expert horizontale "
 msgstr " Waagerechte Auswahl (Vorschlag)"
 
-#: src/popup.c:125 src/popup.c:138
+#: src/popup.c:119 src/popup.c:132
 msgid " Deselection verticale "
 msgstr " Senkrecht alles abwählen "
 
-#: src/popup.c:127 src/popup.c:140
+#: src/popup.c:121 src/popup.c:134
 msgid " Selection verticale "
 msgstr " Senkrecht alles auswählen "
 
-#: src/popup.c:151
+#: src/popup.c:145
 msgid "---SELECTION VERTICALE-----"
 msgstr "--- Senkrechte Auswahl -----"
 
-#: src/popup.c:152
+#: src/popup.c:146
 msgid " Deselection verticale "
 msgstr " Senkrecht alles abwählen"
 
-#: src/popup.c:154
+#: src/popup.c:148
 msgid " Selection PISTE "
 msgstr " Track-Auswahl"
 
-#: src/popup.c:155
+#: src/popup.c:149
 msgid " Selection ALBUM "
 msgstr " ALBUM-Auswahl "
 
-#: src/popup.c:156
+#: src/popup.c:150
 msgid " Selection NETTOYER "
 msgstr " Auswahl löschen"
 
-#: src/popup.c:167
+#: src/popup.c:161
 msgid "---MENU TRASH--------------"
 msgstr "--- Papierkorbmenü -------------"
 
-#: src/popup.c:169
+#: src/popup.c:163
 msgid " Selection verticale "
 msgstr " Senkrecht alles auswählen "
 
-#: src/popup.c:544 src/popup.c:752 src/popup.c:968
-msgid "Cellule"
-msgstr "Zelle"
-
-#: src/popup.c:551 src/popup.c:577
-msgid "1 piste"
-msgstr "1 Tonspur"
-
-#: src/popup.c:554 src/popup.c:580
-msgid "2 pistes"
-msgstr "2 Tonspuren"
-
-#: src/popup.c:557 src/popup.c:583
-msgid "4 pistes"
-msgstr "4 Tanspuren"
-
-#: src/popup.c:560 src/popup.c:586
-msgid "6 pistes"
-msgstr "6 Tonspuren"
-
-#: src/popup.c:566 src/popup.c:592 src/popup.c:786 src/popup.c:824
-#: src/popup.c:993 src/popup.c:1023
-msgid "Valeur d'origine"
-msgstr "Ursprünglicher Wert"
-
-#: src/popup.c:570 src/popup.c:790 src/popup.c:997
-msgid "Colonne"
-msgstr "Spalte"
-
-#: src/popup.c:759 src/popup.c:797
-msgid " 8000 Hertz"
-msgstr " 8000 Hertz"
-
-#: src/popup.c:762 src/popup.c:800
-msgid "22000 Hertz"
-msgstr "22000 Hertz"
-
-#: src/popup.c:765 src/popup.c:803
-msgid "32000 Hertz"
-msgstr "32000 Hertz"
-
-#: src/popup.c:768 src/popup.c:806
-msgid "44056 Hertz"
-msgstr "44056 Hertz"
-
-#: src/popup.c:771 src/popup.c:809
-msgid "44100 Hertz"
-msgstr "44100 Hertz"
-
-#: src/popup.c:774 src/popup.c:812
-msgid "48000 Hertz"
-msgstr "48000 Hertz"
-
-#: src/popup.c:777 src/popup.c:815
-msgid "88200 Hertz"
-msgstr "88200 Hertz"
-
-#: src/popup.c:780 src/popup.c:818
-msgid "96000 Hertz"
-msgstr "96000 Hertz"
-
-#: src/popup.c:975 src/popup.c:1004
-msgid " 8 bits"
-msgstr " 8 bits"
+#: src/popup.c:504 src/popup.c:619 src/popup.c:715
+msgid "Original value"
+msgstr "ursprünglichen Wert"
 
-#: src/popup.c:978 src/popup.c:1008
-msgid "16 bits"
-msgstr "16 bits"
-
-#: src/popup.c:981 src/popup.c:1011
-msgid "24 bits"
-msgstr "24 bits"
-
-#: src/popup.c:984 src/popup.c:1014
-msgid "32 bits"
-msgstr "32 bits"
-
-#: src/popup.c:987 src/popup.c:1017
-msgid "64 bits"
-msgstr "64 bits"
-
-#: src/popup.c:1089
-msgid "Selecteur suivant"
-msgstr "Nach Auswahl"
+#: src/popup.c:765
+msgid "Next selector"
+msgstr "Index Lesung"
 
-#: src/popup.c:1093
-msgid "Selecteur precedant"
-msgstr "Selector vor"
+#: src/popup.c:769
+msgid "Previous selector"
+msgstr "Vorherige Wahl"
 
-#: src/popup.c:1101
-msgid "Supprimer la plage active"
+#: src/popup.c:777
+msgid "Delete the active range"
 msgstr "Löschen Sie den aktiven Bereich"
 
-#: src/popup.c:1173
-msgid "Retourner horizontalement"
-msgstr "Horizontal spiegeln"
+#: src/popup.c:850
+msgid "Flip Horizontal"
+msgstr " Waagerecht alles auswählen"
 
-#: src/popup.c:1177
-msgid "Retourner verticalement"
+#: src/popup.c:854
+msgid "Flip Vertical"
 msgstr "Vertikal spiegeln"
 
-#: src/popup.c:1185
-msgid "Image au premier plan"
-msgstr "Bild im Vordergrund"
+#: src/popup.c:862
+msgid "Foreground image"
+msgstr "Vordergrundbild"
 
-#: src/popup.c:1189
-msgid "Image au dessus"
+#: src/popup.c:866
+msgid "Image above"
 msgstr "Bild oben"
 
-#: src/popup.c:1193
-msgid "Image en dessous"
+#: src/popup.c:870
+msgid "Image below"
 msgstr "Bild unten"
 
-#: src/popup.c:1197
-msgid "Image au dernier plan"
+#: src/popup.c:874
+msgid "Image to the background"
 msgstr "Bild in den Hintergrund"
 
-#: src/popup.c:1205
-msgid "Effacer l'image"
+#: src/popup.c:882
+msgid "Clear image"
 msgstr "Klares Bild"
 
-#: src/popup.c:1242
-msgid "Supprimer l'image de la liste"
-msgstr "Bild entfernen aus der Liste"
+#: src/popup.c:920
+msgid "Remove image from the list"
+msgstr "Bild aus der Liste entfernen"
 
-#: src/popup_systray.c:127
-msgid " Cacher Xcfa "
-msgstr " Verstecken Xcfa "
+#: src/popup.c:1111
+msgid "V0 [ best quality ]"
+msgstr "V0 (Beste Qualität)"
 
-#: src/popup_systray.c:130
-msgid " Montrer Xcfa "
-msgstr " Show Xcfa "
+#: src/popup.c:1111 src/popup.c:1114
+msgid "V4 [ default ]"
+msgstr "V4 [ Standard ]"
 
-#: src/popup_systray.c:150
-msgid " Quitter Xcfa "
-msgstr " Beenden Xcfa "
+#: src/popup.c:1111
+msgid "V9 [ Lower quality ]"
+msgstr "V9 [ Schlechte Qualität ]"
 
-#: src/popup_systray.c:201
-msgid ""
-"XCFA\n"
-"Programme pour convertir les fichiers audio."
-msgstr ""
-"XCFA\n"
-"Programm zur Konvertierung von Audio-Dateien."
+#: src/popup.c:1294
+msgid "Quality -1 [ Lower quality ]"
+msgstr "Klangqualität -1 (Weniger gute Qualität)"
+
+#: src/popup.c:1295
+msgid "Quality 3 [ Defaut ]"
+msgstr "Klangqualität 3 [ Standard ]"
+
+#: src/popup.c:1296
+msgid "Quality 10 [ Best Quality ]"
+msgstr "Klangqualität 10 (Beste Qualität)"
 
-#: src/prg_init.c:90
+#: src/prg_init.c:85
 msgid " Decode ATSC A/52 audio streams"
 msgstr " Decode ATSC A/52 audio streams"
 
-#: src/prg_init.c:101
+#: src/prg_init.c:96
 msgid " AAC+ encoder"
 msgstr " AAC+ Encoder"
 
-#: src/prg_init.c:112 src/prg_init.c:178
+#: src/prg_init.c:107 src/prg_init.c:173
 msgid " Extracteur cd audio"
 msgstr " Rippen von Audio-CDs"
 
-#: src/prg_init.c:123
+#: src/prg_init.c:118
 msgid " Read CD and get CDDB discid information"
 msgstr "Lesen Sie CD und erhalten CDDB discid Informationen"
 
-#: src/prg_init.c:134
+#: src/prg_init.c:129
 msgid " Cherche des renseignements sur les formats mp3"
 msgstr " Sucht und Identifiziert mp3-Dateien, die nicht dem MP3-Format folgen"
 
-#: src/prg_init.c:145
+#: src/prg_init.c:140
 msgid " Audio Codeur freeware"
 msgstr " Freeware Audio-Encoder"
 
-#: src/prg_init.c:156
+#: src/prg_init.c:151
 msgid " MPEG-4 AAC decodeur"
 msgstr " MPEG-4 AAC Decoder"
 
-#: src/prg_init.c:167
+#: src/prg_init.c:162
 msgid " Conversion wav : flac"
 msgstr " Konvertierung wav -> flac"
 
-#: src/prg_init.c:189
+#: src/prg_init.c:184
 msgid " Conversion wav : mp3"
 msgstr " Konvertierung wav > mp3"
 
-#: src/prg_init.c:200
+#: src/prg_init.c:195
 msgid " Cherche les informations d'un dvd"
 msgstr " Sucht die Informationen auf einer DVD"
 
-#: src/prg_init.c:212
+#: src/prg_init.c:207
 msgid " Monkey's Audio Console Front End : APE"
 msgstr " Monkey's Audio Console Front End : APE"
 
-#: src/prg_init.c:224 src/prg_init.c:235
+#: src/prg_init.c:219 src/prg_init.c:230
 msgid " MusePack commandline utilities"
 msgstr " MusePack commandline utilities"
 
-#: src/prg_init.c:246
+#: src/prg_init.c:241
 msgid " Lecteur et extracteur"
 msgstr " Media-Player mit großer Format- und Plattform-Kompatibilität"
 
-#: src/prg_init.c:257
+#: src/prg_init.c:252
 msgid " Normaliseur de fichier mp3"
 msgstr " Normalisieren von mp3-Dateien"
 
-#: src/prg_init.c:268
+#: src/prg_init.c:263
 msgid " Normaliseur de fichier wav"
 msgstr " Normalisieren von wav-Dateien"
 
-#: src/prg_init.c:279
+#: src/prg_init.c:274
 msgid " A program to send desktop notifications"
 msgstr " Ein Programm für Desktopbenachrichtigungen"
 
-#: src/prg_init.c:290
+#: src/prg_init.c:285
 msgid " Forte compression au format wave"
 msgstr " Hohe Komprimierung im wav-Format"
 
-#: src/prg_init.c:301
+#: src/prg_init.c:296
 msgid " Decoupage de fichiers sans decodage"
 msgstr " Splitten einer Datei mittels Dekodierungsinformationen"
 
-#: src/prg_init.c:312
+#: src/prg_init.c:307
 msgid " Transformation universelle de fichiers son"
 msgstr ""
 " Universelles Programm zum Konvertieren von Audiodateien in andere Formate"
 
-#: src/prg_init.c:323
+#: src/prg_init.c:318
 msgid " Conversion wav : ogg"
 msgstr " Konvertierung wav > ogg"
 
-#: src/prg_init.c:334
+#: src/prg_init.c:329
 msgid " Normaliseur de fichier ogg"
 msgstr " Normalisieren von ogg-Dateien"
 
-#: src/prg_init.c:345
+#: src/prg_init.c:340
 msgid " WAVPACK Hybrid Lossless Audio Compressor"
 msgstr ""
 " Ein freier quelloffener Codec zur verlustfreien/-behafteten "
 "Audiodatenkompression."
 
-#: src/prg_init.c:362
-msgid " ... les paquets: deb "
+#: src/prg_init.c:357
+msgid " ... Packets: deb "
 msgstr " ...folgende Pakete: deb "
 
-#: src/prg_init.c:368
-msgid " ... les paquets: tgz "
+#: src/prg_init.c:363
+msgid " ... Packets: tgz "
 msgstr " ...folgende Pakete: tgz "
 
-#: src/prg_init.c:374
-msgid " ... les paquets: fpm "
+#: src/prg_init.c:369
+msgid " ... Packets: fpm "
 msgstr " ...folgende Pakete: fpm "
 
-#: src/prg_init.c:380
-msgid " ... les paquets: rpm "
+#: src/prg_init.c:375
+msgid " ... Packets: rpm "
 msgstr " ...folgende Pakete: rpm "
 
-#: src/prg_init.c:386
-msgid " ... les paquets: pkg.tar.xz "
+#: src/prg_init.c:381
+msgid " ... Packets: pkg.tar.xz "
 msgstr " ...folgende Pakete: pkg.tar.xz "
 
-#: src/prg_init.c:392
-msgid " ... les paquets: ? "
+#: src/prg_init.c:387
+msgid " ... Packets: ? "
 msgstr " ... Pakete: ? "
 
-#: src/prg_init.c:628
+#: src/prg_init.c:623
 msgid "Status"
 msgstr "Status"
 
-#: src/prg_init.c:642
-msgid "Paquet"
-msgstr "Pakete"
+#: src/prg_init.c:637
+msgid "Packets"
+msgstr "Packets"
 
-#: src/prg_init.c:657
+#: src/prg_init.c:652
 msgid "Action"
 msgstr "Beschreibung"
 
-#: src/scan.c:260
-msgid "PACKAGE dvd+rw-tools ABSENT"
+#: src/scan.c:259
+msgid "PACKAGE dvd+rw-tools is missing"
 msgstr "Paket dvd + rw-tools ABSENT"
 
-#: src/scan.c:261
-msgid "Le package 'dvd+rw-tools' est absent"
-msgstr "Das Paket »imagemagick« fehlt"
+#: src/scan.c:260
+msgid "The package 'imagemagick' is missing"
+msgstr "Das Paket 'imagemagick' fehlt"
 
-#: src/scan.c:263
-msgid "de votre systeme !"
+#: src/scan.c:262
+msgid "on your system !"
 msgstr "auf Ihrem System !"
 
-#: src/scan.c:265
-msgid "Veuillez l'installer car j'ai besoin de"
-msgstr "Bitte installieren Sie es und versuchen es erneut."
+#: src/scan.c:264 src/split.c:438
+msgid "Please install it and resume"
+msgstr "Bitte installieren Sie ihn und setzen"
 
-#: src/scan.c:267
-msgid "'dvd+rw-mediainfo' pour identifier le(s)"
+#: src/scan.c:266
+msgid "'Dvd + rw-mediainfo' to identify the"
 msgstr "DVD + RW-mediainfo 'zu identifizieren"
 
-#: src/scan.c:269
-msgid "lecteur(s) de cd / dvd."
+#: src/scan.c:268
+msgid "reader of cd / dvd."
 msgstr "CD / DVD."
 
-#: src/split.c:284
+#: src/split.c:297
 msgid ""
-"Menu: Click droit / Ajout plage: Click bouton centre / Zoom: Ctrl+Scroll"
+"Menu: right click / Adding track: Click the center button / Zoom: Ctrl"
+"+Scroll"
 msgstr ""
 "Menü: Rechter Mausklick / Hinzufügen Titel: Klicken Sie auf die mittlere / "
 "Zoom: Ctrl+ScrollTaste"
 
-#: src/split.c:287
-msgid "Ajout plage: Click bouton centre / Zoom: Ctrl+Scroll"
+#: src/split.c:300
+msgid "Adding track: Click the center button / Zoom: Ctrl+Scroll"
 msgstr ""
 "Hinzufügen Titel: Klicken Sie auf die mittlere Taste / Zoom: Ctrl+Scroll"
 
-#: src/split.c:291
-msgid ""
-"Pret pour l'import d'un fichier CUE, WAV, FLAC, OGG, MP3, APE, WMA"
+#: src/split.c:304
+msgid "Ready for imports and a CUE file, WAV, FLAC, OGG, MP3, APE, WMA"
 msgstr ""
 "Bereit für die Einfuhr und eine CUE Datei, WAV, FLAC, OGG, MP3, APE, WMA</"
 "i>"
 
-#: src/split.c:360 src/split.c:387
-msgid "Ce fichier appartient a XCFA"
+#: src/split.c:378 src/split.c:407
+msgid "This file belongs XCFA"
 msgstr "Diese Datei gehört XCFA"
 
-#: src/split.c:361 src/split.c:388
-msgid "Selectionnez un autre fichier."
+#: src/split.c:379 src/split.c:408
+msgid "Select another file."
 msgstr "Wählen Sie eine andere Datei."
 
-#: src/split.c:368
-msgid "Fichier vide"
-msgstr "Leere Datei"
+#: src/split.c:387
+msgid "Empty file"
+msgstr "leere Datei"
 
-#: src/split.c:369
-msgid "Le fichier ne contient aucune donnee !!!"
+#: src/split.c:388
+msgid "The file contains no data !!!"
 msgstr "Die Datei enthält keine Daten !!!"
 
-#: src/split.c:412
-msgid "Sox et Mplayer absents"
+#: src/split.c:433
+msgid "Sox and Mplayer not found"
 msgstr "Sox und Mplayer abwesend"
 
-#: src/split.c:413
-msgid "Sox et Mplayer sont absents de votre"
-msgstr "Sox und Mplayer sind aus Deinem"
+#: src/split.c:434
+msgid "Sox et Mplayer are not found"
+msgstr "Sox und Mplayer abwesend"
 
-#: src/split.c:415
-msgid "configuration."
+#: src/split.c:436
+msgid "in your configuration."
 msgstr "Konfiguration."
 
-#: src/split.c:417
-msgid "Veuillez les installer pour pouvoir continuer."
-msgstr "Bitte installieren Sie es und versuchen es erneut."
-
-#: src/split.c:467
-msgid "Erreur de choix de fichier"
-msgstr "Import der Dateien"
+#: src/split.c:492
+msgid "Error file select"
+msgstr "Lesefehler !"
 
-#: src/split.c:468
-msgid "Veuillez selectionner un fichier de type WAV FLAC MP3 OGG APE"
-msgstr "Bitte wählen Sie einen Dateityp MP3 WAV OGG FLAC APE"
+#: src/split.c:493
+msgid "Please select a file type of MP3 WAV OGG FLAC APE"
+msgstr "Bitte wählen Sie einen Dateityp von MP3 WAV OGG FLAC APE"
 
-#: src/split.c:504 src/split.c:577
-msgid "Mauvais type de fichier"
+#: src/split.c:531 src/split.c:603
+msgid "Wrong type of file"
 msgstr "Falscher Dateityp"
 
-#: src/split.c:505 src/split.c:578
+#: src/split.c:532 src/split.c:604
 msgid ""
-"Les types de fichiers acceptes\n"
-"sont: WAV FLAC MP3 OGG APE WMA CUE"
+"File types accepted\n"
+"sare: WAV FLAC MP3 OGG APE WMA CUE"
 msgstr ""
 "Dateitypen werden akzeptiert:\n"
 "WAV FLAC MP3 OGG APE WMA CUE"
 
-#: src/split_conv.c:312 src/split_conv.c:328
-msgid "Erreur SOX"
-msgstr "Fehler SOX"
+#: src/split_conv.c:316 src/split_conv.c:333
+msgid "SOX Error"
+msgstr "SOX Fehler"
 
-#: src/split_conv.c:313 src/split_conv.c:329
-msgid "Le programme SOX de votre distribution"
+#: src/split_conv.c:317 src/split_conv.c:334
+msgid "The SOX program on your distribution"
 msgstr "Die SOX-Programm auf Ihrem Vertrieb"
 
-#: src/split_conv.c:315 src/split_conv.c:331
-msgid "a generer une erreur pendant la conversion."
+#: src/split_conv.c:319 src/split_conv.c:336
+msgid "has generated an error during conversion."
 msgstr "einen Fehler generiert hat während der Konvertierung."
 
-#: src/split_cue.c:121
-msgid "Erreur de lecture !"
-msgstr "Lesefehler !"
+#: src/split_cue.c:116
+msgid "Misreading !"
+msgstr "Verlesen!"
 
-#: src/split_cue.c:181 src/split_cue.c:190 src/split_cue.c:199
-msgid "Erreur"
+#: src/split_cue.c:177 src/split_cue.c:187 src/split_cue.c:196
+msgid "Error"
 msgstr "Fehler"
 
-#: src/split_cue.c:182
-msgid "Aucun fichier de musique associe au cue-file !"
-msgstr "Keine Musik mit dem Queue-Datei zugeordnet Datei !"
+#: src/split_cue.c:178
+msgid "No music file associated with the cue-file"
+msgstr "Kein Musikdatei mit dem Queue-Datei verknüpft"
 
-#: src/split_cue.c:191
-msgid "Pas de fichier WAV dans le cue-file !"
-msgstr "Keine WAV-Datei in der Cue-Datei !"
+#: src/split_cue.c:188
+msgid "No WAV file in the cue-file"
+msgstr "Nein WAV-Datei in der Cue-Datei"
 
-#: src/split_cue.c:200
-msgid "Aucun fichier de musique associe dans le dossier"
-msgstr "Keine Musik-Datei in dem Ordner zugeordnet"
+#: src/split_cue.c:197
+msgid "No music file in the folder associated"
+msgstr "Keine Datei in dem Ordner verbunden"
 
-#: src/split_cue.c:202
-msgid "du cue-file"
+#: src/split_cue.c:199
+msgid "of cue-file"
 msgstr "die Cue-Datei"
 
-#: src/split_cue.c:288
-msgid "Erreur de donnees dans le fichier CUE"
+#: src/split_cue.c:293
+msgid "Data errors in the CUE file"
 msgstr "Datenfehler in der CUE-Datei"
 
-#: src/split_cue.c:289
-msgid "La solution est d'importer le fichier de"
+#: src/split_cue.c:294
+msgid "The solution is to import the file"
 msgstr "Die Lösung ist, die Datei zu importieren"
 
-#: src/split_cue.c:291
-msgid "musique qui sera reconnu et pre-decoupe"
-msgstr "Musik, die erkannt und Vorzerkleinerung"
+#: src/split_cue.c:296
+msgid "music that will be recognized and pre-cutting"
+msgstr "Musik, die erkannt werden und Vorzerkleinerung"
 
-#: src/split_cue.c:293
-msgid "dans le module Split."
-msgstr "Split im Modul."
+#: src/split_cue.c:298
+msgid "in the split module."
+msgstr "im Split-Modul."
 
-#: src/split_cue.c:295
-msgid "Il ne restera qu'a ajuster les plages pour"
-msgstr "Wir werden nur bis zu den Stränden einstellen"
+#: src/split_cue.c:300
+msgid "We will just adjust to the beaches"
+msgstr "Wir werden nur zu den Stränden einstellen"
 
-#: src/split_cue.c:297
-msgid "generer un nouveau cue-file ou des decoupes"
+#: src/split_cue.c:302
+msgid "generate a new cue-file or cuts"
 msgstr "Wir werden nur bis zu den Stränden einstellen..."
 
-#: src/split_cue.c:299
-msgid "correspondant aux plages."
+#: src/split_cue.c:304
+msgid "corresponding to the beaches."
 msgstr "der Gleise."
 
-#: src/split_selector.c:141
-msgid "Suppression pendant la lecture impossible"
-msgstr "Löschen während der Wiedergabe nicht"
+#: src/split_selector.c:136
+msgid "Deleting not during playback"
+msgstr "Während der Wiedergabe Löschen nicht"
 
-#: src/split_selector.c:234 src/split_selector.c:240 src/split_selector.c:294
-#: src/split_selector.c:300 src/split_selector.c:357 src/split_selector.c:364
-#: src/split_selector.c:434 src/split_selector.c:440
-msgid "Temps inferieur a 5 secondes entre marqueur et curseur !"
+#: src/split_selector.c:231 src/split_selector.c:237 src/split_selector.c:291
+#: src/split_selector.c:297 src/split_selector.c:354 src/split_selector.c:361
+#: src/split_selector.c:431 src/split_selector.c:437
+msgid "Time of less than 5 seconds between marker and cursor !"
 msgstr "Zeit von weniger als 5 Sekunden zwischen Marker und Cursor !"
 
-#: src/translate.c:55
-msgid "Fichier"
+#: src/web.c:173 src/web.c:221
+msgid "No web browser"
+msgstr "Kein Web-Browser"
+
+#: src/web.c:174 src/web.c:222
+msgid "No Web access: no web browser"
+msgstr "Kein Web-Zugriff: kein Web-Browser"
+
+#: src/web.c:176 src/web.c:224
+msgid "found in your system."
+msgstr "Gefunden in Ihrem System."
+
+#: src/web.c:178 src/web.c:226
+msgid "Please install a web browser."
+msgstr "Bitte installieren Sie das Paket [ icedax ]"
+
+#: src/web.c:188
+msgid "You need to enable web access"
+msgstr "Sie müssen Web-Zugriff aktivieren"
+
+#: src/web.c:236
+msgid "Application is missing."
+msgstr "Die Anwendung ist nicht vorhanden."
+
+#: src/web.c:237
+msgid "Please install : "
+msgstr "Bitte installieren : "
+
+#: src/win_about.c:124
+msgid " Xcfa on the web"
+msgstr " xcfa im Web "
+
+#: src/win_about.c:174
+msgid ""
+"\n"
+"Au tout debut:\n"
+"\n"
+"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
+"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
+"... ;-)\n"
+"\n"
+""
+msgstr ""
+"\n"
+"Zuerst:\n"
+"\n"
+"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
+"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
+"... ;-)\n"
+"\n"
+""
+
+#: src/win_scan.c:170
+msgid "Waiting ..."
+msgstr "Warte ..."
+
+#: glade/xcfa.glade:66 glade/xcfa.glade:2533
+msgid "File"
 msgstr "Datei"
 
-#: src/translate.c:56
-msgid "Quitter"
+#: glade/xcfa.glade:75
+msgid "Quit"
 msgstr "Beenden"
 
-#: src/translate.c:57
-msgid "Outils"
-msgstr "Extras"
+#: glade/xcfa.glade:89
+msgid "Tools"
+msgstr "Tools"
 
-#: src/translate.c:58
-msgid "Visibilite des champs"
+#: glade/xcfa.glade:99
+msgid "Visibility fields"
 msgstr "Sichtbare Felder"
 
-#: src/translate.c:59
-msgid "Aide"
-msgstr "Hilfe"
+#: glade/xcfa.glade:112
+msgid "Help"
+msgstr "Help"
 
-#: src/translate.c:60
-msgid "A propos"
-msgstr "Über Xcfa"
+#: glade/xcfa.glade:121
+msgid "About"
+msgstr "About"
 
-#: src/translate.c:61 src/translate.c:71
-msgid "Lecture"
-msgstr "Einlesen"
+#: glade/xcfa.glade:224
+msgid "Read"
+msgstr "Read"
 
-#: src/translate.c:62
-msgid " Choix du peripherique / Lecture du DVD "
+#: glade/xcfa.glade:252
+msgid " Choosing the peripheral / DVD playback "
 msgstr " Laufwerksauswahl / Einlesen der DVD "
 
-#: src/translate.c:63 src/translate.c:73 src/translate.c:134
-msgid " Destination des fichiers "
-msgstr " Zielverzeichnis der Datei(en) "
+#: glade/xcfa.glade:303 glade/xcfa.glade:921
+msgid " File Destination "
+msgstr " Installation "
 
-#: src/translate.c:64 src/translate.c:74
+#: glade/xcfa.glade:359 glade/xcfa.glade:1009
 msgid " Eject "
 msgstr " Auswurf "
 
-#: src/translate.c:65 src/translate.c:96
-msgid " Normaliser "
+#: glade/xcfa.glade:434
+msgid " Normalize "
 msgstr " Normalisieren "
 
-#: src/translate.c:66
-msgid "Deplier"
-msgstr "Ausklappen"
+#: glade/xcfa.glade:494
+msgid "Unfold"
+msgstr "entfalten"
 
-#: src/translate.c:67
-msgid "Replier"
-msgstr "Einklappen"
+#: glade/xcfa.glade:548
+msgid "Fold"
+msgstr "falten"
 
-#: src/translate.c:68
+#: glade/xcfa.glade:649
 msgid " Vers 2CH: Sub / Ambiance "
 msgstr " In 2CH: Sub / Ambiente "
 
-#: src/translate.c:69 src/translate.c:102
-msgid "Extraire"
-msgstr "Rippen"
+#: glade/xcfa.glade:705
+msgid "Extraction"
+msgstr "XCFA: Rippen der CD"
 
-#: src/translate.c:70
+#: glade/xcfa.glade:756
 msgid " DVD "
 msgstr " DVD "
 
-#: src/translate.c:72
-msgid " Choix du peripherique / Lecture du CD "
+#: glade/xcfa.glade:842
+msgid "Lecture"
+msgstr "Einlesen"
+
+#: glade/xcfa.glade:870
+msgid " Choosing the peripheral / CD playback "
 msgstr " Laufwerksauswahl / Einlesen der CD "
 
-#: src/translate.c:75
-msgid "Titre:"
+#: glade/xcfa.glade:1065
+msgid "Title:"
 msgstr " Titel:"
 
-#: src/translate.c:76
+#: glade/xcfa.glade:1077
 msgid "Album:"
 msgstr " Album:"
 
-#: src/translate.c:77
-msgid "Artiste:"
+#: glade/xcfa.glade:1089
+msgid "Artist:"
 msgstr " Interpret:"
 
-#: src/translate.c:78
-msgid " Annee:"
-msgstr " Jahr:"
+#: glade/xcfa.glade:1101
+msgid "Comment:"
+msgstr " Kommentar:"
+
+#: glade/xcfa.glade:1113
+msgid " Year:"
+msgstr "Year:"
 
-#: src/translate.c:79
+#: glade/xcfa.glade:1125
 msgid " Genre:"
 msgstr "Genre:"
 
-#: src/translate.c:80
-msgid " Piste:"
+#: glade/xcfa.glade:1137
+msgid " Track:"
 msgstr " Track:"
 
-#: src/translate.c:81
+#: glade/xcfa.glade:1149
 msgid " *.m3u et xspf: "
 msgstr " *.m3u und xspf: "
 
-#: src/translate.c:82
-msgid "Commentaire:"
-msgstr " Kommentar:"
-
-#: src/translate.c:83
-msgid " Modification des tags Freedb "
-msgstr " Bearbeiten der Tags "
+#: glade/xcfa.glade:1287
+msgid "Editing tags Freedb"
+msgstr "Bearbeiten der Tags"
 
-#: src/translate.c:84
+#: glade/xcfa.glade:1302
 msgid ""
 "%a [ %a=\"Artist\" ]\n"
 "\n"
@@ -1603,7 +1515,7 @@
 "In den Feldern 'Titel', da [ Ändern FreeDB tag ]\n"
 "das Zeichen oder Zeichen zu erhalten muss vorangestellt werdenZeichen %"
 
-#: src/translate.c:85
+#: glade/xcfa.glade:1312
 msgid ""
 "%a - artiste %b - titre "
 "de l'album %c - numero de la piste\n"
@@ -1623,427 +1535,434 @@
 "%u - Ersetzen von Zeichen: %u(AB=C) %u( =_) %Tl - "
 "Tetsumaki lower"
 
-#: src/translate.c:86
-msgid " Arrangement des titres du CD "
+#: glade/xcfa.glade:1346
+msgid " Arrangement of CD titles"
 msgstr "Anzeige-/Speicher-Layout beim Rippen"
 
-#: src/translate.c:87
-msgid "Creation d'un fichier unique au format: "
+#: glade/xcfa.glade:1382
+msgid "Creation of a single file format: "
 msgstr "Erstellen der eindeutigen Datei im Format:"
 
-#: src/translate.c:88
-msgid " et dont le nom sera: "
-msgstr " mit dem Namen: "
+#: glade/xcfa.glade:1430
+msgid " and whose name will be: "
+msgstr " und dessen Name wird sein:"
 
-#: src/translate.c:89
-msgid "Ecriture du fichier cue"
-msgstr "Die Cue-Datei schreiben"
+#: glade/xcfa.glade:1461
+msgid "Writing the cue file"
+msgstr "Schreiben Sie die Cue-Datei"
 
-#: src/translate.c:90
-msgid " Au moins deux selections colonne Wav "
+#: glade/xcfa.glade:1484
+msgid " At least two selections column Wav "
 msgstr " Min. zwei Aktivierungen in der Spalte Wav "
 
-#: src/translate.c:91
+#: glade/xcfa.glade:1514
 msgid ""
-"Creation d'un fichier cue\n"
-"unique depuis une lecture\n"
-"du cd audio"
+"\n"
+"Creating a cue file from a single\n"
+"reading audio cd\n"
 msgstr ""
-"Erstellen einer eindeutigen\n"
-"CUE-Datei durch das Einlesen\n"
-"der Audio-CD."
+"\n"
+"Erstellen eines Cue-Datei aus einer \n"
+"Lesen audio cd \n"
 
-#: src/translate.c:92
-msgid "Creation fichier cue uniquement"
-msgstr "Erstellen der eindeutigen CUE-Datei "
+#: glade/xcfa.glade:1562
+msgid "File Creation cue only"
+msgstr "Nur Dateierstellung Cue"
 
-#: src/translate.c:93
+#: glade/xcfa.glade:1597
 msgid " Creation Cue cd "
 msgstr " Erstellen der CD-CUE-Date "
 
-#: src/translate.c:94
-msgid " Creation d'un fichier unique "
-msgstr " Schaffung einer einzigen Datei "
+#: glade/xcfa.glade:1625
+msgid "  Creation of a single file"
+msgstr "Schaffung einer einzigen DateiFaux ?"
 
-#: src/translate.c:95
-msgid "Gestion des tags, titres et fichiers cue"
+#: glade/xcfa.glade:1638
+msgid "Management of tags, titles and cue files"
 msgstr "Verwalten der Titel, Tags und CUE-Datei"
 
-#: src/translate.c:97
+#: glade/xcfa.glade:1688
+msgid " normalize "
+msgstr " Normalisieren "
+
+#: glade/xcfa.glade:1749
 msgid "definit le serveur a contacter pour les recherches titre"
 msgstr "Legt die Portnummer für den Titel Lookups verwendet werden"
 
-#: src/translate.c:98
+#: glade/xcfa.glade:1788
 msgid "Parametres par defaut"
 msgstr "Default-Parameter"
 
-#: src/translate.c:100
-msgid "Choix parmis les differentes bases de donnees pour le CD."
-msgstr "Wahl zwischen verschiedenen Datenbanken für die CD."
-
-#: src/translate.c:101
+#: glade/xcfa.glade:1887
 msgid "DiscId"
 msgstr "DiscId"
 
-#: src/translate.c:103
+#: glade/xcfa.glade:1946
+msgid "Extract"
+msgstr "XCFA: Rippen der CD"
+
+#: glade/xcfa.glade:2053
 msgid " CD "
 msgstr " CD "
 
-#: src/translate.c:104 src/translate.c:133
-msgid " Importer "
+#: glade/xcfa.glade:2135 glade/xcfa.glade:3271
+msgid " Import "
 msgstr " Import "
 
-#: src/translate.c:105
-msgid " Destination des conversions "
+#: glade/xcfa.glade:2190
+msgid " Destination conversions "
 msgstr " Zielverzeichnis für die Konvertierung "
 
-#: src/translate.c:106
-msgid " Nettoyer "
-msgstr " Löschen "
+#: glade/xcfa.glade:2266
+msgid " Clean up "
+msgstr " Erstellen der CD-CUE-Date "
 
-#: src/translate.c:107 src/translate.c:114
+#: glade/xcfa.glade:2389
 msgid "Appliquer les modifications"
 msgstr " Änderungen anwenden"
 
-#: src/translate.c:108
-msgid " Normalise: "
+#: glade/xcfa.glade:2444
+msgid " Normalize: "
 msgstr " Normalisiere: "
 
-#: src/translate.c:109
-msgid " Choix niveau dBFS: "
-msgstr " Neuauswahl dBFS: "
+#: glade/xcfa.glade:2477
+msgid " Level selection dBFS: "
+msgstr " Ebene Auswahl dBFS: "
 
-#: src/translate.c:110 src/translate.c:132
-msgid " Fichiers "
-msgstr " Dateien "
+#: glade/xcfa.glade:2615
+msgid "Apply changes"
+msgstr "Änderungen übernehmen"
 
-#: src/translate.c:111
-msgid "Quantification"
-msgstr "Quantisierung"
-
-#: src/translate.c:112
-msgid "Voie"
-msgstr "Voice"
-
-#: src/translate.c:113
-msgid " Frequence - Hertz "
-msgstr " Frequenz - Hertz "
-
-#: src/translate.c:115
+#: glade/xcfa.glade:2651
 msgid " Wav "
 msgstr "Wav"
 
-#: src/translate.c:116 src/translate.c:202
-msgid " Lame (fichier mp3): "
-msgstr " Lame (mp3-Datei): "
+#: glade/xcfa.glade:2735
+msgid "Apply"
+msgstr "Sich Bewerben"
 
-#: src/translate.c:117 src/translate.c:218
-msgid " Oggenc (fichier ogg): "
-msgstr " Oggenc (ogg-Datei): "
-
-#: src/translate.c:118 src/translate.c:130
-msgid "Appliquer"
-msgstr "Anwenden"
+#: glade/xcfa.glade:2789
+msgid "Delete"
+msgstr "löschen"
 
-#: src/translate.c:119
-msgid "Effacer"
-msgstr "Löschen"
-
-#: src/translate.c:120
+#: glade/xcfa.glade:2826
 msgid " Mp3-Ogg "
 msgstr " Mp3-Ogg "
 
-#: src/translate.c:121
-msgid "Titre:"
+#: glade/xcfa.glade:2875
+msgid "Title:"
 msgstr "Titel:"
 
-#: src/translate.c:122
+#: glade/xcfa.glade:2886
 msgid "Album:"
 msgstr "Album:"
 
-#: src/translate.c:123
-msgid "Artiste:"
+#: glade/xcfa.glade:2897
+msgid "Artist:"
 msgstr "Interpret:"
 
-#: src/translate.c:124
-msgid "Commentaire:"
+#: glade/xcfa.glade:2908
+msgid "Comment:"
 msgstr "Kommentar:"
 
-#: src/translate.c:125
-msgid " Annee:"
-msgstr " Jahr:"
+#: glade/xcfa.glade:2919
+msgid " Year:"
+msgstr " Jahr:"
 
-#: src/translate.c:126
+#: glade/xcfa.glade:2930
 msgid " Genre:"
 msgstr " Genre:"
 
-#: src/translate.c:127
-msgid " Piste:"
+#: glade/xcfa.glade:2941
+msgid " Track:"
 msgstr " Track:"
 
-#: src/translate.c:128
+#: glade/xcfa.glade:2952
 msgid " Modif.:"
 msgstr " Modif.:"
 
-#: src/translate.c:129
+#: glade/xcfa.glade:3078
 msgid "0"
 msgstr "0"
 
-#: src/translate.c:131 src/translate.c:315
+#: glade/xcfa.glade:3102
+msgid "Apply "
+msgstr "Anwenden"
+
+#: glade/xcfa.glade:3160 glade/xcfa.glade:10210
 msgid " Tags "
 msgstr " Tags"
 
-#: src/translate.c:135
+#: glade/xcfa.glade:3190
+msgid " Files "
+msgstr "Alle Dateien (*.*)"
+
+#: glade/xcfa.glade:3322
+msgid "   File Destination "
+msgstr " Zielverzeichnis der Datei(en) "
+
+#: glade/xcfa.glade:3494
 msgid "Lecture de 5 secondes apres le marqueur de debut"
 msgstr "Reading 5 Sekunden nach Beginn Marker"
 
-#: src/translate.c:136
+#: glade/xcfa.glade:3546
 msgid "Index de debut"
 msgstr "Index Start"
 
-#: src/translate.c:137 src/translate.c:144 src/translate.c:147
+#: glade/xcfa.glade:3547 glade/xcfa.glade:3813 glade/xcfa.glade:3874
 msgid "00h00m00s"
 msgstr "00h00m00s"
 
-#: src/translate.c:138
+#: glade/xcfa.glade:3600
 msgid "lecture"
 msgstr "Lesung"
 
-#: src/translate.c:139
+#: glade/xcfa.glade:3653
 msgid "Pause"
 msgstr "Pause"
 
-#: src/translate.c:140
+#: glade/xcfa.glade:3712
 msgid "Index de lecture"
 msgstr "Index Lesung"
 
-#: src/translate.c:141 src/translate.c:180
+#: glade/xcfa.glade:3713 glade/xcfa.glade:4767
 msgid "label"
 msgstr "label"
 
-#: src/translate.c:142
+#: glade/xcfa.glade:3760
 msgid "Lecture de 5 secondes avant le marqueur de fin"
 msgstr "Reading von 5 Sekunden vor dem Ende Marker"
 
-#: src/translate.c:143
+#: glade/xcfa.glade:3812
 msgid "Index de fin"
 msgstr "End-Index"
 
-#: src/translate.c:145
+#: glade/xcfa.glade:3860
 msgid "Plage"
 msgstr "Beach"
 
-#: src/translate.c:146
+#: glade/xcfa.glade:3873
 msgid "Duree de la plage active"
 msgstr "Länge der aktiven Strand"
 
-#: src/translate.c:148
+#: glade/xcfa.glade:3955
 msgid "Suprimer tous les marqueurs pour les remplacer par un marqueur unique"
 msgstr ""
 "Wischen Sie alle Markierungen und ersetzen Sie sie mit einem einzigen Marker"
 
-#: src/translate.c:149
+#: glade/xcfa.glade:4044
 msgid "Le fichier CUE sera enregistre vers 'Destination des fichiers'."
 msgstr "CUE Datei aufgezeichnet werden 'Ziel-Datei'."
 
-#: src/translate.c:150
-msgid "Production fichier Cue"
+#: glade/xcfa.glade:4073
+msgid "Production Cue file"
 msgstr "Produktion Cue-Datei"
 
-#: src/translate.c:151
+#: glade/xcfa.glade:4098
 msgid "Le resultat du Split sera dirige vers 'Destination des fichiers'."
 msgstr "Das Ergebnis der Split wird in Richtung 'Destination file '."
 
-#: src/translate.c:152
+#: glade/xcfa.glade:4127
 msgid "Split"
 msgstr "Splitten"
 
-#: src/translate.c:153
+#: glade/xcfa.glade:4188
 msgid " Split "
 msgstr " Splitten "
 
-#: src/translate.c:154
+#: glade/xcfa.glade:4253
 msgid "Importation du titre du CD."
 msgstr "Importieren Sie die CD-Titel."
 
-#: src/translate.c:155
-msgid "Titre CD"
+#: glade/xcfa.glade:4276
+msgid "Title CD"
 msgstr "Titel CD"
 
-#: src/translate.c:156
+#: glade/xcfa.glade:4296
 msgid "Choix d'une nouvelle police."
 msgstr "Die Wahl eines neuen Schriftart."
 
-#: src/translate.c:157
+#: glade/xcfa.glade:4318
 msgid "Texte gras."
 msgstr "Bold Text."
 
-#: src/translate.c:158
+#: glade/xcfa.glade:4340
 msgid "Texte italique."
 msgstr "Kursiv gedruckt."
 
-#: src/translate.c:159
-msgid ""
-"Apres une lecture de CD et un ajout d'etiquette, ce menu permet la mise en "
-"forme des titres, auteurs ..."
-msgstr ""
-"Nach dem Lesen einer CD und fügen Sie ein Label, ermöglicht dieses Menü die "
-"Formatierung der Titel, Autoren ..."
-
-#: src/translate.c:160
+#: glade/xcfa.glade:4375
 msgid "Ajouter du texte editable."
 msgstr "Fügen Sie Text editierbar."
 
-#: src/translate.c:161
-msgid "Texte"
+#: glade/xcfa.glade:4430
+msgid "Text"
 msgstr "Text"
 
-#: src/translate.c:162
+#: glade/xcfa.glade:4462
 msgid "Saisissez ici un critere de recherche d'images."
 msgstr "Geben Sie hier eine Suche nach Bildern."
 
-#: src/translate.c:163
+#: glade/xcfa.glade:4484
 msgid "Importation des images depuis le Web."
 msgstr "Importieren von Bildern aus dem Web."
 
-#: src/translate.c:164
-msgid "Import images web"
+#: glade/xcfa.glade:4509
+msgid "Import web images "
 msgstr "Import von Bildern auf Webseiten"
 
-#: src/translate.c:165
+#: glade/xcfa.glade:4578
 msgid "Supprimer l'image en selection"
 msgstr "Löschen Sie die Bildauswahl"
 
-#: src/translate.c:166
+#: glade/xcfa.glade:4600
 msgid "AJouter de nouvelles images."
 msgstr "Fügen Sie neue Bilder."
 
-#: src/translate.c:167
+#: glade/xcfa.glade:4606
 msgid "Ouvre un fichier"
 msgstr "Öffnen einer Datei"
 
-#: src/translate.c:168
+#: glade/xcfa.glade:4623
 msgid "Enregistrer la page au format png."
 msgstr "Seite speichern png."
 
-#: src/translate.c:169
+#: glade/xcfa.glade:4629
 msgid "Sauvegarde le fichier"
 msgstr "Speichern Sie die Datei"
 
-#: src/translate.c:170
+#: glade/xcfa.glade:4646
 msgid "Diminution de l'echelle."
 msgstr "Reduction in der Skala."
 
-#: src/translate.c:171
+#: glade/xcfa.glade:4652
 msgid "Reduit l'agrandissement"
 msgstr "Reduzierte Expansion"
 
-#: src/translate.c:172
+#: glade/xcfa.glade:4669
 msgid "Echelle a 100%."
 msgstr "Mensur 100%."
 
-#: src/translate.c:173
+#: glade/xcfa.glade:4675
 msgid "Remet l'echelle a 100%"
 msgstr "Gibt die Skala bei 100%"
 
-#: src/translate.c:174
+#: glade/xcfa.glade:4692
 msgid "Augmentation de l'echelle."
 msgstr "Erhöhung der Skala."
 
-#: src/translate.c:175
+#: glade/xcfa.glade:4698
 msgid "Augmente l'agrandissement"
 msgstr "Zunehmende Ausweitung"
 
-#: src/translate.c:176
+#: glade/xcfa.glade:4715
 msgid "Echelle compatible avec la taille de la fenetre."
 msgstr "Skala mit der Größe des Fensters."
 
-#: src/translate.c:177
+#: glade/xcfa.glade:4721
 msgid "Adapte l'echelle a la taille de la fenetre"
 msgstr "Passt die Waage, um die Größe des Fensters"
 
-#: src/translate.c:178
+#: glade/xcfa.glade:4738
 msgid "Emplacement de sauvegarde des fichiers."
 msgstr "Backup-Standort-Dateien."
 
-#: src/translate.c:179
+#: glade/xcfa.glade:4752
 msgid "Nom (sans extention) du fichier a sauvegarder."
 msgstr "Name (ohne Verlängerung) Datei gespeichert wird."
 
-#: src/translate.c:181
+#: glade/xcfa.glade:4815
 msgid " Pochette "
 msgstr " Cover "
 
-#: src/translate.c:182
+#: glade/xcfa.glade:4861
 msgid "Nice"
 msgstr "Nice"
 
-#: src/translate.c:183
-msgid " Priorite systeme "
+#: glade/xcfa.glade:4896
+msgid " Priority system "
 msgstr " Systempriorität "
 
-#: src/translate.c:184
+#: glade/xcfa.glade:4935
 msgid ""
-"Indiquez ici le dossier sur votre systeme qui servira de lieu\n"
-"de stockage provisoire pendant les differentes conversions.\n"
+"\n"
+"Enter here the folder on your system that will serve as\n"
+"temporary storage for the different conversions.\n"
 msgstr ""
+"\n"
 "Geben Sie hier den Ordner auf Ihrem System an, den Xcfa zur "
 "temporären\n"
 " Zwischenspeicherung während der Konvertierung benutzen soll.\n"
 
-#: src/translate.c:185
-msgid " Dossier provisoire des conversions "
+#: glade/xcfa.glade:4971
+msgid " Provisional file conversions "
 msgstr " Temporärer Konvertierungsordner "
 
-#: src/translate.c:186
+#: glade/xcfa.glade:5017
 msgid "button"
 msgstr "button"
 
-#: src/translate.c:187
-msgid " Jouer une musique en fin de tache "
-msgstr " Abspielen von Musik am Ende der Aufgabe "
+#: glade/xcfa.glade:5038
+msgid " Playing a job end music "
+msgstr " Spielen einen Job Ende Musik "
 
-#: src/translate.c:188
+#: glade/xcfa.glade:5058
 msgid " General "
 msgstr " Allgemein "
 
-#: src/translate.c:189
+#: glade/xcfa.glade:5100
 msgid "cdparanoia"
 msgstr "cdparanoia"
 
-#: src/translate.c:190
-msgid "cdda2wav / icedax"
-msgstr "cdda2wav / icedax"
-
-#: src/translate.c:191
+#: glade/xcfa.glade:5120
 msgid "cdparanoia mode expert"
 msgstr "cdparanoia Expertenmodus"
 
-#: src/translate.c:192
+#: glade/xcfa.glade:5140
+msgid "cdparanoia mode expert multi passes"
+msgstr "cdparanoia Expertenmodus Multi-Pass"
+
+#: glade/xcfa.glade:5168
+msgid "cdda2wav / icedax"
+msgstr "cdda2wav / icedax"
+
+#: glade/xcfa.glade:5194
 msgid " Extraction cd-audio avec: "
 msgstr " Rippen der Audio-CD mit: "
 
-#: src/translate.c:193
+#: glade/xcfa.glade:5268
 msgid "HomePage"
 msgstr "Homepage"
 
-#: src/translate.c:194
+#: glade/xcfa.glade:5323
 msgid "ManPage "
 msgstr "Handbuch "
 
-#: src/translate.c:195
+#: glade/xcfa.glade:5352
 msgid " Web cdparanoia "
 msgstr " cdparanoia im Web "
 
-#: src/translate.c:196
+#: glade/xcfa.glade:5414
 msgid ""
-"%a - artiste %b - titre "
+"Le fichier LogExpertMode.txt sera cree dans le dossier des "
+"extractions"
+msgstr ""
+"Die Datei LogExpertMode.txt werden in dem Ordner erstellt "
+"werdenExtraktionen"
+
+#: glade/xcfa.glade:5431
+msgid "Generation of a report for: cdparanoia mode expert multi passes"
+msgstr ""
+"Erstellung eines Reports für: cdparanoia Experten-Modus Multi-Pass"
+
+#: glade/xcfa.glade:5467
+msgid ""
+"%a - artist %b - titre "
 "de l'album %c - numero de la piste\n"
 "%d - titre de la chanson %e - "
-"annee %g - genre\n"
+"year %g - genre\n"
 "%na - no accent %Tl "
 "- Tetsumaki lower\n"
-"%u - remplacement de caracteres: %u(AB=C) %u( =_)"
+"%u - replacement characters: %u(AB=C) %u( =_)"
 msgstr ""
 "%a - Künstler %b - "
 "Albumtitel %c - Titelnummer\n"
@@ -2053,381 +1972,375 @@
 "- Tetsumaki lower\n"
 "%u - Ersetzung von Zeichen: %u(AB=C) %u( =_)"
 
-#: src/translate.c:197
+#: glade/xcfa.glade:5536
 msgid " Dossier de stockage "
 msgstr " Verzeichnis zum Speichern "
 
-#: src/translate.c:198
+#: glade/xcfa.glade:5567
 msgid " CD "
 msgstr " CD "
 
-#: src/translate.c:199
+#: glade/xcfa.glade:5615
 msgid "ABR / CBR / VBR / VBR-NEW"
 msgstr "ABR / CBR / VBR / VBR-NEW"
 
-#: src/translate.c:200
+#: glade/xcfa.glade:5660 glade/xcfa.glade:6295
 msgid "Debit"
 msgstr "Bitrate"
 
-#: src/translate.c:201
+#: glade/xcfa.glade:5705 glade/xcfa.glade:6317
 msgid "Mode"
 msgstr "Modus"
 
-#: src/translate.c:203 src/translate.c:219 src/translate.c:231
-#: src/translate.c:244 src/translate.c:261 src/translate.c:272
-#: src/translate.c:286 src/translate.c:300
+#: glade/xcfa.glade:5747
+msgid " Lame (fichier mp3): "
+msgstr " Lame (mp3-Datei): "
+
+#: glade/xcfa.glade:5827 glade/xcfa.glade:6466 glade/xcfa.glade:6941
+#: glade/xcfa.glade:7469 glade/xcfa.glade:8200 glade/xcfa.glade:8659
+#: glade/xcfa.glade:9192 glade/xcfa.glade:9753
 msgid "Par defaut"
 msgstr " Standard "
 
-#: src/translate.c:204
+#: glade/xcfa.glade:5848
 msgid " Options LAME "
 msgstr " LAME-Optionen "
 
-#: src/translate.c:205 src/translate.c:233 src/translate.c:274
+#: glade/xcfa.glade:5909 glade/xcfa.glade:7023 glade/xcfa.glade:8741
 msgid "Site officiel"
 msgstr " Offizielle Seite "
 
-#: src/translate.c:206
+#: glade/xcfa.glade:5964
 msgid "Wiki mp3 "
 msgstr " mp3-Wiki "
 
-#: src/translate.c:207
+#: glade/xcfa.glade:6020
 msgid "Wiki "
 msgstr " Lame-Wiki "
 
-#: src/translate.c:208
+#: glade/xcfa.glade:6076
 msgid "ManPage "
 msgstr "Handbuch "
 
-#: src/translate.c:209
+#: glade/xcfa.glade:6105
 msgid " Web Lame "
 msgstr " Lame im Web "
 
-#: src/translate.c:210 src/translate.c:224 src/translate.c:237
-#: src/translate.c:248 src/translate.c:266 src/translate.c:277
-#: src/translate.c:292
+#: glade/xcfa.glade:6181 glade/xcfa.glade:6709 glade/xcfa.glade:7238
+#: glade/xcfa.glade:7644 glade/xcfa.glade:8442 glade/xcfa.glade:8901
+#: glade/xcfa.glade:9491
 msgid "["
 msgstr "["
 
-#: src/translate.c:211 src/translate.c:225 src/translate.c:238
-#: src/translate.c:249 src/translate.c:267 src/translate.c:278
-#: src/translate.c:293
+#: glade/xcfa.glade:6194 glade/xcfa.glade:6722 glade/xcfa.glade:7251
+#: glade/xcfa.glade:7657 glade/xcfa.glade:8455 glade/xcfa.glade:8914
+#: glade/xcfa.glade:9504
 msgid "string option interne"
 msgstr "string option interne"
 
-#: src/translate.c:212 src/translate.c:226 src/translate.c:239
-#: src/translate.c:250 src/translate.c:268 src/translate.c:279
-#: src/translate.c:294
+#: glade/xcfa.glade:6209 glade/xcfa.glade:6737 glade/xcfa.glade:7266
+#: glade/xcfa.glade:7672 glade/xcfa.glade:8470 glade/xcfa.glade:8929
+#: glade/xcfa.glade:9519
 msgid "]"
 msgstr "]"
 
-#: src/translate.c:213
-msgid ""
-" Options experts, definies par l'utilisateur - lame (wav -> mp3) "
+#: glade/xcfa.glade:6234
+msgid " Experts options defined by the user- lame (wav -> mp3) "
 msgstr " Benutzerdefinierte Experten-Optionen - lame (wav > mp3) "
 
-#: src/translate.c:214
+#: glade/xcfa.glade:6254
 msgid " Mp3 "
 msgstr " Mp3 "
 
-#: src/translate.c:215
-msgid " Mode"
-msgstr " Modus"
+#: glade/xcfa.glade:6306
+msgid "Mode flux (streaming)"
+msgstr "Flux-Modus (Streaming)"
 
-#: src/translate.c:216
-msgid " Mode flux (streaming)"
-msgstr " Flux-Modus (Streaming)"
-
-#: src/translate.c:217
-msgid " Debit"
-msgstr " Bitrate"
+#: glade/xcfa.glade:6386
+msgid " Oggenc (fichier ogg): "
+msgstr " Oggenc (ogg-Datei): "
 
-#: src/translate.c:220
+#: glade/xcfa.glade:6487
 msgid " Options OGGENC "
 msgstr " OGGENC-Optionen "
 
-#: src/translate.c:221
+#: glade/xcfa.glade:6548
 msgid "Wiki "
 msgstr "Wiki "
 
-#: src/translate.c:222 src/translate.c:264 src/translate.c:290
-#: src/translate.c:304
+#: glade/xcfa.glade:6604 glade/xcfa.glade:8337 glade/xcfa.glade:9386
+#: glade/xcfa.glade:9947
 msgid "ManPage"
 msgstr "Handbuch"
 
-#: src/translate.c:223
+#: glade/xcfa.glade:6633
 msgid " Web Oggenc "
 msgstr " Oggenc im Web "
 
-#: src/translate.c:227
-msgid ""
-" Options experts, definies par l'utilisateur - oggenc (wav -> ogg) "
+#: glade/xcfa.glade:6762
+msgid " Experts options defined by the user - oggenc (wav -> ogg) "
 msgstr " Benutzerdefinierte Experten-Optionen - oggenc (wav > ogg) "
 
-#: src/translate.c:228
+#: glade/xcfa.glade:6782
 msgid " Oggenc "
 msgstr " Oggenc "
 
-#: src/translate.c:229
+#: glade/xcfa.glade:6824
 msgid "Taux de compression"
 msgstr " Komprimierungslevel"
 
-#: src/translate.c:230
+#: glade/xcfa.glade:6861
 msgid " Flac (fichier flac): "
 msgstr " Flac (flac-Datei): "
 
-#: src/translate.c:232
+#: glade/xcfa.glade:6962
 msgid " Options FLAC "
 msgstr " FLAC-Optionen"
 
-#: src/translate.c:234 src/translate.c:275
+#: glade/xcfa.glade:7078 glade/xcfa.glade:8796
 msgid "Framasoft "
 msgstr "Framasoft "
 
-#: src/translate.c:235
+#: glade/xcfa.glade:7133
 msgid "ManPage "
 msgstr "Handbuch "
 
-#: src/translate.c:236
+#: glade/xcfa.glade:7162
 msgid " Web Flac "
 msgstr " Flac im Web "
 
-#: src/translate.c:240
-msgid ""
-" Options experts, definies par l'utilisateur - flac (wav -> flac) "
+#: glade/xcfa.glade:7291
+msgid " Experts options defined by the user- flac (wav -> flac) "
 msgstr " Benutzerdefinierte Experten-Optionen - flac (wav > flac) "
 
-#: src/translate.c:241
+#: glade/xcfa.glade:7311
 msgid " Flac "
 msgstr " Flac "
 
-#: src/translate.c:242
+#: glade/xcfa.glade:7353
 msgid " Qualite"
 msgstr " Qualität"
 
-#: src/translate.c:243
+#: glade/xcfa.glade:7389
 msgid " Mac (fichier ape): "
 msgstr " Mac (ape-Datei): "
 
-#: src/translate.c:245
+#: glade/xcfa.glade:7490
 msgid " Options MAC "
 msgstr " MAC-Optionen "
 
-#: src/translate.c:246
+#: glade/xcfa.glade:7546
 msgid "Wiki"
 msgstr "Wiki"
 
-#: src/translate.c:247
+#: glade/xcfa.glade:7568
 msgid " Web Mac "
 msgstr " Mac im Web "
 
-#: src/translate.c:251
-msgid " Options experts, definies par l'utilisateur - mac (wav -> ape) "
+#: glade/xcfa.glade:7697
+msgid " Experts options defined by the user - mac (wav -> ape) "
 msgstr " Benutzerdefinierte Experten-Optionen - mac (wav > ape) "
 
-#: src/translate.c:252
+#: glade/xcfa.glade:7717
 msgid " Mac "
 msgstr " Mac "
 
-#: src/translate.c:253
+#: glade/xcfa.glade:7765
 msgid "Compression"
 msgstr "Komprimierung"
 
-#: src/translate.c:254
+#: glade/xcfa.glade:7817
 msgid "Son"
 msgstr "Kanalaufteilung"
 
-#: src/translate.c:255
+#: glade/xcfa.glade:7869
 msgid "Mode hybride"
 msgstr "Hybridmodus"
 
-#: src/translate.c:256
+#: glade/xcfa.glade:7921
 msgid "Fichier de correction"
 msgstr "Korrekturdatei"
 
-#: src/translate.c:257
+#: glade/xcfa.glade:7973
 msgid "Compression maximum"
 msgstr "Maximale Kompression"
 
-#: src/translate.c:258
+#: glade/xcfa.glade:8025
 msgid "Signature MD5"
 msgstr "MD5-Signatur"
 
-#: src/translate.c:259
+#: glade/xcfa.glade:8077
 msgid "Extra encode processing"
 msgstr "Extra-Kodierungs-Verarbeitung"
 
-#: src/translate.c:260
+#: glade/xcfa.glade:8120
 msgid " WavPack (fichier wv): "
 msgstr " Wavpack (wv-Datei): "
 
-#: src/translate.c:262
+#: glade/xcfa.glade:8221
 msgid " Options WAVPACK "
 msgstr " WAVPACK-Optionen "
 
-#: src/translate.c:263
+#: glade/xcfa.glade:8282
 msgid "Wiki "
 msgstr "Wiki "
 
-#: src/translate.c:265
+#: glade/xcfa.glade:8366
 msgid " Web Wavpack "
 msgstr " Wavpack im Web "
 
-#: src/translate.c:269
-msgid ""
-" Options experts, definies par l'utilisateur - wavpack (wav -> wv) "
+#: glade/xcfa.glade:8495
+msgid " Experts options defined by the user - wavpack (wav -> wv) "
 msgstr " Benutzerdefinierte Experten-Optionen - wavpack (wav > wv) "
 
-#: src/translate.c:270
+#: glade/xcfa.glade:8515
 msgid " Wavpack "
 msgstr " Wavpack "
 
-#: src/translate.c:271
+#: glade/xcfa.glade:8579
 msgid " MusePack (fichier mpc): "
 msgstr " Musepack (mpc-Datei): "
 
-#: src/translate.c:273
+#: glade/xcfa.glade:8680
 msgid " Options MUSEPACK "
 msgstr " MUSEPACK-Optionen "
 
-#: src/translate.c:276
+#: glade/xcfa.glade:8825
 msgid " Web Musepack "
 msgstr " Musepack im Web "
 
-#: src/translate.c:280
-msgid ""
-" Options experts, definies par l'utilisateur - musepack (wav -> mpc) "
+#: glade/xcfa.glade:8954
+msgid " Experts options defined by the user- musepack (wav -> mpc) "
 msgstr " Benutzerdefinierte Experten-Optionen - musepack (wav > mpc) "
 
-#: src/translate.c:281
+#: glade/xcfa.glade:8974
 msgid " Musepack "
 msgstr " Musepack "
 
-#: src/translate.c:282
-msgid " Qualite VBR / Debit ABR"
-msgstr " VBR-Qualität / ABR-Bitrate"
+#: glade/xcfa.glade:9016
+msgid "Conteneur"
+msgstr "Container"
 
-#: src/translate.c:283
-msgid " VBR / ABR"
-msgstr " VBR / ABR"
+#: glade/xcfa.glade:9027
+msgid "VBR / ABR"
+msgstr "VBR / ABR"
 
-#: src/translate.c:284
-msgid " Conteneur"
-msgstr " Container"
+#: glade/xcfa.glade:9038
+msgid "Qualite VBR / Debit ABR"
+msgstr "VBR-Qualität / ABR-Bitrate"
 
-#: src/translate.c:285
+#: glade/xcfa.glade:9112
 msgid " Faac (fichier .m4a): "
 msgstr " Faac (m4a-Datei): "
 
-#: src/translate.c:287
+#: glade/xcfa.glade:9213
 msgid " Options FAAC "
 msgstr " Faac-Optionen "
 
-#: src/translate.c:288 src/translate.c:302
+#: glade/xcfa.glade:9274 glade/xcfa.glade:9835
 msgid "Site officiel "
 msgstr "Offizielle Seite "
 
-#: src/translate.c:289 src/translate.c:303
+#: glade/xcfa.glade:9330 glade/xcfa.glade:9891
 msgid "Web Info "
 msgstr "Infos im Web"
 
-#: src/translate.c:291
+#: glade/xcfa.glade:9415
 msgid " Web Faac "
 msgstr " Faac im Web "
 
-#: src/translate.c:295
-msgid ""
-" Options experts, definies par l'utilisateur - faac (wav -> m4a) "
+#: glade/xcfa.glade:9544
+msgid " Experts options defined by the user - faac (wav -> m4a) "
 msgstr " Benutzerdefinierte Experten-Optionen - faac (wav > m4a) "
 
-#: src/translate.c:296
+#: glade/xcfa.glade:9564
 msgid " Faac "
 msgstr " Faac "
 
-#: src/translate.c:297
-msgid " Stereo: Qualite en kbit/s"
-msgstr " Stereo (Qualität in kbit/s)"
+#: glade/xcfa.glade:9606
+msgid "Mono: Qualite en kbit/s"
+msgstr "Mono (Qualität in kbit/s)"
 
-#: src/translate.c:298
-msgid " Mono: Qualite en kbit/s"
-msgstr " Mono (Qualität in kbit/s)"
+#: glade/xcfa.glade:9617
+msgid "Stereo: Qualite en kbit/s"
+msgstr "Stereo (Qualität in kbit/s)"
 
-#: src/translate.c:299
+#: glade/xcfa.glade:9673
 msgid " AacplusEnc (fichier .aac): "
 msgstr " AacplusEnc (aac-Datei): "
 
-#: src/translate.c:301
+#: glade/xcfa.glade:9774
 msgid " Options AacPlusEnc "
 msgstr " AacPlusEnc-Optionen "
 
-#: src/translate.c:305
+#: glade/xcfa.glade:9976
 msgid " Web AacPlusEnc "
 msgstr " AacPlusEnc im Web "
 
-#: src/translate.c:306
+#: glade/xcfa.glade:10021
 msgid " AacplusEnc "
 msgstr " AacplusEnc "
 
-#: src/translate.c:307
+#: glade/xcfa.glade:10051
 msgid "Artiste"
 msgstr "Interpret"
 
-#: src/translate.c:308 src/translate.c:335
+#: glade/xcfa.glade:10070 glade/xcfa_win_treeview.glade:95
 msgid "Titre"
 msgstr "Titel"
 
-#: src/translate.c:309
+#: glade/xcfa.glade:10089
 msgid "Album"
 msgstr "Album"
 
-#: src/translate.c:310
+#: glade/xcfa.glade:10108
 msgid "Numero"
 msgstr "Nummer"
 
-#: src/translate.c:311
+#: glade/xcfa.glade:10127
 msgid "Genre"
 msgstr "Genre"
 
-#: src/translate.c:312
+#: glade/xcfa.glade:10146
 msgid "Annee"
 msgstr "Jahr"
 
-#: src/translate.c:313
+#: glade/xcfa.glade:10165
 msgid "Commentaire"
 msgstr "Kommentar"
 
-#: src/translate.c:314
+#: glade/xcfa.glade:10190
 msgid " Exportation de "
 msgstr " Export von "
 
-#: src/translate.c:316
+#: glade/xcfa.glade:10226
 msgid " Preferences "
 msgstr " Einstellungen "
 
-#: src/translate.c:317
+#: glade/xcfa.glade:10289
 msgid "SCAN"
 msgstr "SCAN"
 
-#: src/translate.c:318
+#: glade/xcfa.glade:10303
 msgid " Installation "
 msgstr " Installation "
 
-#: src/translate.c:319
-msgid " Votre systeme utilise ... "
+#: glade/xcfa.glade:10338
+msgid " Your system use ... "
 msgstr " Ihr System benutzt... "
 
-#: src/translate.c:320
+#: glade/xcfa.glade:10375
 msgid ""
 "\n"
-"Pour installer les programmes externes requis,\n"
-"veuillez utiliser l'installateur de votre distribution Gnu/Linux.\n"
+"To install the required external programs\n"
+"Please use the installer to your distribution Gnu / Linux.\n"
 msgstr ""
 "\n"
 "So installieren Sie die benötigten externen Programme:\n"
 "Bitte verwenden Sie das Installationsprogramm Ihrer GNU-/Linux-Distribution."
 "\n"
 
-#: src/translate.c:321
+#: glade/xcfa.glade:10393
 msgid ""
 "Le programme XCFA_INSTALL_ALL ecrit en Perl vous sera utile en ligne de "
 "commande pour une installation des programmes complementaire."
@@ -2435,183 +2348,69 @@
 "Das Programm XCFA_INSTALL_ALL in Perl geschrieben von Nutzen sein wird auf "
 "der Kommandozeile für die Installation von Zusatzprogrammen"
 
-#: src/translate.c:322
+#: glade/xcfa.glade:10419
 msgid " Informations "
 msgstr " Informationen "
 
-#: src/translate.c:323
-msgid " Application externes "
-msgstr " Externe Programme "
+#: glade/xcfa.glade:10443
+msgid " External application "
+msgstr " External application "
 
-#: src/translate.c:324 src/translate.c:326
+#: glade/xcfa.glade:10514 glade/xcfa.glade:10618
 msgid "parametres:"
 msgstr "Parameter:"
 
-#: src/translate.c:325
+#: glade/xcfa.glade:10527
+msgid ""
+"\n"
+" konqueror : newTab\n"
+" iceweasel : -new-window -new-tab \n"
+msgstr ""
+"\n"
+" konqueror : newTab\n"
+" iceweasel : -new-window -new-tab \n"
+
+#: glade/xcfa.glade:10548
 msgid "Navigateur"
 msgstr "Browser"
 
-#: src/translate.c:327
+#: glade/xcfa.glade:10648
 msgid "Lecteurs audio"
 msgstr "Audio-Player"
 
-#: src/translate.c:328
-msgid " Navigateurs / Lecteurs audio "
-msgstr " Browser / Audio-Player"
+#: glade/xcfa.glade:10669
+msgid "  Browsers / Audio Players "
+msgstr "Browser / Audio-Wiedergabe"
 
-#: src/translate.c:329
+#: glade/xcfa.glade:10692
 msgid " Applications externes "
 msgstr " Externe Programme "
 
-#: src/translate.c:330
-msgid "Scan en cours ..."
-msgstr "Scan in progress ..."
-
-#: src/translate.c:331
-msgid "Scan du support en cours ..."
-msgstr "Scan der aktuellen Unterstützung ..."
-
-#: src/translate.c:332
-msgid "Detail extraction mode expert"
-msgstr "Detail Retrieval Experten-Modus"
-
-#: src/translate.c:333
-msgid "Modification des champs"
-msgstr "Einstellungen für Felder"
-
-#: src/translate.c:334
-msgid ""
-"\n"
-"Modification des champs\n"
-msgstr ""
-"\n"
-"Einstellungen für Felder\n"
-
-#: src/translate.c:342 src/translate.c:361 src/translate.c:382
-#: src/translate.c:394 src/translate.c:405 src/translate.c:413
-msgid " Visibilite "
-msgstr " Sichtbar "
-
-#: src/translate.c:343 src/translate.c:362 src/translate.c:383
-#: src/translate.c:395 src/translate.c:406 src/translate.c:414
-msgid "Nom a gauche"
-msgstr "Name links"
-
-#: src/translate.c:344 src/translate.c:363 src/translate.c:384
-#: src/translate.c:396 src/translate.c:407 src/translate.c:415
-msgid "Nom au centre"
-msgstr "Name zentriert"
-
-#: src/translate.c:345 src/translate.c:364 src/translate.c:385
-#: src/translate.c:397 src/translate.c:408 src/translate.c:416
-msgid "Nom a droite"
-msgstr "Name rechts"
-
-#: src/translate.c:346
-msgid "DVD"
-msgstr "DVD"
-
-#: src/translate.c:351 src/translate.c:372
-msgid "Wavpack"
-msgstr "Wavpack"
-
-#: src/translate.c:355 src/translate.c:376
-msgid "Musepack"
-msgstr "Musepack"
-
-#: src/translate.c:365
-msgid "CD"
-msgstr "CD"
-
-#: src/translate.c:380
-msgid "Replaygain"
-msgstr "Replaygain"
-
-#: src/translate.c:386
-msgid "CONVERSIONS"
-msgstr "Konvertierungen"
-
-#: src/translate.c:387
-msgid "Hertz"
-msgstr "Hertz"
-
-#: src/translate.c:388
-msgid "New Hertz"
-msgstr "Hertz neu"
-
-#: src/translate.c:389
-msgid "Voie"
-msgstr "Voice"
-
-#: src/translate.c:390
-msgid "New Voie"
-msgstr "Neu Voice"
-
-#: src/translate.c:391
-msgid "Bits"
-msgstr "Bits"
-
-#: src/translate.c:392
-msgid "New Bits"
-msgstr "Neue Bits"
-
-#: src/translate.c:398
-msgid "WAV"
-msgstr "WAV"
-
-#: src/translate.c:401
-msgid "New Bitrate"
-msgstr "Neue Bitrate"
-
-#: src/translate.c:402
-msgid "Size"
-msgstr "Dauer"
-
-#: src/translate.c:409
-msgid "MP3-OGG"
-msgstr "MP3-OGG"
-
-#: src/translate.c:417
-msgid "TAGS"
-msgstr "TAGS"
-
-#: src/translate.c:418
-msgid "Selection globale"
-msgstr "Alles auswählen"
-
-#: src/translate.c:419
-msgid "Deselection globale"
-msgstr "Alles abwählen"
-
-#: src/translate.c:420
-msgid "Retour"
-msgstr "Zurück"
-
-#: src/translate.c:421
+#: glade/xcfa_win_about.glade:7
 msgid "About X Convert File Audio"
 msgstr "Über X Convert File Audio"
 
-#: src/translate.c:422
+#: glade/xcfa_win_about.glade:103
 msgid "Author"
 msgstr "Autor"
 
-#: src/translate.c:423
+#: glade/xcfa_win_about.glade:139
 msgid "Licence"
 msgstr "Licence"
 
-#: src/translate.c:424
+#: glade/xcfa_win_about.glade:163
 msgid " Informations "
 msgstr " Informationen "
 
-#: src/translate.c:425
+#: glade/xcfa_win_about.glade:198
 msgid " Machine "
 msgstr " Computer "
 
-#: src/translate.c:426
+#: glade/xcfa_win_about.glade:333
 msgid "Ingenieurs du son\n"
 msgstr "Toningenieur\n"
 
-#: src/translate.c:427
+#: glade/xcfa_win_about.glade:350
 msgid ""
 "\n"
 "Graphisme\n"
@@ -2619,7 +2418,7 @@
 "\n"
 "Graphisme\n"
 
-#: src/translate.c:428
+#: glade/xcfa_win_about.glade:370
 msgid ""
 "Traduction Anglaise\n"
 "\n"
@@ -2629,7 +2428,7 @@
 "\n"
 "\n"
 
-#: src/translate.c:429
+#: glade/xcfa_win_about.glade:391
 msgid ""
 "\n"
 "Traduction Allemande"
@@ -2637,7 +2436,7 @@
 "\n"
 "Traduction Allemande"
 
-#: src/translate.c:430
+#: glade/xcfa_win_about.glade:628
 msgid ""
 "\n"
 "Codeur Xcfa"
@@ -2645,7 +2444,7 @@
 "\n"
 "Xcfa-Programmierung "
 
-#: src/translate.c:431
+#: glade/xcfa_win_about.glade:665
 msgid ""
 "\n"
 "ElementSpeak pour Xcfa "
@@ -2653,7 +2452,7 @@
 "\n"
 "ElementSpeak für Xcfa "
 
-#: src/translate.c:432
+#: glade/xcfa_win_about.glade:702
 msgid ""
 "\n"
 "Codeur pages Web"
@@ -2661,7 +2460,7 @@
 "\n"
 "Webseitengestaltung"
 
-#: src/translate.c:433
+#: glade/xcfa_win_about.glade:739
 msgid ""
 "\n"
 "Traduction Italienne"
@@ -2669,7 +2468,7 @@
 "\n"
 "Italienische Übersetzung"
 
-#: src/translate.c:434
+#: glade/xcfa_win_about.glade:800
 msgid ""
 "\n"
 "\n"
@@ -2679,51 +2478,43 @@
 "\n"
 "Webseiten-Empfehlungen\n"
 
-#: src/translate.c:435
+#: glade/xcfa_win_about.glade:1123
 msgid "Linux On The Root"
 msgstr "Linux On The Root"
 
-#: src/translate.c:436
+#: glade/xcfa_win_about.glade:1180
 msgid "Frugalware"
 msgstr "Frugalware"
 
-#: src/translate.c:437
+#: glade/xcfa_win_about.glade:1237
 msgid "Road2Mayotte"
 msgstr "Road2Mayotte"
 
-#: src/translate.c:438
+#: glade/xcfa_win_about.glade:1294
 msgid "La Linuxerie"
 msgstr "La Linuxerie"
 
-#: src/translate.c:439
-msgid "Audioptimisation by Dzef"
-msgstr "Audioptimisation von Dzef"
-
-#: src/translate.c:440
+#: glade/xcfa_win_about.glade:1351
 msgid "Tuxfamily"
 msgstr "Tuxfamily"
 
-#: src/translate.c:441
+#: glade/xcfa_win_about.glade:1408
 msgid "Framasoft"
 msgstr "Framasoft"
 
-#: src/translate.c:442
+#: glade/xcfa_win_about.glade:1465
 msgid "Ekd (EnKoDeur-Mixeur)"
 msgstr "Ekd (EnKoDeur-Mixeur)"
 
-#: src/translate.c:443
-msgid "Bishop's page"
-msgstr "Bishops Seite"
+#: glade/xcfa_win_about.glade:1544
+msgid "Debian Multimedia"
+msgstr "Debian Multimedia"
 
-#: src/translate.c:444
+#: glade/xcfa_win_about.glade:1598
 msgid "Je suis libre"
 msgstr "Je suis libr"
 
-#: src/translate.c:445
-msgid "Debian Multimedia"
-msgstr "Debian Multimedia"
-
-#: src/translate.c:446
+#: glade/xcfa_win_about.glade:1705
 msgid ""
 "\n"
 "Forum\n"
@@ -2731,19 +2522,15 @@
 "\n"
 "Foren\n"
 
-#: src/translate.c:447
-msgid "XCFA Vorstellung "
-msgstr "XCFA Vorstellung "
+#: glade/xcfa_win_about.glade:1825
+msgid "Forum Xcfa"
+msgstr "Xcfa-Forum"
 
-#: src/translate.c:448
+#: glade/xcfa_win_about.glade:1879
 msgid "XCFA LinuxForen.de"
 msgstr "XCFA LinuxForen.de"
 
-#: src/translate.c:449
-msgid "Forum Xcfa"
-msgstr "Xcfa-Forum"
-
-#: src/translate.c:450
+#: glade/xcfa_win_about.glade:1929
 msgid ""
 "\n"
 "Documentation\n"
@@ -2751,102 +2538,208 @@
 "\n"
 "Dokumentation\n"
 
-#: src/translate.c:451
+#: glade/xcfa_win_about.glade:2164
 msgid "Wiki Xcfa par Shankarius"
 msgstr "Xcfa-Wiki von Shankarius"
 
-#: src/translate.c:452
+#: glade/xcfa_win_about.glade:2219
 msgid "Doc Xcfa par Patachon"
 msgstr "Xcfa-Anleitung von Patachon"
 
-#: src/translate.c:453
+#: glade/xcfa_win_about.glade:2276
 msgid "Ogg Vorbis explique par Shankarius"
 msgstr "Ogg Vorbis erklärt von Shankarius"
 
-#: src/translate.c:454
+#: glade/xcfa_win_about.glade:2333
 msgid "La normalisation expliquee par Dzef"
 msgstr "Die Normalisierung erklärt von Dzef"
 
-#: src/translate.c:455
+#: glade/xcfa_win_about.glade:2390
 msgid "Xcfa sur Linux On The Root"
 msgstr "Xcfa auf Linux On The Root"
 
-#: src/translate.c:456
+#: glade/xcfa_win_about.glade:2433
 msgid " Contributions "
 msgstr " Beiträge"
 
-#: src/translate.c:457
+#: glade/xcfa_win_about.glade:2461
 msgid " License "
 msgstr " Lizenz "
 
-#: src/translate.c:458
+#: glade/xcfa_win_about.glade:2482
 msgid "OK"
 msgstr "OK"
 
-#: src/web.c:147 src/web.c:207
-msgid "PAS de navigateur present"
-msgstr "Es ist kein Internet-Browser installiert"
+#: glade/xcfa_win_scan.glade:9
+msgid "Scan en cours ..."
+msgstr "Scan in progress ..."
 
-#: src/web.c:148
-msgid "L'acces au web est impossible car aucun navigateur"
-msgstr "Ein Zugriff auf das Web ist nicht möglich, da ein Webbrowser"
+#: glade/xcfa_win_scan.glade:77
+msgid "Scan du support en cours ..."
+msgstr "Scan der aktuellen Unterstützung ..."
 
-#: src/web.c:150
-msgid "n'est present dans votre configuration."
-msgstr "nicht in Ihrer Konfiguration vorhanden ist."
+#: glade/xcfa_win_scan.glade:128
+msgid "Detail extraction mode expert"
+msgstr "Detail Retrieval Experten-Modus"
 
-#: src/web.c:152
-msgid "Veuillez installez un navigateur."
-msgstr "Installieren Sie bitte einen Internet-Browser."
+#: glade/xcfa_win_treeview.glade:7
+msgid "Modification des champs"
+msgstr "Einstellungen für Felder"
 
-#: src/web.c:161
-msgid "Vous devez ouvrir l'acces internet"
-msgstr "Sie müssen einen Internet-Zugang einstellen"
+#: glade/xcfa_win_treeview.glade:41
+msgid ""
+"\n"
+"Modification des champs\n"
+msgstr ""
+"\n"
+"Einstellungen für Felder\n"
 
-#: src/web.c:209
-msgid " L'acces au web est impossible car aucun navigateur"
-msgstr " Ein Zugriff auf das Web ist nicht möglich, da ein Webbrowser"
+#: glade/xcfa_win_treeview.glade:129
+msgid "Temps"
+msgstr "Dauer"
 
-#: src/web.c:211
-msgid " n'est present dans votre configuration."
-msgstr " nicht in Ihrer Konfiguration vorhanden ist."
+#: glade/xcfa_win_treeview.glade:163
+msgid "Choix"
+msgstr "Auswahl"
 
-#: src/web.c:213
-msgid " Veuillez installez un navigateur."
-msgstr " Installieren Sie bitte einen Internet-Browser."
+#: glade/xcfa_win_treeview.glade:197 glade/xcfa_win_treeview.glade:577
+#: glade/xcfa_win_treeview.glade:995 glade/xcfa_win_treeview.glade:1260
+#: glade/xcfa_win_treeview.glade:1508 glade/xcfa_win_treeview.glade:1706
+msgid "Nom"
+msgstr "Name"
 
-#: src/web.c:222
-msgid "L'application est absente."
-msgstr "Die Anwendung ist nicht vorhanden."
+#: glade/xcfa_win_treeview.glade:220 glade/xcfa_win_treeview.glade:600
+#: glade/xcfa_win_treeview.glade:1018 glade/xcfa_win_treeview.glade:1283
+#: glade/xcfa_win_treeview.glade:1531 glade/xcfa_win_treeview.glade:1732
+msgid " Visibilite "
+msgstr " Sichtbar "
 
-#: src/web.c:223
-msgid "Veuillez installer : "
-msgstr "Bitte installieren : "
+#: glade/xcfa_win_treeview.glade:250 glade/xcfa_win_treeview.glade:630
+#: glade/xcfa_win_treeview.glade:1048 glade/xcfa_win_treeview.glade:1313
+#: glade/xcfa_win_treeview.glade:1562 glade/xcfa_win_treeview.glade:1763
+msgid "Nom a gauche"
+msgstr "Name links"
 
-#: src/win_about.c:138
-msgid " Xcfa sur le web"
-msgstr " xcfa im Web "
+#: glade/xcfa_win_treeview.glade:267 glade/xcfa_win_treeview.glade:647
+#: glade/xcfa_win_treeview.glade:1065 glade/xcfa_win_treeview.glade:1330
+#: glade/xcfa_win_treeview.glade:1579 glade/xcfa_win_treeview.glade:1780
+msgid "Nom au centre"
+msgstr "Name zentriert"
 
-#: src/win_about.c:188
-msgid ""
-"\n"
-"Au tout debut:\n"
-"\n"
-"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
-"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
-"... ;-)\n"
-"\n"
-""
-msgstr ""
-"\n"
-"Zuerst:\n"
-"\n"
-"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
-"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
-"... ;-)\n"
-"\n"
-""
+#: glade/xcfa_win_treeview.glade:286 glade/xcfa_win_treeview.glade:666
+#: glade/xcfa_win_treeview.glade:1084 glade/xcfa_win_treeview.glade:1349
+#: glade/xcfa_win_treeview.glade:1598 glade/xcfa_win_treeview.glade:1799
+msgid "Nom a droite"
+msgstr "Name rechts"
 
-#: src/win_scan.c:166
-msgid "Waiting ..."
-msgstr "Warte ..."
+#: glade/xcfa_win_treeview.glade:326
+msgid "DVD"
+msgstr "DVD"
+
+#: glade/xcfa_win_treeview.glade:373 glade/xcfa_win_treeview.glade:791
+msgid "Wav"
+msgstr "Wav"
+
+#: glade/xcfa_win_treeview.glade:390 glade/xcfa_win_treeview.glade:808
+msgid "Flac"
+msgstr "Flac"
+
+#: glade/xcfa_win_treeview.glade:407 glade/xcfa_win_treeview.glade:825
+msgid "Ape"
+msgstr "Ape"
+
+#: glade/xcfa_win_treeview.glade:424 glade/xcfa_win_treeview.glade:842
+msgid "Wavpack"
+msgstr "Wavpack"
+
+#: glade/xcfa_win_treeview.glade:441 glade/xcfa_win_treeview.glade:859
+msgid "Ogg"
+msgstr "Ogg"
+
+#: glade/xcfa_win_treeview.glade:458 glade/xcfa_win_treeview.glade:876
+msgid "M4a"
+msgstr "M4a"
+
+#: glade/xcfa_win_treeview.glade:475 glade/xcfa_win_treeview.glade:893
+msgid "Aac"
+msgstr "Aac"
+
+#: glade/xcfa_win_treeview.glade:492 glade/xcfa_win_treeview.glade:910
+msgid "Musepack"
+msgstr "Musepack"
+
+#: glade/xcfa_win_treeview.glade:509 glade/xcfa_win_treeview.glade:927
+msgid "Mp3"
+msgstr "Mp3"
+
+#: glade/xcfa_win_treeview.glade:526
+msgid "Num"
+msgstr "Nr."
+
+#: glade/xcfa_win_treeview.glade:709
+msgid "CD"
+msgstr "CD"
+
+#: glade/xcfa_win_treeview.glade:978
+msgid "Replaygain"
+msgstr "Replaygain"
+
+#: glade/xcfa_win_treeview.glade:1127
+msgid "CONVERSIONS"
+msgstr "Konvertierungen"
+
+#: glade/xcfa_win_treeview.glade:1158
+msgid "Hertz"
+msgstr "Hertz"
+
+#: glade/xcfa_win_treeview.glade:1175
+msgid "New Hertz"
+msgstr "Hertz neu"
+
+#: glade/xcfa_win_treeview.glade:1192
+msgid "Voie"
+msgstr "Voice"
+
+#: glade/xcfa_win_treeview.glade:1209
+msgid "New Voie"
+msgstr "Neu Voice"
+
+#: glade/xcfa_win_treeview.glade:1226
+msgid "Bits"
+msgstr "Bits"
+
+#: glade/xcfa_win_treeview.glade:1243
+msgid "New Bits"
+msgstr "Neue Bits"
+
+#: glade/xcfa_win_treeview.glade:1392
+msgid "WAV"
+msgstr "WAV"
+
+#: glade/xcfa_win_treeview.glade:1440
+msgid "Bitrate"
+msgstr "Bitrate"
+
+#: glade/xcfa_win_treeview.glade:1457
+msgid "New Bitrate"
+msgstr "Neue Bitrate"
+
+#: glade/xcfa_win_treeview.glade:1641
+msgid "MP3-OGG"
+msgstr "MP3-OGG"
+
+#: glade/xcfa_win_treeview.glade:1842
+msgid "TAGS"
+msgstr "TAGS"
+
+#: glade/xcfa_win_treeview.glade:1894
+msgid "Selection globale"
+msgstr "Alles auswählen"
+
+#: glade/xcfa_win_treeview.glade:1948
+msgid "Deselection globale"
+msgstr "Alles abwählen"
+
+#: glade/xcfa_win_treeview.glade:2009
+msgid "Retour"
+msgstr "Zurück"

xcfa-4.2.8.tar.gz/po/en.gmo -> xcfa-5.0.2.tar.gz/po/en.gmo Changed

xcfa-4.2.8.tar.gz/po/en.po -> xcfa-5.0.2.tar.gz/po/en.po Changed

@@ -5,239 +5,184 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xcfa 4.2.8\n"
+"Project-Id-Version: xcfa 5.0.2\n"
 "Report-Msgid-Bugs-To: xcfa@tuxfamily.org\n"
-"POT-Creation-Date: 2012-02-03 13:22+0100\n"
-"PO-Revision-Date: 2010-08-21 18:45+0100\n"
+"POT-Creation-Date: 2015-05-16 14:03+0200\n"
+"PO-Revision-Date: 2015-02-06 15:48+0100\n"
 "Last-Translator: Gerry Butler <gdebuitleirATgmailDOTcom>\n"
 "Language-Team: English <en@li.org>\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.7.3\n"
 
-#: src/cd_audio.c:815 src/dvd.c:684 src/dvd.c:1327
-msgid "MPLAYER deja en action"
+#: src/cd_audio.c:814 src/dvd.c:686 src/dvd.c:1345
+msgid "MPLAYER already in action"
 msgstr "MPLAYER already in action"
 
-#: src/cd_audio.c:816 src/dvd.c:685 src/dvd.c:1328
-msgid "MPLAYER est deja utilise !!"
+#: src/cd_audio.c:815 src/dvd.c:687 src/dvd.c:1346
+msgid "MPLAYER is already in use !!"
 msgstr "MPLAYER is already in use !!"
 
-#: src/cd_audio.c:1227 src/cd_audio.c:1233 src/dvd.c:871 src/file.c:2830
-msgid "(Click Droit = Menu) / En attente de selection."
+#: src/cd_audio.c:1227 src/cd_audio.c:1233 src/file.c:2837
+msgid "(Right click = Menu) / Waiting for selection."
 msgstr "(Right click = Menu) / Waiting for selection."
 
-#: src/cd_audio.c:1230 src/file.c:2827
-msgid "Le programme externe d'extraction est absent."
-msgstr "The external ripping program is missing"
+#: src/cd_audio.c:1230
+msgid "The external ripping program is missing."
+msgstr "The external ripping program is missing."
 
-#: src/cd_audio.c:1236 src/file.c:2833
-msgid "(Click Droit = Menu) / En attente de selection. Le fichier existe."
-msgstr "(Right click = Menu) / Waiting for Selection. File exists."
+#: src/cd_audio.c:1236
+msgid "(Right click = Menu) / Waiting for Selection. File exists.."
+msgstr "(Right click = Menu) / Waiting for Selection. File exists.."
 
-#: src/cd_audio.c:1239 src/file.c:2836
-msgid "(Click Droit = Menu) / En selection."
-msgstr "(Right click = Menu) / Selected files"
+#: src/cd_audio.c:1239
+msgid "(Right click = Menu) / Selected files."
+msgstr "(Right click = Menu) / Selected files."
 
-#: src/cd_audio.c:1242 src/file.c:2842
-msgid "(Click Droit = Menu) / Selection avec options expert."
+#: src/cd_audio.c:1242 src/file.c:2849
+msgid "(Right click = Menu) / Selection - expert mode."
 msgstr "(Right click = Menu) / Selection - expert mode."
 
-#: src/cd_audio.c:1245 src/file.c:2839
-msgid "(Click Droit = Menu) / En selection. Le fichier existe."
+#: src/cd_audio.c:1245 src/file.c:2846
+msgid "(Right click = Menu) / Selected files. File exists."
 msgstr "(Right click = Menu) / Selected files. File exists."
 
-#: src/cd_audio.c:1248 src/file.c:2845
-msgid ""
-"(Click Droit = Menu) / Selection avec options expert. Le fichier existe."
+#: src/cd_audio.c:1248 src/file.c:2852
+msgid "(Right click = Menu) / Selection - expert mode. File exists."
 msgstr "(Right click = Menu) / Selection - expert mode. File exists."
 
 #: src/cd_audio.c:1257
 msgid ""
-"(Click Droit = Menu) / Possibilite d'ajustement INDIVIDUEL ou COLLECTIF "
-"maximal du volume"
+"(Right click = Menu) / Possibilities for individual adaptation or maximum "
+"collection volume"
 msgstr ""
 "(Right click = Menu) / Possibilities for individual adaptation or maximum "
 "collection volume"
 
 #: src/cd_audio.c:1262
-msgid "(Click Droit = Menu) / Ajustement INDIVIDUEL maximal du volume"
-msgstr "(Click Droit = Menu) / INDIVIDUAL maximum volume adjustment"
+msgid "(Right click = Menu) / INDIVIDUAL maximum volume adjustment"
+msgstr "(Right click = Menu) / INDIVIDUAL maximum volume adjustment"
 
 #: src/cd_audio.c:1265
-msgid "(Click Droit = Menu) / Ajustement COLLECTIF maximal du volume"
-msgstr "(Click Droit = Menu) / COLLECTIVE maximum volume adjustment"
-
-#: src/cd_audio.c:1505 src/dvd.c:1103 src/file.c:3139 src/translate.c:336
-#: src/translate.c:347 src/translate.c:366
-msgid "Play"
-msgstr "Play"
-
-#: src/cd_audio.c:1546 src/file.c:3204 src/translate.c:348 src/translate.c:369
-msgid "Wav"
-msgstr "Wav"
-
-#: src/cd_audio.c:1567 src/file.c:3223 src/translate.c:349 src/translate.c:370
-msgid "Flac"
-msgstr "Flac"
-
-#: src/cd_audio.c:1587 src/file.c:3242 src/translate.c:350 src/translate.c:371
-msgid "Ape"
-msgstr "Ape"
-
-#: src/cd_audio.c:1607 src/file.c:3261
-msgid "WavP"
-msgstr "WavP"
-
-#: src/cd_audio.c:1627 src/file.c:3280 src/translate.c:352 src/translate.c:373
-msgid "Ogg"
-msgstr "Ogg"
-
-#: src/cd_audio.c:1648 src/file.c:3299 src/translate.c:353 src/translate.c:374
-msgid "M4a"
-msgstr "M4a"
-
-#: src/cd_audio.c:1669 src/file.c:3318 src/translate.c:354 src/translate.c:375
-msgid "Aac"
-msgstr "Aac"
-
-#: src/cd_audio.c:1689 src/file.c:3337
-msgid "Mpc"
-msgstr "Mpc"
-
-#: src/cd_audio.c:1709 src/file.c:3356 src/translate.c:356 src/translate.c:377
-msgid "Mp3"
-msgstr "Mp3"
+msgid "(Right click = Menu) / COLLECTIVE maximum volume adjustment"
+msgstr "(Right click = Menu) / COLLECTIVE maximum volume adjustment"
 
-#: src/cd_audio.c:1730 src/translate.c:357
-msgid "Num"
-msgstr "Num"
-
-#: src/cd_audio.c:1745 src/translate.c:358 src/translate.c:378
-#: src/translate.c:403 src/translate.c:411
-msgid "Time"
-msgstr "Time"
-
-#: src/cd_audio.c:1760 src/dvd.c:1171 src/file.c:3392 src/translate.c:340
-#: src/translate.c:359 src/translate.c:379
+#: src/cd_audio.c:1764 src/dvd.c:1187 src/file.c:3403
+#: glade/xcfa_win_treeview.glade:180 glade/xcfa_win_treeview.glade:560
+#: glade/xcfa_win_treeview.glade:961
 msgid "Normalise"
 msgstr "Normalise"
 
-#: src/cd_audio.c:1785 src/dvd.c:1191 src/file.c:3434 src/file_mp3ogg.c:1287
-#: src/file_tags.c:1209 src/file_wav.c:952 src/prg_init.c:614
-#: src/translate.c:341 src/translate.c:360 src/translate.c:381
-#: src/translate.c:393 src/translate.c:404 src/translate.c:412
-msgid "Nom"
+#: src/cd_audio.c:1789 src/dvd.c:1207 src/file.c:3445 src/file_mp3ogg.c:964
+#: src/file_tags.c:1253 src/file_wav.c:830 src/prg_init.c:609
+msgid "Name"
 msgstr "Name"
 
-#: src/cd_audio.c:2507
-msgid " Parametrage CDDB: [ Nom du serveur ]"
+#: src/cd_audio.c:2517
+msgid " Setting up CDDB: [ Server name ]"
 msgstr " Setting up CDDB: [ Server name ]"
 
-#: src/cd_audio.c:2516
-msgid " Parametrage PROXY: [ serveur ] [ port ]"
+#: src/cd_audio.c:2526
+msgid " Proxy settings: [ server ] [ port ] "
 msgstr " Proxy settings: [ server ] [ port ] "
 
-#: src/cd_audio.c:2526 src/translate.c:99
-msgid " Serveur "
+#: src/cd_audio.c:2536 glade/xcfa.glade:1842
+msgid " Server "
 msgstr " Server "
 
-#: src/cd_audio_extract.c:661
+#: src/cd_audio_extract.c:673
 #, c-format
-msgid ""
-"[Erreur du segment numero: %d]\n"
-"%d) Lecture PASS 1/2\n"
-msgstr ""
-"[Error on segment #%d]\n"
-"%d) Playing PASS 1/2\n"
+msgid "[Error on segment #%d] %d) Playing PASS 1/2\n"
+msgstr "[Error on segment #%d] %d) Playing PASS 1/2\n"
 
-#: src/cd_audio_extract.c:668
+#: src/cd_audio_extract.c:680
 #, c-format
 msgid ""
-"--> Deja %d fois 2 lectures du segment %d!\n"
+"--> Segment %d already read two %d times!\n"
 " Abandon :/\n"
 msgstr ""
 "--> Segment %d already read two %d times!\n"
 " Abandon :/\n"
 
-#: src/cd_audio_extract.c:688
+#: src/cd_audio_extract.c:700
 #, c-format
-msgid "%d) Lecture PASS 2/2\n"
+msgid "%d) Read PASS 2/2\n"
 msgstr "%d) Read PASS 2/2\n"
 
-#: src/cd_audio_extract.c:769
+#: src/cd_audio_extract.c:780
 #, c-format
 msgid ""
 "\n"
-"[Piste: %d]\n"
+"[Track: %d]\n"
 msgstr ""
 "\n"
 "[Track: %d]\n"
 
-#: src/cd_audio_extract.c:773
-msgid "Extraction mode expert PASS 1/2\n"
+#: src/cd_audio_extract.c:784
+msgid "Ripping expert mode PASS 1/2\n"
 msgstr "Ripping expert mode PASS 1/2\n"
 
-#: src/cd_audio_extract.c:784
-msgid "Extraction mode expert PASS 2/2\n"
+#: src/cd_audio_extract.c:795
+msgid "Ripping expert mode PASS 2/2\n"
 msgstr "Ripping expert mode PASS 2/2\n"
 
-#: src/cd_audio_extract.c:792
-msgid "Controle du contenu des fichiers extraits\n"
+#: src/cd_audio_extract.c:803
+msgid "Control the content of the extracted files\n"
 msgstr "Control the content of the extracted files\n"
 
-#: src/cd_audio_extract.c:1678 src/cd_audio_extract.c:1680
+#: src/cd_audio_extract.c:1710 src/cd_audio_extract.c:1712
 msgid "XCFA: Extraction CD"
-msgstr "XCFA: CD Ripping"
+msgstr "XCFA: Extraction CD"
 
-#: src/cd_audio_extract.c:1678 src/dvd_extract.c:412 src/file_action.c:190
-#: src/file_mp3ogg_conv.c:300 src/file_wav_conv.c:349
+#: src/cd_audio_extract.c:1710 src/dvd_extract.c:412 src/file_action.c:183
+#: src/file_mp3ogg_conv.c:329 src/file_wav_conv.c:343
 msgid "Ok"
-msgstr "Okay"
+msgstr "Ok"
 
-#: src/cd_audio_extract.c:1680 src/dvd_extract.c:414 src/file_action.c:192
-#: src/file_mp3ogg_conv.c:302 src/file_wav_conv.c:351
-msgid "Arret par l'utilisateur"
-msgstr "Stopped by user"
+#: src/cd_audio_extract.c:1712 src/dvd_extract.c:414 src/file_action.c:185
+#: src/file_mp3ogg_conv.c:331 src/file_wav_conv.c:345
+msgid "Stop by user"
+msgstr "Stop by user"
 
-#: src/cd_audio_extract.c:1938
-msgid "Nom de fichier unique absent"
+#: src/cd_audio_extract.c:1983
+msgid "File name not found"
 msgstr "File name not found"
 
-#: src/cd_audio_extract.c:1939
-msgid "Veuillez saisir un nom pour le fichier unique"
+#: src/cd_audio_extract.c:1984
+msgid "Please enter a file name"
 msgstr "Please enter a file name"
 
-#: src/cd_audio_toc.c:160
+#: src/cd_audio_toc.c:156
 msgid "cdda2wav and icedax NOT FOUND"
 msgstr "cdda2wav and icedax NOT FOUND"
 
-#: src/cd_audio_toc.c:161
+#: src/cd_audio_toc.c:157
 msgid "Please, install packages [ icedax, cdda2wav ]"
 msgstr "Please, install packages [ icedax, cdda2wav ]"
 
-#: src/cd_audio_toc.c:166
+#: src/cd_audio_toc.c:163
 msgid "icedax NOT FOUND"
 msgstr "icedax NOT FOUND"
 
-#: src/cd_audio_toc.c:167
+#: src/cd_audio_toc.c:164
 msgid "Please, install package [ icedax ]"
 msgstr "Please, install package [ icedax ]"
 
-#: src/cd_audio_toc.c:172
+#: src/cd_audio_toc.c:170
 msgid "cdda2wav NOT FOUND"
 msgstr "cdda2wav NOT FOUND"
 
-#: src/cd_audio_toc.c:173
+#: src/cd_audio_toc.c:171
 msgid "Please, install package [ cdda2wav ]"
 msgstr "Please, install package [ cdda2wav ]"
 
-#: src/cd_audio_toc.c:181
+#: src/cd_audio_toc.c:180
 msgid "cdparanoia NOT FOUND"
 msgstr "cdparanoia NOT FOUND"
 
-#: src/cd_audio_toc.c:182
+#: src/cd_audio_toc.c:181
 msgid "Please, install package [ cdparanoia ]"
 msgstr "Please, install package [ cdparanoia ]"
 
@@ -247,1325 +192,1292 @@
 
 #: src/cd_audio_toc.c:189
 msgid "Please, install packages [ cd-discid ]"
-msgstr "Please, install package [ cd-discid ]"
+msgstr "Please, install packages [ cd-discid ]"
 
-#: src/cd_audio_toc.c:202
-msgid "ERREUR datas proxy"
+#: src/cd_audio_toc.c:203
+msgid "ERROR datas proxy"
 msgstr "ERROR datas proxy"
 
-#: src/cd_audio_toc.c:203
-msgid "Veuillez renseigner les champs du proxy"
+#: src/cd_audio_toc.c:204
+msgid "Please complete all fields proxy"
 msgstr "Please complete all fields proxy"
 
-#: src/cd_curl.c:718 src/web.c:160
-msgid "La liaison internet est absente"
+#: src/cd_curl.c:734 src/web.c:187
+msgid "A web connection is missing"
 msgstr "A web connection is missing"
 
-#: src/cd_curl.c:1122
+#: src/cd_curl.c:1204
 msgid "Couldn't find CD"
 msgstr "Couldn't find CD"
 
-#: src/cd_curl.c:1185
+#: src/cd_curl.c:1267
 msgid "No Audio CD"
 msgstr "No Audio CD"
 
-#: src/dvd.c:863
+#: src/dvd.c:877
 msgid ""
-"(Click Droit = Menu) / PEAK-ALBUM: Amplification maximale du volume pour un "
-"groupe de fichiers en respectant les ecarts de niveau entre chacun d'eux."
+"(Right click = Menu) / Maximum volume amplification of a group of files "
+"keeping the level difference between each of them."
 msgstr ""
 "(Right click = Menu) / Maximum volume amplification of a group of files "
-"keeping the level difference between each of them"
+"keeping the level difference between each of them."
 
-#: src/dvd.c:866
-msgid ""
-"(Click Droit = Menu) / PEAK: Amplification maximale du volume pour chaque de "
-"fichier."
-msgstr ""
-"(Right click = Menu) / PEAK: Maximum volume amplification for each file"
+#: src/dvd.c:882 src/file.c:2882
+msgid "PEAK: Maximum volume amplification of each file."
+msgstr "PEAK: Maximum volume amplification of each file."
+
+#: src/dvd.c:887
+msgid "(Right click = Menu) / ReplayGain: Waiting for selection."
+msgstr "(Right click = Menu) / ReplayGain: Waiting for selection."
 
-#: src/dvd.c:904 src/dvd.c:924
-msgid "En attente de selection. Un click activera la conversion vers 2 canaux."
+#: src/dvd.c:920 src/dvd.c:940
+msgid ""
+"Waiting for selection. A click will activate the conversion to 2 channels."
 msgstr ""
 "Waiting for selection. A click will activate the conversion to 2 channels."
 
-#: src/dvd.c:916
-msgid "Conversion vers 2 canaux."
+#: src/dvd.c:932
+msgid "Conversion to 2 channels."
 msgstr "Conversion to 2 channels."
 
-#: src/dvd.c:928
+#: src/dvd.c:944
 #, c-format
-msgid "Conversion vers %s canaux."
+msgid "Conversion to %s channels."
 msgstr "Conversion to %s channels."
 
-#: src/dvd.c:933
+#: src/dvd.c:949
 #, c-format
 msgid ""
-"Conversion vers 2 canaux. Un second click activera la conversion vers %s "
-"canaux."
+"Conversion to 2 channels. A second click will activate the conversion to %s "
+"channels."
 msgstr ""
 "Conversion to 2 channels. A second click will activate the conversion to %s "
 "channels."
 
-#: src/dvd.c:948
-msgid "Musique en ecoute."
+#: src/dvd.c:964
+msgid "Playing music."
 msgstr "Playing music."
 
-#: src/dvd.c:951
-msgid "Musique en attente."
+#: src/dvd.c:967
+msgid "Music paused."
 msgstr "Music paused."
 
-#: src/dvd.c:966
+#: src/dvd.c:982
 #, c-format
 msgid "Total selection%s: %d, 2ch: %d"
 msgstr "Total selection%s: %d, 2ch: %d"
 
-#: src/dvd.c:967
+#: src/dvd.c:983
 msgid "s"
 msgstr "s"
 
-#: src/dvd.c:973
-msgid "Ce fichier ne peut etre extrait !"
+#: src/dvd.c:989
+msgid "This file can not be ripped !"
 msgstr "This file can not be ripped !"
 
-#: src/dvd.c:1091
-msgid "Titres"
-msgstr "Titls"
+#: src/dvd.c:1107
+msgid "Titles"
+msgstr "Titles"
 
-#: src/dvd.c:1115 src/file.c:3375 src/file_mp3ogg.c:1272 src/file_tags.c:1193
-#: src/translate.c:337
-msgid "Temps"
+#: src/dvd.c:1119 glade/xcfa_win_treeview.glade:112
+#: glade/xcfa_win_treeview.glade:356 glade/xcfa_win_treeview.glade:740
+msgid "Play"
+msgstr "Play"
+
+#: src/dvd.c:1131 src/file.c:3386 src/file_mp3ogg.c:949 src/file_tags.c:1237
+#: glade/xcfa_win_treeview.glade:543 glade/xcfa_win_treeview.glade:944
+#: glade/xcfa_win_treeview.glade:1491 glade/xcfa_win_treeview.glade:1689
+msgid "Time"
 msgstr "Time"
 
-#: src/dvd.c:1127 src/translate.c:338
+#: src/dvd.c:1143 glade/xcfa_win_treeview.glade:146
 msgid "Format"
 msgstr "Format"
 
-#: src/dvd.c:1139 src/translate.c:339
-msgid "Choix"
+#: src/dvd.c:1155
+msgid "Choice"
 msgstr "Choice"
 
-#: src/dvd.c:1253
-msgid "Fichier structure DVD"
+#: src/dvd.c:1267
+msgid "DVD file structure"
 msgstr "DVD file structure"
 
-#: src/dvd.c:1303
-msgid "Le DVD est absent du lecteur."
+#: src/dvd.c:1320
+msgid "The DVD player is absent."
 msgstr "The DVD player is absent."
 
-#: src/dvd.c:1338
-msgid "Scan ..."
-msgstr "Scan ..."
-
-#: src/dvd.c:1387
-msgid "lsdvd est absent !"
+#: src/dvd.c:1410
+msgid "lsdvd is missing !"
 msgstr "lsdvd is missing !"
 
-#: src/dvd.c:1388
-msgid "Il faut installer le programme: lsdvd"
+#: src/dvd.c:1411
+msgid "You must install the program: lsdvd"
 msgstr "You must install the program: lsdvd"
 
 #: src/dvd_extract.c:412 src/dvd_extract.c:414
-msgid "XCFA: Extraction DVD"
+msgid "XCFA: DVD rip"
 msgstr "XCFA: DVD rip"
 
-#: src/dvd_read.c:267
+#: src/dvd_read.c:226
 #, c-format
-msgid "Titre [%02d ** ]"
+msgid "Title [%02d ** ]"
 msgstr "Title [%02d ** ]"
 
-#: src/dvd_read.c:270
+#: src/dvd_read.c:227
 #, c-format
-msgid "Titre [%02d]"
+msgid "Title [%02d]"
 msgstr "Title [%02d]"
 
-#: src/dvd_read.c:313
-#, c-format
-msgid "Fichier_complet_%02d_%s"
-msgstr "Completed_file_%02d_%s"
-
-#: src/dvd_read.c:357
+#: src/dvd_read.c:252
 #, c-format
-msgid "Chapitre: [%02d]"
+msgid "Chapter: [%02d]"
 msgstr "Chapter: [%02d]"
 
-#: src/dvd_read.c:402
-#, c-format
-msgid "Titre_%02d_Chapitre_%02d_audio_%02d_%s"
-msgstr "Title_%02d_Chapter_%02d_audio_%02d_%s"
-
-#: src/file_action.c:190 src/file_action.c:192
-msgid "XCFA: Traitement fichiers"
+#: src/file_action.c:183 src/file_action.c:185
+msgid "XCFA: Processing files"
 msgstr "XCFA: Processing files"
 
-#: src/file_analyze.c:624
+#: src/file_analyze.c:731
 msgid "Package checkmp3 (mp3check) NOT FOUND !"
 msgstr "Package checkmp3 (mp3check) NOT FOUND !"
 
-#: src/file_analyze.c:625
+#: src/file_analyze.c:732
 msgid ""
-"Veuillez installer checkmp3 ou mp3check pour\n"
-"la prise en compte des fichiers mp3"
+"Please install or checkmp3 mp3check for\n"
+"consideration of mp3 files"
 msgstr ""
 "Please install or checkmp3 mp3check for\n"
 "consideration of mp3 files"
 
-#: src/file.c:332
+#: src/file.c:327
 #, c-format
-msgid "Total fichiers: %d, Selections: %d"
-msgstr "Total files: %d, Selected: %d"
+msgid "Total files: %d, Selections: %d"
+msgstr "Total files: %d, Selections: %d"
 
-#: src/file.c:445
-msgid "CAPACITE DOSSIER TEMPORAIRE TROP FAIBLE"
+#: src/file.c:441
+msgid "TEMPORARY CAPACITY TOO LOW"
 msgstr "TEMPORARY CAPACITY TOO LOW"
 
-#: src/file.c:446
-msgid "Pas assez de place dans le dossier temporaire"
+#: src/file.c:442 src/file.c:2875
+msgid "WARNING: Not enough space available in the temp folder."
 msgstr "WARNING: Not enough space available in the temp folder."
 
-#: src/file.c:452
-msgid "Veuillez deselectionner des PeakGroup."
+#: src/file.c:448
+msgid "Please deselect PeakGroup."
 msgstr "Please deselect PeakGroup."
 
-#: src/file.c:1439
-msgid "Conversion(s) vers la source"
+#: src/file.c:1431
+msgid "Conversion(s) to source"
 msgstr "Conversion(s) to source"
 
-#: src/file.c:1440
-msgid "Choix d'une nouvelle destination"
+#: src/file.c:1432
+msgid "Select a new destination"
 msgstr "Select a new destination"
 
-#: src/file.c:1510
+#: src/file.c:1501
 msgid "Select type: --"
-msgstr "Select type: -"
+msgstr "Select type: --"
 
-#: src/file.c:1595
+#: src/file.c:1584
 msgid "Peak/album"
 msgstr "Peak/album"
 
-#: src/file.c:1596
+#: src/file.c:1585
 msgid "Peak"
 msgstr "Peak"
 
-#: src/file.c:1597
+#: src/file.c:1586
 msgid "Mix (scan)Rms/album"
 msgstr "Mix (scan)Rms/album"
 
-#: src/file.c:1598
+#: src/file.c:1587
 msgid "Fix (scan)Rms"
 msgstr "Fix (scan)Rms"
 
-#: src/file.c:2854
+#: src/file.c:2834
+msgid "The external ripping program is missing"
+msgstr "The external ripping program is missing"
+
+#: src/file.c:2840
+msgid "(Right click = Menu) / Waiting for Selection. File exists."
+msgstr "(Right click = Menu) / Waiting for Selection. File exists."
+
+#: src/file.c:2843
+msgid "(Right click = Menu) / Selected files"
+msgstr "(Right click = Menu) / Selected files"
+
+#: src/file.c:2861
 #, c-format
-msgid "MAX FICHIERS ATTEINT = %d"
+msgid "MAX FILES REACHED = %d"
 msgstr "MAX FILES REACHED = %d"
 
-#: src/file.c:2864
-msgid "Normalise: En attente de selection."
+#: src/file.c:2871
+msgid "Normalise: Waiting for selection."
 msgstr "Normalise: Waiting for selection."
 
-#: src/file.c:2868
-msgid "ATTENTION: Pas assez de place dans le dossier temporaire."
-msgstr "WARNING: Not enough space available in the temp folder."
-
-#: src/file.c:2871
+#: src/file.c:2878
 msgid ""
-"PEAK-ALBUM: Amplification maximale du volume pour un groupe de fichiers en "
-"respectant les ecarts de niveau entre chacun d'eux."
+"PEAK-ALBUM: Maximum volume amplification for a group of files according to "
+"the deviations in level between them"
 msgstr ""
 "PEAK-ALBUM: Maximum volume amplification for a group of files according to "
 "the deviations in level between them"
 
-#: src/file.c:2875
-msgid "PEAK: Amplification maximale du volume pour chaque de fichier."
-msgstr "PEAK: Maximum volume amplification of each file."
-
-#: src/file.c:2878
+#: src/file.c:2885
 msgid ""
-"RMS-ALBUM: Ajustement du volume moyen pour un groupe de fichiers en "
-"respectant les ecarts de niveau moyen entre chacun d'eux."
+"RMS-ALBUM: Adjusting the average volume for a group of files according to "
+"the average level of deviation between them."
 msgstr ""
 "RMS-ALBUM: Adjusting the average volume for a group of files according to "
 "the average level of deviation between them."
 
-#: src/file.c:2881
-msgid "RMS: Ajustement du volume moyen de chaque de fichier."
+#: src/file.c:2888
+msgid "RMS: Average volume amplification of each file."
 msgstr "RMS: Average volume amplification of each file."
 
-#: src/file.c:2895
-msgid "(Click Droit = Menu) / ReplayGain: En attente de selection."
-msgstr "(Click Droit = Menu) / ReplayGain: Waiting for selection."
+#: src/file.c:2902
+msgid "(Right Click = Menu) / ReplayGain: Waiting for selection."
+msgstr "(Right Click = Menu) / ReplayGain: Waiting for selection."
 
-#: src/file.c:2898
-msgid "(Click Droit = Menu) / Mode piste."
-msgstr "(Click Droit = Menu) / Track mode."
+#: src/file.c:2905
+msgid "(Right Click = Menu) / Track mode."
+msgstr "(Right Click = Menu) / Track mode."
 
-#: src/file.c:2901
-msgid "(Click Droit = Menu) / Mode album."
-msgstr "(Click Droit = Menu) / Album mode."
+#: src/file.c:2908
+msgid "(Right Click = Menu) / Album mode."
+msgstr "(Right Click = Menu) / Album mode."
 
-#: src/file.c:2904
-msgid "(Click Droit = Menu) / Mode effacer."
-msgstr "(Click Droit = Menu) / Erase mode."
+#: src/file.c:2911
+msgid "(Right Click = Menu) / Erase mode."
+msgstr "(Right Click = Menu) / Erase mode."
 
-#: src/file.c:3016
+#: src/file.c:3026
 msgid ""
-"(Click Droit = Menu) / Cliquez ici pour envoyer ce fichier apres traitement "
-"a la corbeille"
+"(Click Droit = Menu) / Click here to send the processed file to the trash"
 msgstr ""
 "(Click Droit = Menu) / Click here to send the processed file to the trash"
 
-#: src/file.c:3019
+#: src/file.c:3029
 msgid ""
-"(Click Droit = Menu) / Ce fichier sera dirige apres traitement vers la "
-"corbeille"
+"(Right Click = Menu) / This file will be sent to the trash after processing"
 msgstr ""
 "(Right Click = Menu) / This file will be sent to the trash after processing"
 
-#: src/file.c:3152 src/file_trash.c:367 src/translate.c:367
+#: src/file.c:3163 src/file_trash.c:208 glade/xcfa_win_treeview.glade:757
 msgid "Trash"
 msgstr "Trash"
 
-#: src/file.c:3172 src/file_mp3ogg.c:1212 src/file_tags.c:1178
-#: src/translate.c:368 src/translate.c:399 src/translate.c:410
+#: src/file.c:3183 src/file_mp3ogg.c:889 src/file_tags.c:1222
+#: glade/xcfa_win_treeview.glade:774 glade/xcfa_win_treeview.glade:1423
+#: glade/xcfa_win_treeview.glade:1672
 msgid "Type"
 msgstr "Type"
 
-#: src/file.c:3411
-msgid "ReplayGain"
-msgstr "ReplayGain"
-
-#: src/file_mp3ogg.c:771
-msgid "128 -defaut"
-msgstr "128 -default"
-
-#: src/file_mp3ogg.c:787
-msgid "V0 -meilleure qualite"
-msgstr "V0 -best quality"
-
-#: src/file_mp3ogg.c:791 src/file_mp3ogg.c:811
-msgid "V4 -defaut"
-msgstr "V4 -default"
+#: src/file_conv.c:1187
+msgid "Error since MPLAYER !"
+msgstr "Error since MPLAYER !"
 
-#: src/file_mp3ogg.c:796
-msgid "V9 -moins bonne qualite"
-msgstr "V9 -worst quality"
+#: src/file_conv.c:1188 src/file_conv.c:1200 src/file_mp3ogg_conv.c:337
+#: src/file_mp3ogg_conv.c:349
+msgid "You can enable XCFA command line with: "
+msgstr "You can enable XCFA command line with: "
 
-#: src/file_mp3ogg.c:849
-msgid "Defaut"
-msgstr "Default"
+#: src/file_conv.c:1190 src/file_conv.c:1202 src/file_mp3ogg_conv.c:339
+#: src/file_mp3ogg_conv.c:351
+msgid "$ xcfa -verbose"
+msgstr "$ xcfa -verbose"
 
-#: src/file_mp3ogg.c:884
-msgid "Qualite -1 -Moins bonne qualite"
-msgstr "Quality -1 -worst quality"
+#: src/file_conv.c:1192 src/file_mp3ogg_conv.c:341
+msgid "to see the type of error returned by mplayer."
+msgstr "to see the type of error returned by mplayer."
 
-#: src/file_mp3ogg.c:885 src/options_oggenc.c:149
-msgid "Qualite 0"
-msgstr "Quality 0"
-
-#: src/file_mp3ogg.c:886 src/options_oggenc.c:150
-msgid "Qualite 1"
-msgstr "Quality 1"
-
-#: src/file_mp3ogg.c:887 src/options_oggenc.c:151
-msgid "Qualite 2"
-msgstr "Quality 2"
-
-#: src/file_mp3ogg.c:888
-msgid "Qualite 3 -Defaut"
-msgstr "Quality 3 -Default"
-
-#: src/file_mp3ogg.c:889 src/options_oggenc.c:153
-msgid "Qualite 4"
-msgstr "Quality 4"
-
-#: src/file_mp3ogg.c:890 src/options_oggenc.c:154
-msgid "Qualite 5"
-msgstr "Quality 5"
-
-#: src/file_mp3ogg.c:891 src/options_oggenc.c:155
-msgid "Qualite 6"
-msgstr "Quality 6"
-
-#: src/file_mp3ogg.c:892 src/options_oggenc.c:156
-msgid "Qualite 7"
-msgstr "Quality 7"
-
-#: src/file_mp3ogg.c:893 src/options_oggenc.c:157
-msgid "Qualite 8"
-msgstr "Quality 8"
+#: src/file_conv.c:1199
+msgid "Error since SOX !"
+msgstr "Error since SOX !"
 
-#: src/file_mp3ogg.c:894 src/options_oggenc.c:158
-msgid "Qualite 9"
-msgstr "Quality 9"
-
-#: src/file_mp3ogg.c:895
-msgid "Qualite 10 -Meilleure qualite"
-msgstr "Quality 10 -Best quality"
-
-#: src/file_mp3ogg.c:926 src/options_oggenc.c:189 src/options_wavpack.c:186
-#: src/options_wavpack.c:209 src/options_wavpack.c:232
-msgid "Oui"
-msgstr "Yes"
-
-#: src/file_mp3ogg.c:927 src/options_oggenc.c:190 src/options_wavpack.c:153
-#: src/options_wavpack.c:185 src/options_wavpack.c:208
-#: src/options_wavpack.c:231 src/options_wavpack.c:252
-msgid "Non"
-msgstr "No"
-
-#: src/file_mp3ogg.c:949 src/options_oggenc.c:211
-msgid "Mono force"
-msgstr "Force mono"
+#: src/file_conv.c:1204 src/file_mp3ogg_conv.c:353
+msgid "to see the type of error returned by sox."
+msgstr "to see the type of error returned by sox."
 
-#: src/file_mp3ogg.c:950 src/options_oggenc.c:212
-msgid "Stereo"
-msgstr "Stereo"
-
-#: src/file_mp3ogg.c:1228 src/translate.c:400
-msgid "Bitrate"
-msgstr "Bitrate"
+#: src/file_mp3ogg.c:670
+msgid "Right click: access popup"
+msgstr "Right click: access popup"
 
-#: src/file_mp3ogg.c:1244
-msgid "Nouveau bitrate"
+#: src/file_mp3ogg.c:921
+msgid "New bitrate"
 msgstr "New bitrate"
 
-#: src/file_mp3ogg.c:1258
-msgid "Taille"
+#: src/file_mp3ogg.c:935 glade/xcfa_win_treeview.glade:1474
+msgid "Size"
 msgstr "Size"
 
-#: src/file_mp3ogg_conv.c:300 src/file_mp3ogg_conv.c:302
-msgid "XCFA: Modification bitrate"
+#: src/file_mp3ogg_conv.c:329 src/file_mp3ogg_conv.c:331
+msgid "XCFA: Bitrate change"
 msgstr "XCFA: Bitrate change"
 
-#: src/file_mp3ogg_conv.c:379
+#: src/file_mp3ogg_conv.c:336
+msgid "Error from MPLAYER !"
+msgstr "Error from MPLAYER !"
+
+#: src/file_mp3ogg_conv.c:348
+msgid "Error from SOX !"
+msgstr "Error from SOX !"
+
+#: src/file_mp3ogg_conv.c:432
 #, c-format
-msgid " ATTENTION: Il faut installer %s%s%s"
+msgid " WARNING : you need to install %s%s%s"
 msgstr " WARNING : you need to install %s%s%s"
 
-#: src/file_mp3ogg_conv.c:387
+#: src/file_mp3ogg_conv.c:440
 #, c-format
-msgid " ATTENTION: Il faut installer %s%s"
+msgid " WARNING : you need to install %s%s"
 msgstr " WARNING : you need to install %s%s"
 
-#: src/file_mp3ogg_conv.c:394
+#: src/file_mp3ogg_conv.c:447
 #, c-format
-msgid " ATTENTION: Il faut installer %s"
+msgid " WARNING : you need to install %s"
 msgstr " WARNING : you need to install %s"
 
-#: src/file_mp3ogg_conv.c:400
+#: src/file_mp3ogg_conv.c:454
 msgid "Package NOT FOUND !"
 msgstr "Package NOT FOUND !"
 
-#: src/fileselect.c:116
-msgid "Choix d'un dossier de destination"
-msgstr "Select a destination folder"
+#: src/fileselect.c:105
+msgid "Choosing a destination folder"
+msgstr "Choosing a destination folder"
 
-#: src/fileselect.c:117
-msgid "Choix d'un fichier CUE WAV FLAC OGG MP3 APE WMA"
-msgstr "Select CUE WAV FLAC OGG MP3 APE WMA files"
+#: src/fileselect.c:106
+msgid "Choosing a file CUE WAV FLAC OGG MP3 APE WMA"
+msgstr "Choosing a file CUE WAV FLAC OGG MP3 APE WMA"
 
-#: src/fileselect.c:118
-msgid "Choix d'un fichier musical"
-msgstr "Selecting a music file"
+#: src/fileselect.c:107
+msgid "Choosing a file musical"
+msgstr "Choosing a file musical"
 
-#: src/fileselect.c:119
-msgid "Choix d'un fichier"
-msgstr "Select a file"
+#: src/fileselect.c:108 src/fileselect.c:109
+msgid "Choosing a file"
+msgstr "Choosing a file"
 
-#: src/fileselect.c:120
-msgid "Choix de fichiers"
-msgstr "Select files"
+#: src/fileselect.c:110
+msgid "Choosing a WAV file"
+msgstr "Choosing a WAV file"
 
-#: src/fileselect.c:121
-msgid "Choix de fichiers WAV"
-msgstr "Select a WAV file"
+#: src/fileselect.c:111
+msgid "Choosing a MP3 OGG file"
+msgstr "Choosing a MP3 OGG file"
 
-#: src/fileselect.c:122
-msgid "Choix de fichiers MP3/OGG"
-msgstr "Select MP3/OGG file"
+#: src/fileselect.c:112
+msgid "Choosing a FLAC MPC OGG MP3 file"
+msgstr "Choosing a FLAC MPC OGG MP3 file"
 
-#: src/fileselect.c:123
-msgid "Choix de fichiers FLAC MPC OGG MP3"
-msgstr "Select FLAC MPC OGG MP3 files"
+#: src/fileselect.c:113
+msgid "Import pictures for the cover"
+msgstr "Import pictures for the cover"
 
-#: src/fileselect.c:124
-msgid "Importer des images pour la pochette"
-msgstr "Import images for the cover"
+#: src/fileselect.c:114
+msgid "Choosing an Image Storage path"
+msgstr "Choosing an Image Storage path"
 
-#: src/fileselect.c:125
-msgid "Choix d'un chemin de stockage des images"
-msgstr "Select location for image storage"
+#: src/fileselect.c:115
+msgid "Choosing a place for backup"
+msgstr "Choosing a place for backup"
 
-#: src/fileselect.c:126
-msgid "Choix d'un lieu de sauvegarde"
-msgstr "Select a backup location"
+#: src/fileselect.c:396 src/fileselect.c:415 src/fileselect.c:703
+msgid "Cancel"
+msgstr "Cancel"
 
-#: src/fileselect.c:475 src/fileselect.c:591 src/fileselect.c:599
-#: src/fileselect.c:622
+#: src/fileselect.c:398 src/fileselect.c:417 src/fileselect.c:705
+msgid "Open"
+msgstr "Open"
+
+#: src/fileselect.c:494 src/fileselect.c:617 src/fileselect.c:627
+#: src/fileselect.c:650
 msgid "All Files (*.*)"
 msgstr "All Files (*.*)"
 
-#: src/file_trash.c:368
+#: src/file_trash.c:211
 msgid "Trash files ..."
 msgstr "Trash files ..."
 
-#: src/file_wav.c:629
-msgid "(Click Droit = Menu) / Choix de la frequence"
+#: src/file_wav.c:485
+msgid "(Right Click = Menu) / Select frequency"
 msgstr "(Right Click = Menu) / Select frequency"
 
-#: src/file_wav.c:632
-msgid "(Click Droit = Menu) / Choix du nombre de pistes (voies)"
+#: src/file_wav.c:488
+msgid "(Right Click = Menu) / Select number of tracks (channels)"
 msgstr "(Right Click = Menu) / Select number of tracks (channels)"
 
-#: src/file_wav.c:635
-msgid "(Click Droit = Menu) / Choix du codage en nombre de bits"
+#: src/file_wav.c:491
+msgid "(Right Click = Menu) / Encoding selection in number of bits"
 msgstr "(Right Click = Menu) / Encoding selection in number of bits"
 
-#: src/file_wav.c:861
-msgid "Frequence"
+#: src/file_wav.c:739
+msgid "Frequency"
 msgstr "Frequency"
 
-#: src/file_wav.c:877
-msgid "FREQUENCE"
+#: src/file_wav.c:755
+msgid "FREQUENCY"
 msgstr "FREQUENCY"
 
-#: src/file_wav.c:891
-msgid "Piste"
+#: src/file_wav.c:769
+msgid "Track"
 msgstr "Track"
 
-#: src/file_wav.c:907
-msgid "PISTE"
+#: src/file_wav.c:785
+msgid "TRACK"
 msgstr "TRACK"
 
-#: src/file_wav.c:921
+#: src/file_wav.c:799
 msgid "Quantification"
 msgstr "Quantification"
 
-#: src/file_wav.c:937
+#: src/file_wav.c:815
 msgid "QUANTIFICATION"
 msgstr "QUANTIFICATION"
 
-#: src/file_wav_conv.c:265
+#: src/file_wav_conv.c:261
 #, c-format
-msgid "%s Copie fichier: %d%%"
+msgid "%s Copy file: %d%%"
 msgstr "%s Copy file: %d%%"
 
-#: src/file_wav_conv.c:275
+#: src/file_wav_conv.c:271
 #, c-format
-msgid "%s Restitution fichier: %d%%"
+msgid "%s Return file: %d%%"
 msgstr "%s Return file: %d%%"
 
-#: src/file_wav_conv.c:285
+#: src/file_wav_conv.c:281
 #, c-format
-msgid "%s Traitement Sox: %d%%"
+msgid "%s Use Sox: %d%%"
 msgstr "%s Use Sox: %d%%"
 
-#: src/file_wav_conv.c:302
+#: src/file_wav_conv.c:298
 #, c-format
-msgid "%s Traitement Mplayer: %d%%"
+msgid "%s Use Mplayer: %d%%"
 msgstr "%s Use Mplayer: %d%%"
 
-#: src/file_wav_conv.c:349 src/file_wav_conv.c:351
+#: src/file_wav_conv.c:343 src/file_wav_conv.c:345
 msgid "XCFA: Conversions WAV TO WAV"
 msgstr "XCFA: Conversions WAV TO WAV"
 
-#: src/main.c:372
-msgid "= Adressage memoire invalide\n"
-msgstr "= Invalid memory address\n"
-
-#: src/main.c:375
-msgid "= Vous avez probablement trouve un bug dans XCFA\n"
-msgstr "= You've probably found a bug in XCFA\n"
-
-#: src/main.c:676
-msgid "MODE ADMINISTRATEUR"
+#: src/main.c:644
+msgid "ADMINISTRATOR MODE"
 msgstr "ADMINISTRATOR MODE"
 
-#: src/main.c:678
-msgid " Vous ne devriez pas utiliser "
-msgstr " You should not use "
+#: src/main.c:646
+msgid " You should not use "
+msgstr " You should not use "
 
-#: src/main.c:680
-msgid " XCFA sous ROOT !"
+#: src/main.c:648
+msgid " XCFA under ROOT !"
 msgstr " XCFA under ROOT !"
 
-#: src/options.c:175
-msgid "ERREUR: Lieu de stockage non autorise !"
+#: src/options.c:169
+msgid "ERROR : storage location not permitted !"
 msgstr "ERROR : storage location not permitted !"
 
-#: src/options.c:176
-msgid "Veuillez recommencer."
+#: src/options.c:170
+msgid "Please start again."
 msgstr "Please start again."
 
-#: src/options_cd.c:120
-msgid "Pour evaluer les templates, vous devez activer une lecture de cdaudio"
+#: src/options_cd.c:122
+msgid "To assess the templates, you must enable a reading cdaudio"
 msgstr "To assess the templates, you must enable a reading cdaudio"
 
-#: src/options_faac.c:101
+#: src/options_faac.c:94
 msgid "Transport Stream (ADTS) - Extension .aac"
 msgstr "Transport Stream (ADTS) - Extension .aac"
 
-#: src/options_faac.c:102
+#: src/options_faac.c:95
 msgid "MPEG-4 File Format (MP4) - Extension .m4a"
 msgstr "MPEG-4 File Format (MP4) - Extension .m4a"
 
-#: src/options_flac.c:72
-msgid "0 (Rapide)"
+#: src/options_flac.c:65
+msgid "0 (Fast)"
 msgstr "0 (Fast)"
 
-#: src/options_flac.c:80
-msgid "8 (Lent)"
-msgstr "8 (Slow)"
+#: src/options_flac.c:73
+msgid "8 (Low)"
+msgstr "8 (Low)"
 
-#: src/options_mp3.c:298
-msgid "V0 (meilleure qualite)"
-msgstr "V0·····(Best quality)"
+#: src/options_mp3.c:276
+msgid "V0 (Best quality)"
+msgstr "V0 (Best quality)"
 
-#: src/options_mp3.c:307
-msgid "V9 (moins bonne qualite)"
-msgstr "V9·····(Poor quality)"
+#: src/options_mp3.c:285
+msgid "V9 (Poor quality)"
+msgstr "V9 (Poor quality)"
 
-#: src/options_musepack.c:75
+#: src/options_musepack.c:68
 msgid "telephone: lowest quality : 32 .. 48 kbit/s"
-msgstr "Phone: (Lowest quality) : 32 .. 48 kbit/s"
+msgstr "telephone: lowest quality : 32 .. 48 kbit/s"
 
-#: src/options_musepack.c:76
+#: src/options_musepack.c:69
 msgid "thumb : low quality/internet : 58 .. 86 kbit/s"
 msgstr "thumb : low quality/internet : 58 .. 86 kbit/s"
 
-#: src/options_musepack.c:77
+#: src/options_musepack.c:70
 msgid "radio : medium (MP3) quality : 112 .. 152 kbit/s"
 msgstr "radio : medium (MP3) quality : 112 .. 152 kbit/s"
 
-#: src/options_musepack.c:78
+#: src/options_musepack.c:71
 msgid "standard : high quality (dflt) : 142 .. 184 kbit/s"
 msgstr "standard : high quality (dflt) : 142 .. 184 kbit/s"
 
-#: src/options_musepack.c:79
+#: src/options_musepack.c:72
 msgid "xtreme : extreme high quality : 168 .. 212 kbit/s"
 msgstr "xtreme : extreme high quality : 168 .. 212 kbit/s"
 
-#: src/options_musepack.c:80
+#: src/options_musepack.c:73
 msgid "insane : extreme high quality : 232 .. 268 kbit/s"
 msgstr "insane : extreme high quality : 232 .. 268 kbit/s"
 
-#: src/options_musepack.c:81
+#: src/options_musepack.c:74
 msgid "braindead : extreme high quality : 232 .. 278 kbit/s"
 msgstr "braindead : extreme high quality : 232 .. 278 kbit/s"
 
-#: src/options_oggenc.c:148
-msgid "Qualite -1 (Moins bonne qualite)"
+#: src/options_oggenc.c:137
+msgid "Quality -1 (Poor quality)"
 msgstr "Quality -1 (Poor quality)"
 
-#: src/options_oggenc.c:152
-msgid "Qualite 3"
+#: src/options_oggenc.c:138 src/popup.c:1294
+msgid "Quality 0"
+msgstr "Quality 0"
+
+#: src/options_oggenc.c:139 src/popup.c:1294
+msgid "Quality 1"
+msgstr "Quality 1"
+
+#: src/options_oggenc.c:140 src/popup.c:1294
+msgid "Quality 2"
+msgstr "Quality 2"
+
+#: src/options_oggenc.c:141
+msgid "Quality 3"
 msgstr "Quality 3"
 
-#: src/options_oggenc.c:159
-msgid "Qualite 10 (Meilleure qualite)"
+#: src/options_oggenc.c:142 src/popup.c:1295
+msgid "Quality 4"
+msgstr "Quality 4"
+
+#: src/options_oggenc.c:143 src/popup.c:1295
+msgid "Quality 5"
+msgstr "Quality 5"
+
+#: src/options_oggenc.c:144 src/popup.c:1295
+msgid "Quality 6"
+msgstr "Quality 6"
+
+#: src/options_oggenc.c:145 src/popup.c:1295
+msgid "Quality 7"
+msgstr "Quality 7"
+
+#: src/options_oggenc.c:146 src/popup.c:1296
+msgid "Quality 8"
+msgstr "Quality 8"
+
+#: src/options_oggenc.c:147 src/popup.c:1296
+msgid "Quality 9"
+msgstr "Quality 9"
+
+#: src/options_oggenc.c:148
+msgid "Quality 10 (Best quality)"
 msgstr "Quality 10 (Best quality)"
 
-#: src/options_wavpack.c:105
-msgid "Mode normal"
+#: src/options_oggenc.c:176 src/options_wavpack.c:173
+#: src/options_wavpack.c:194 src/options_wavpack.c:215 src/popup.c:1298
+msgid "Yes"
+msgstr "Yes"
+
+#: src/options_oggenc.c:177 src/options_wavpack.c:142
+#: src/options_wavpack.c:172 src/options_wavpack.c:193
+#: src/options_wavpack.c:214 src/options_wavpack.c:233 src/popup.c:1298
+msgid "No"
+msgstr "No"
+
+#: src/options_oggenc.c:196
+msgid "Force mono"
+msgstr "Force mono"
+
+#: src/options_oggenc.c:197
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/options_wavpack.c:98
+msgid "Standard"
 msgstr "Standard"
 
-#: src/options_wavpack.c:106
-msgid "Mode rapide de compression"
+#: src/options_wavpack.c:99
+msgid "Fast (Faster encode and decode)"
 msgstr "Fast (Faster encode and decode)"
 
-#: src/options_wavpack.c:107
-msgid "Bonne qualite de compression"
+#: src/options_wavpack.c:100
+msgid "High quality (Better compression ratio)"
 msgstr "High quality (Better compression ratio)"
 
-#: src/options_wavpack.c:108
-msgid "Meilleure qualite de compression"
+#: src/options_wavpack.c:101
+msgid "Very high quality (Best compression but slowest)"
 msgstr "Very high quality (Best compression but slowest)"
 
-#: src/options_wavpack.c:134
+#: src/options_wavpack.c:125
 msgid "stereo left/right"
 msgstr "stereo left/right"
 
-#: src/options_wavpack.c:135
+#: src/options_wavpack.c:126
 msgid "stereo mid/side"
 msgstr "stereo mid/side"
 
-#: src/options_wavpack.c:253
+#: src/options_wavpack.c:234
 msgid "1 (fast / rapide)"
-msgstr "1 (fast)"
+msgstr "1 (fast / rapide)"
 
-#: src/options_wavpack.c:258
+#: src/options_wavpack.c:239
 msgid "6 (very slow / tres lent)"
-msgstr "6 (very slow)"
+msgstr "6 (very slow / tres lent)"
 
-#: src/play_file.c:112
-msgid "PAS de lecteur audio present"
+#: src/play_file.c:107
+msgid "NO audio player present"
 msgstr "NO audio player present"
 
-#: src/play_file.c:113
-msgid "Veuillez installez un lecteur audio."
-msgstr "Please install an audio player"
+#: src/play_file.c:108
+msgid "Please install an audio player."
+msgstr "Please install an audio player."
 
-#: src/poche_dir.c:436
+#: src/poche_dir.c:433
 msgid ""
 "Utilisez le glisser / deplacer - Effacer une image avec Ctrl + "
 "Click"
 msgstr ""
-"Use drag / drop - delete an image with Ctrl +Click"
+"Utilisez le glisser / deplacer - Effacer une image avec Ctrl + "
+"Click"
 
 #: src/poche_save.c:117
-msgid "Nom de fichier absent !!"
+msgid "File name not found !!"
 msgstr "File name not found !!"
 
-#: src/poche_save.c:118 src/poche_web.c:361 src/poche_web.c:382
-msgid "Pour resoudre ce probleme:"
+#: src/poche_save.c:118 src/poche_web.c:323 src/poche_web.c:345
+msgid "To solve this problem :"
 msgstr "To solve this problem :"
 
 #: src/poche_save.c:121
-msgid "Saisissez un nom de fichier sans extention"
+msgid "Enter a file name without extension"
 msgstr "Enter a file name without extension"
 
-#: src/poche_save.c:132
-msgid "Sauvegarde aux formats PDF et PostScript"
-msgstr "Saving to PDF and PostScript"
+#: src/poche_save.c:131
+msgid "Saving to PDF"
+msgstr "Saving to PDF"
 
-#: src/poche_save.c:157
-msgid "Sauvegarde au format PNG"
-msgstr "Saving as PNG"
-
-#: src/poche_web.c:360
-msgid "Aucun fichier trouve !"
+#: src/poche_web.c:322
+msgid "No file found !"
 msgstr "No file found !"
 
-#: src/poche_web.c:364
-msgid "Modifiez la chaine de recherche et"
+#: src/poche_web.c:326 src/poche_web.c:348
+msgid "Modify the search parameters and"
 msgstr "Modify the search parameters and"
 
-#: src/poche_web.c:366 src/poche_web.c:387
-msgid "recommencez."
-msgstr "start again"
+#: src/poche_web.c:328 src/poche_web.c:350
+msgid "start again."
+msgstr "start again."
 
-#: src/poche_web.c:381
-msgid "Critere de recherche absent !!"
+#: src/poche_web.c:344
+msgid "Search criteria away !!"
 msgstr "Search criteria away !!"
 
-#: src/poche_web.c:385
-msgid "Saisissez une chaine de recherche et"
-msgstr "Enter a search string and"
-
-#: src/poche_web.c:394
-msgid "[Recherche des fichiers images]"
+#: src/poche_web.c:362
+msgid "[Search images files]"
 msgstr "[Search images files]"
 
-#: src/popup.c:87 src/popup.c:106
+#: src/popup.c:81 src/popup.c:100
 msgid " Deselection globale"
-msgstr " Deselect all"
+msgstr " Deselection globale"
 
-#: src/popup.c:88 src/popup.c:107 src/popup.c:168
+#: src/popup.c:82 src/popup.c:101 src/popup.c:162
 msgid " Deselection verticale"
-msgstr " Vertically deselect"
+msgstr " Deselection verticale"
 
-#: src/popup.c:89 src/popup.c:108
+#: src/popup.c:83 src/popup.c:102
 msgid " Deselection horizontale"
-msgstr " Horizontally deselect"
+msgstr " Deselection horizontale"
 
-#: src/popup.c:90 src/popup.c:93 src/popup.c:109 src/popup.c:112
-#: src/popup.c:126 src/popup.c:139 src/popup.c:153
+#: src/popup.c:84 src/popup.c:87 src/popup.c:103 src/popup.c:106
+#: src/popup.c:120 src/popup.c:133 src/popup.c:147
 msgid " ---"
 msgstr " ---"
 
-#: src/popup.c:91 src/popup.c:110
+#: src/popup.c:85 src/popup.c:104
 msgid " Selection verticale"
-msgstr " Vertically select"
+msgstr " Selection verticale"
 
-#: src/popup.c:92 src/popup.c:111
+#: src/popup.c:86 src/popup.c:105
 msgid " Selection Expert verticale"
-msgstr " Vertical expert select"
+msgstr " Selection Expert verticale"
 
-#: src/popup.c:94 src/popup.c:113
+#: src/popup.c:88 src/popup.c:107
 msgid " Selection horizontale"
-msgstr " Horizontally select"
+msgstr " Selection horizontale"
 
-#: src/popup.c:95 src/popup.c:114
+#: src/popup.c:89 src/popup.c:108
 msgid " Selection Expert horizontale "
-msgstr " Horizontal expert select"
+msgstr " Selection Expert horizontale "
 
-#: src/popup.c:125 src/popup.c:138
+#: src/popup.c:119 src/popup.c:132
 msgid " Deselection verticale "
-msgstr " Vertically deselect "
+msgstr " Deselection verticale "
 
-#: src/popup.c:127 src/popup.c:140
+#: src/popup.c:121 src/popup.c:134
 msgid " Selection verticale "
-msgstr " Vertically select "
+msgstr " Selection verticale "
 
-#: src/popup.c:151
+#: src/popup.c:145
 msgid "---SELECTION VERTICALE-----"
-msgstr "---VERTICAL SELECTION------"
+msgstr "---SELECTION VERTICALE-----"
 
-#: src/popup.c:152
+#: src/popup.c:146
 msgid " Deselection verticale "
-msgstr " Vertically deselect "
+msgstr " Deselection verticale "
 
-#: src/popup.c:154
+#: src/popup.c:148
 msgid " Selection PISTE "
-msgstr " TRACK selection "
+msgstr " Selection PISTE "
 
-#: src/popup.c:155
+#: src/popup.c:149
 msgid " Selection ALBUM "
-msgstr " ALBUM selection "
+msgstr " Selection ALBUM "
 
-#: src/popup.c:156
+#: src/popup.c:150
 msgid " Selection NETTOYER "
-msgstr " ERASE selection "
+msgstr " Selection NETTOYER "
 
-#: src/popup.c:167
+#: src/popup.c:161
 msgid "---MENU TRASH--------------"
-msgstr "---TRASH MENU--------------"
+msgstr "---MENU TRASH--------------"
 
-#: src/popup.c:169
+#: src/popup.c:163
 msgid " Selection verticale "
-msgstr " Vertically select "
-
-#: src/popup.c:544 src/popup.c:752 src/popup.c:968
-msgid "Cellule"
-msgstr "Cell"
-
-#: src/popup.c:551 src/popup.c:577
-msgid "1 piste"
-msgstr "1 track"
+msgstr " Selection verticale "
 
-#: src/popup.c:554 src/popup.c:580
-msgid "2 pistes"
-msgstr "2 track"
-
-#: src/popup.c:557 src/popup.c:583
-msgid "4 pistes"
-msgstr "4 track"
-
-#: src/popup.c:560 src/popup.c:586
-msgid "6 pistes"
-msgstr "6 track"
-
-#: src/popup.c:566 src/popup.c:592 src/popup.c:786 src/popup.c:824
-#: src/popup.c:993 src/popup.c:1023
-msgid "Valeur d'origine"
+#: src/popup.c:504 src/popup.c:619 src/popup.c:715
+msgid "Original value"
 msgstr "Original value"
 
-#: src/popup.c:570 src/popup.c:790 src/popup.c:997
-msgid "Colonne"
-msgstr "Column"
-
-#: src/popup.c:759 src/popup.c:797
-msgid " 8000 Hertz"
-msgstr " 8000 Hertz"
-
-#: src/popup.c:762 src/popup.c:800
-msgid "22000 Hertz"
-msgstr "22000 Hertz"
-
-#: src/popup.c:765 src/popup.c:803
-msgid "32000 Hertz"
-msgstr "32000 Hertz"
-
-#: src/popup.c:768 src/popup.c:806
-msgid "44056 Hertz"
-msgstr "44056 Hertz"
-
-#: src/popup.c:771 src/popup.c:809
-msgid "44100 Hertz"
-msgstr "44100 Hertz"
+#: src/popup.c:765
+msgid "Next selector"
+msgstr "Next selector"
 
-#: src/popup.c:774 src/popup.c:812
-msgid "48000 Hertz"
-msgstr "48000 Hertz"
-
-#: src/popup.c:777 src/popup.c:815
-msgid "88200 Hertz"
-msgstr "88200 Hertz"
-
-#: src/popup.c:780 src/popup.c:818
-msgid "96000 Hertz"
-msgstr "96000 Hertz"
-
-#: src/popup.c:975 src/popup.c:1004
-msgid " 8 bits"
-msgstr " 8 bits"
-
-#: src/popup.c:978 src/popup.c:1008
-msgid "16 bits"
-msgstr "16 bits"
-
-#: src/popup.c:981 src/popup.c:1011
-msgid "24 bits"
-msgstr "24 bits"
-
-#: src/popup.c:984 src/popup.c:1014
-msgid "32 bits"
-msgstr "32 bits"
-
-#: src/popup.c:987 src/popup.c:1017
-msgid "64 bits"
-msgstr "64 bits"
-
-#: src/popup.c:1089
-msgid "Selecteur suivant"
-msgstr "Following selector"
-
-#: src/popup.c:1093
-msgid "Selecteur precedant"
+#: src/popup.c:769
+msgid "Previous selector"
 msgstr "Previous selector"
 
-#: src/popup.c:1101
-msgid "Supprimer la plage active"
+#: src/popup.c:777
+msgid "Delete the active range"
 msgstr "Delete the active range"
 
-#: src/popup.c:1173
-msgid "Retourner horizontalement"
+#: src/popup.c:850
+msgid "Flip Horizontal"
 msgstr "Flip Horizontal"
 
-#: src/popup.c:1177
-msgid "Retourner verticalement"
+#: src/popup.c:854
+msgid "Flip Vertical"
 msgstr "Flip Vertical"
 
-#: src/popup.c:1185
-msgid "Image au premier plan"
+#: src/popup.c:862
+msgid "Foreground image"
 msgstr "Foreground image"
 
-#: src/popup.c:1189
-msgid "Image au dessus"
+#: src/popup.c:866
+msgid "Image above"
 msgstr "Image above"
 
-#: src/popup.c:1193
-msgid "Image en dessous"
+#: src/popup.c:870
+msgid "Image below"
 msgstr "Image below"
 
-#: src/popup.c:1197
-msgid "Image au dernier plan"
+#: src/popup.c:874
+msgid "Image to the background"
 msgstr "Image to the background"
 
-#: src/popup.c:1205
-msgid "Effacer l'image"
+#: src/popup.c:882
+msgid "Clear image"
 msgstr "Clear image"
 
-#: src/popup.c:1242
-msgid "Supprimer l'image de la liste"
+#: src/popup.c:920
+msgid "Remove image from the list"
 msgstr "Remove image from the list"
 
-#: src/popup_systray.c:127
-msgid " Cacher Xcfa "
-msgstr " Hide Xcfa "
+#: src/popup.c:1111
+msgid "V0 [ best quality ]"
+msgstr "V0 [ best quality ]"
 
-#: src/popup_systray.c:130
-msgid " Montrer Xcfa "
-msgstr " Show Xcfa "
+#: src/popup.c:1111 src/popup.c:1114
+msgid "V4 [ default ]"
+msgstr "V4 [ default ]"
 
-#: src/popup_systray.c:150
-msgid " Quitter Xcfa "
-msgstr " Quit Xcfa "
+#: src/popup.c:1111
+msgid "V9 [ Lower quality ]"
+msgstr "V9 [ Lower quality ]"
 
-#: src/popup_systray.c:201
-msgid ""
-"XCFA\n"
-"Programme pour convertir les fichiers audio."
-msgstr ""
-"XCFA\n"
-"Program for converting audio files."
+#: src/popup.c:1294
+msgid "Quality -1 [ Lower quality ]"
+msgstr "Quality -1 [ Lower quality ]"
+
+#: src/popup.c:1295
+msgid "Quality 3 [ Defaut ]"
+msgstr "Quality 3 [ Defaut ]"
 
-#: src/prg_init.c:90
+#: src/popup.c:1296
+msgid "Quality 10 [ Best Quality ]"
+msgstr "Quality 10 [ Best Quality ]"
+
+#: src/prg_init.c:85
 msgid " Decode ATSC A/52 audio streams"
 msgstr " Decode ATSC A/52 audio streams"
 
-#: src/prg_init.c:101
+#: src/prg_init.c:96
 msgid " AAC+ encoder"
 msgstr " AAC+ encoder"
 
-#: src/prg_init.c:112 src/prg_init.c:178
+#: src/prg_init.c:107 src/prg_init.c:173
 msgid " Extracteur cd audio"
-msgstr " InCrEdible Digital Audio eXtractor"
+msgstr " Extracteur cd audio"
 
-#: src/prg_init.c:123
+#: src/prg_init.c:118
 msgid " Read CD and get CDDB discid information"
 msgstr " Read CD and get CDDB discid information"
 
-#: src/prg_init.c:134
+#: src/prg_init.c:129
 msgid " Cherche des renseignements sur les formats mp3"
-msgstr " Check validity of mp3s"
+msgstr " Cherche des renseignements sur les formats mp3"
 
-#: src/prg_init.c:145
+#: src/prg_init.c:140
 msgid " Audio Codeur freeware"
-msgstr " MPEG-4 and MPEG-2 AAC encoder"
+msgstr " Audio Codeur freeware"
 
-#: src/prg_init.c:156
+#: src/prg_init.c:151
 msgid " MPEG-4 AAC decodeur"
-msgstr " MPEG-4 AAC decoder"
+msgstr " MPEG-4 AAC decodeur"
 
-#: src/prg_init.c:167
+#: src/prg_init.c:162
 msgid " Conversion wav : flac"
-msgstr " Create wav to flac"
+msgstr " Conversion wav : flac"
 
-#: src/prg_init.c:189
+#: src/prg_init.c:184
 msgid " Conversion wav : mp3"
-msgstr " Create mp3 audio files"
+msgstr " Conversion wav : mp3"
 
-#: src/prg_init.c:200
+#: src/prg_init.c:195
 msgid " Cherche les informations d'un dvd"
-msgstr " Read the contents of a DVD"
+msgstr " Cherche les informations d'un dvd"
 
-#: src/prg_init.c:212
+#: src/prg_init.c:207
 msgid " Monkey's Audio Console Front End : APE"
 msgstr " Monkey's Audio Console Front End : APE"
 
-#: src/prg_init.c:224 src/prg_init.c:235
+#: src/prg_init.c:219 src/prg_init.c:230
 msgid " MusePack commandline utilities"
 msgstr " MusePack commandline utilities"
 
-#: src/prg_init.c:246
+#: src/prg_init.c:241
 msgid " Lecteur et extracteur"
-msgstr " Video and audio player"
+msgstr " Lecteur et extracteur"
 
-#: src/prg_init.c:257
+#: src/prg_init.c:252
 msgid " Normaliseur de fichier mp3"
-msgstr " Lossless mp3 normaliser"
+msgstr " Normaliseur de fichier mp3"
 
-#: src/prg_init.c:268
+#: src/prg_init.c:263
 msgid " Normaliseur de fichier wav"
-msgstr " wav file normaliser"
+msgstr " Normaliseur de fichier wav"
 
-#: src/prg_init.c:279
+#: src/prg_init.c:274
 msgid " A program to send desktop notifications"
 msgstr " A program to send desktop notifications"
 
-#: src/prg_init.c:290
+#: src/prg_init.c:285
 msgid " Forte compression au format wave"
-msgstr " High compression for waveform files"
+msgstr " Forte compression au format wave"
 
-#: src/prg_init.c:301
+#: src/prg_init.c:296
 msgid " Decoupage de fichiers sans decodage"
-msgstr " Split mp3/ogg without decoding"
+msgstr " Decoupage de fichiers sans decodage"
 
-#: src/prg_init.c:312
+#: src/prg_init.c:307
 msgid " Transformation universelle de fichiers son"
-msgstr " Sound eXchange, the Swiss Army knife of audio manipulation"
+msgstr " Transformation universelle de fichiers son"
 
-#: src/prg_init.c:323
+#: src/prg_init.c:318
 msgid " Conversion wav : ogg"
-msgstr " Convert wav : ogg"
+msgstr " Conversion wav : ogg"
 
-#: src/prg_init.c:334
+#: src/prg_init.c:329
 msgid " Normaliseur de fichier ogg"
-msgstr " ogg file normaliser"
+msgstr " Normaliseur de fichier ogg"
 
-#: src/prg_init.c:345
+#: src/prg_init.c:340
 msgid " WAVPACK Hybrid Lossless Audio Compressor"
-msgstr " Wavpack Hybrid Lossless Audio Compressor"
+msgstr " WAVPACK Hybrid Lossless Audio Compressor"
 
-#: src/prg_init.c:362
-msgid " ... les paquets: deb "
-msgstr " ... Packets: deb "
+#: src/prg_init.c:357
+msgid " ... Packets: deb "
+msgstr " ... Packets: deb "
 
-#: src/prg_init.c:368
-msgid " ... les paquets: tgz "
-msgstr " ... Packets: tgz "
+#: src/prg_init.c:363
+msgid " ... Packets: tgz "
+msgstr " ... Packets: tgz "
 
-#: src/prg_init.c:374
-msgid " ... les paquets: fpm "
-msgstr " ... Packets: fpm "
+#: src/prg_init.c:369
+msgid " ... Packets: fpm "
+msgstr " ... Packets: fpm "
 
-#: src/prg_init.c:380
-msgid " ... les paquets: rpm "
-msgstr " ... Packets: rpm "
+#: src/prg_init.c:375
+msgid " ... Packets: rpm "
+msgstr " ... Packets: rpm "
 
-#: src/prg_init.c:386
-msgid " ... les paquets: pkg.tar.xz "
+#: src/prg_init.c:381
+msgid " ... Packets: pkg.tar.xz "
 msgstr " ... Packets: pkg.tar.xz "
 
-#: src/prg_init.c:392
-msgid " ... les paquets: ? "
-msgstr " ... Packets: ?"
+#: src/prg_init.c:387
+msgid " ... Packets: ? "
+msgstr " ... Packets: ? "
 
-#: src/prg_init.c:628
+#: src/prg_init.c:623
 msgid "Status"
 msgstr "Status"
 
-#: src/prg_init.c:642
-msgid "Paquet"
+#: src/prg_init.c:637
+msgid "Packets"
 msgstr "Packets"
 
-#: src/prg_init.c:657
+#: src/prg_init.c:652
 msgid "Action"
 msgstr "Action"
 
-#: src/scan.c:260
-msgid "PACKAGE dvd+rw-tools ABSENT"
+#: src/scan.c:259
+msgid "PACKAGE dvd+rw-tools is missing"
 msgstr "PACKAGE dvd+rw-tools is missing"
 
-#: src/scan.c:261
-msgid "Le package 'dvd+rw-tools' est absent"
+#: src/scan.c:260
+msgid "The package 'imagemagick' is missing"
 msgstr "The package 'imagemagick' is missing"
 
-#: src/scan.c:263
-msgid "de votre systeme !"
+#: src/scan.c:262
+msgid "on your system !"
 msgstr "on your system !"
 
-#: src/scan.c:265
-msgid "Veuillez l'installer car j'ai besoin de"
+#: src/scan.c:264 src/split.c:438
+msgid "Please install it and resume"
 msgstr "Please install it and resume"
 
-#: src/scan.c:267
-msgid "'dvd+rw-mediainfo' pour identifier le(s)"
+#: src/scan.c:266
+msgid "'Dvd + rw-mediainfo' to identify the"
 msgstr "'Dvd + rw-mediainfo' to identify the"
 
-#: src/scan.c:269
-msgid "lecteur(s) de cd / dvd."
+#: src/scan.c:268
+msgid "reader of cd / dvd."
 msgstr "reader of cd / dvd."
 
-#: src/split.c:284
+#: src/split.c:297
 msgid ""
-"Menu: Click droit / Ajout plage: Click bouton centre / Zoom: Ctrl+Scroll"
+"Menu: right click / Adding track: Click the center button / Zoom: Ctrl"
+"+Scroll"
 msgstr ""
 "Menu: right click / Adding track: Click the center button / Zoom: Ctrl"
 "+Scroll"
 
-#: src/split.c:287
-msgid "Ajout plage: Click bouton centre / Zoom: Ctrl+Scroll"
+#: src/split.c:300
+msgid "Adding track: Click the center button / Zoom: Ctrl+Scroll"
 msgstr "Adding track: Click the center button / Zoom: Ctrl+Scroll"
 
-#: src/split.c:291
-msgid ""
-"Pret pour l'import d'un fichier CUE, WAV, FLAC, OGG, MP3, APE, WMA"
+#: src/split.c:304
+msgid "Ready for imports and a CUE file, WAV, FLAC, OGG, MP3, APE, WMA"
 msgstr "Ready for imports and a CUE file, WAV, FLAC, OGG, MP3, APE, WMA"
 
-#: src/split.c:360 src/split.c:387
-msgid "Ce fichier appartient a XCFA"
+#: src/split.c:378 src/split.c:407
+msgid "This file belongs XCFA"
 msgstr "This file belongs XCFA"
 
-#: src/split.c:361 src/split.c:388
-msgid "Selectionnez un autre fichier."
+#: src/split.c:379 src/split.c:408
+msgid "Select another file."
 msgstr "Select another file."
 
-#: src/split.c:368
-msgid "Fichier vide"
+#: src/split.c:387
+msgid "Empty file"
 msgstr "Empty file"
 
-#: src/split.c:369
-msgid "Le fichier ne contient aucune donnee !!!"
+#: src/split.c:388
+msgid "The file contains no data !!!"
 msgstr "The file contains no data !!!"
 
-#: src/split.c:412
-msgid "Sox et Mplayer absents"
-msgstr "Sox and Mplayer is missing"
+#: src/split.c:433
+msgid "Sox and Mplayer not found"
+msgstr "Sox and Mplayer not found"
 
-#: src/split.c:413
-msgid "Sox et Mplayer sont absents de votre"
-msgstr "Sox and Mplayer is missing"
+#: src/split.c:434
+msgid "Sox et Mplayer are not found"
+msgstr "Sox et Mplayer are not found"
 
-#: src/split.c:415
-msgid "configuration."
-msgstr "configuration."
-
-#: src/split.c:417
-msgid "Veuillez les installer pour pouvoir continuer."
-msgstr "Please install it and resume"
+#: src/split.c:436
+msgid "in your configuration."
+msgstr "in your configuration."
 
-#: src/split.c:467
-msgid "Erreur de choix de fichier"
+#: src/split.c:492
+msgid "Error file select"
 msgstr "Error file select"
 
-#: src/split.c:468
-msgid "Veuillez selectionner un fichier de type WAV FLAC MP3 OGG APE"
+#: src/split.c:493
+msgid "Please select a file type of MP3 WAV OGG FLAC APE"
 msgstr "Please select a file type of MP3 WAV OGG FLAC APE"
 
-#: src/split.c:504 src/split.c:577
-msgid "Mauvais type de fichier"
+#: src/split.c:531 src/split.c:603
+msgid "Wrong type of file"
 msgstr "Wrong type of file"
 
-#: src/split.c:505 src/split.c:578
+#: src/split.c:532 src/split.c:604
 msgid ""
-"Les types de fichiers acceptes\n"
-"sont: WAV FLAC MP3 OGG APE WMA CUE"
+"File types accepted\n"
+"sare: WAV FLAC MP3 OGG APE WMA CUE"
 msgstr ""
 "File types accepted\n"
-"are: WAV FLAC MP3 OGG APE WMA CUE"
+"sare: WAV FLAC MP3 OGG APE WMA CUE"
 
-#: src/split_conv.c:312 src/split_conv.c:328
-msgid "Erreur SOX"
+#: src/split_conv.c:316 src/split_conv.c:333
+msgid "SOX Error"
 msgstr "SOX Error"
 
-#: src/split_conv.c:313 src/split_conv.c:329
-msgid "Le programme SOX de votre distribution"
+#: src/split_conv.c:317 src/split_conv.c:334
+msgid "The SOX program on your distribution"
 msgstr "The SOX program on your distribution"
 
-#: src/split_conv.c:315 src/split_conv.c:331
-msgid "a generer une erreur pendant la conversion."
-msgstr "has generated an error during conversion"
+#: src/split_conv.c:319 src/split_conv.c:336
+msgid "has generated an error during conversion."
+msgstr "has generated an error during conversion."
 
-#: src/split_cue.c:121
-msgid "Erreur de lecture !"
+#: src/split_cue.c:116
+msgid "Misreading !"
 msgstr "Misreading !"
 
-#: src/split_cue.c:181 src/split_cue.c:190 src/split_cue.c:199
-msgid "Erreur"
+#: src/split_cue.c:177 src/split_cue.c:187 src/split_cue.c:196
+msgid "Error"
 msgstr "Error"
 
-#: src/split_cue.c:182
-msgid "Aucun fichier de musique associe au cue-file !"
+#: src/split_cue.c:178
+msgid "No music file associated with the cue-file"
 msgstr "No music file associated with the cue-file"
 
-#: src/split_cue.c:191
-msgid "Pas de fichier WAV dans le cue-file !"
+#: src/split_cue.c:188
+msgid "No WAV file in the cue-file"
 msgstr "No WAV file in the cue-file"
 
-#: src/split_cue.c:200
-msgid "Aucun fichier de musique associe dans le dossier"
+#: src/split_cue.c:197
+msgid "No music file in the folder associated"
 msgstr "No music file in the folder associated"
 
-#: src/split_cue.c:202
-msgid "du cue-file"
+#: src/split_cue.c:199
+msgid "of cue-file"
 msgstr "of cue-file"
 
-#: src/split_cue.c:288
-msgid "Erreur de donnees dans le fichier CUE"
+#: src/split_cue.c:293
+msgid "Data errors in the CUE file"
 msgstr "Data errors in the CUE file"
 
-#: src/split_cue.c:289
-msgid "La solution est d'importer le fichier de"
+#: src/split_cue.c:294
+msgid "The solution is to import the file"
 msgstr "The solution is to import the file"
 
-#: src/split_cue.c:291
-msgid "musique qui sera reconnu et pre-decoupe"
+#: src/split_cue.c:296
+msgid "music that will be recognized and pre-cutting"
 msgstr "music that will be recognized and pre-cutting"
 
-#: src/split_cue.c:293
-msgid "dans le module Split."
-msgstr "Split in the module."
+#: src/split_cue.c:298
+msgid "in the split module."
+msgstr "in the split module."
 
-#: src/split_cue.c:295
-msgid "Il ne restera qu'a ajuster les plages pour"
+#: src/split_cue.c:300
+msgid "We will just adjust to the beaches"
 msgstr "We will just adjust to the beaches"
 
-#: src/split_cue.c:297
-msgid "generer un nouveau cue-file ou des decoupes"
+#: src/split_cue.c:302
+msgid "generate a new cue-file or cuts"
 msgstr "generate a new cue-file or cuts"
 
-#: src/split_cue.c:299
-msgid "correspondant aux plages."
+#: src/split_cue.c:304
+msgid "corresponding to the beaches."
 msgstr "corresponding to the beaches."
 
-#: src/split_selector.c:141
-msgid "Suppression pendant la lecture impossible"
+#: src/split_selector.c:136
+msgid "Deleting not during playback"
 msgstr "Deleting not during playback"
 
-#: src/split_selector.c:234 src/split_selector.c:240 src/split_selector.c:294
-#: src/split_selector.c:300 src/split_selector.c:357 src/split_selector.c:364
-#: src/split_selector.c:434 src/split_selector.c:440
-msgid "Temps inferieur a 5 secondes entre marqueur et curseur !"
+#: src/split_selector.c:231 src/split_selector.c:237 src/split_selector.c:291
+#: src/split_selector.c:297 src/split_selector.c:354 src/split_selector.c:361
+#: src/split_selector.c:431 src/split_selector.c:437
+msgid "Time of less than 5 seconds between marker and cursor !"
 msgstr "Time of less than 5 seconds between marker and cursor !"
 
-#: src/translate.c:55
-msgid "Fichier"
+#: src/web.c:173 src/web.c:221
+msgid "No web browser"
+msgstr "No web browser"
+
+#: src/web.c:174 src/web.c:222
+msgid "No Web access: no web browser"
+msgstr "No Web access: no web browser"
+
+#: src/web.c:176 src/web.c:224
+msgid "found in your system."
+msgstr "found in your system."
+
+#: src/web.c:178 src/web.c:226
+msgid "Please install a web browser."
+msgstr "Please install a web browser."
+
+#: src/web.c:188
+msgid "You need to enable web access"
+msgstr "You need to enable web access"
+
+#: src/web.c:236
+msgid "Application is missing."
+msgstr "Application is missing."
+
+#: src/web.c:237
+msgid "Please install : "
+msgstr "Please install : "
+
+#: src/win_about.c:124
+msgid " Xcfa on the web"
+msgstr " Xcfa on the web"
+
+#: src/win_about.c:174
+msgid ""
+"\n"
+"Au tout debut:\n"
+"\n"
+"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
+"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
+"... ;-)\n"
+"\n"
+""
+msgstr ""
+"\n"
+"Au tout debut:\n"
+"\n"
+"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
+"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
+"... ;-)\n"
+"\n"
+""
+
+#: src/win_scan.c:170
+msgid "Waiting ..."
+msgstr "Waiting ..."
+
+#: glade/xcfa.glade:66 glade/xcfa.glade:2533
+msgid "File"
 msgstr "File"
 
-#: src/translate.c:56
-msgid "Quitter"
+#: glade/xcfa.glade:75
+msgid "Quit"
 msgstr "Quit"
 
-#: src/translate.c:57
-msgid "Outils"
+#: glade/xcfa.glade:89
+msgid "Tools"
 msgstr "Tools"
 
-#: src/translate.c:58
-msgid "Visibilite des champs"
-msgstr "Visible fields"
+#: glade/xcfa.glade:99
+msgid "Visibility fields"
+msgstr "Visibility fields"
 
-#: src/translate.c:59
-msgid "Aide"
+#: glade/xcfa.glade:112
+msgid "Help"
 msgstr "Help"
 
-#: src/translate.c:60
-msgid "A propos"
+#: glade/xcfa.glade:121
+msgid "About"
 msgstr "About"
 
-#: src/translate.c:61 src/translate.c:71
-msgid "Lecture"
-msgstr "Play"
+#: glade/xcfa.glade:224
+msgid "Read"
+msgstr "Read"
 
-#: src/translate.c:62
-msgid " Choix du peripherique / Lecture du DVD "
-msgstr " DVD player / Import files "
+#: glade/xcfa.glade:252
+msgid " Choosing the peripheral / DVD playback "
+msgstr " Choosing the peripheral / DVD playback "
 
-#: src/translate.c:63 src/translate.c:73 src/translate.c:134
-msgid " Destination des fichiers "
-msgstr " Save location: "
+#: glade/xcfa.glade:303 glade/xcfa.glade:921
+msgid " File Destination "
+msgstr " File Destination "
 
-#: src/translate.c:64 src/translate.c:74
+#: glade/xcfa.glade:359 glade/xcfa.glade:1009
 msgid " Eject "
 msgstr " Eject "
 
-#: src/translate.c:65 src/translate.c:96
-msgid " Normaliser "
-msgstr " Normalise "
+#: glade/xcfa.glade:434
+msgid " Normalize "
+msgstr " Normalize "
 
-#: src/translate.c:66
-msgid "Deplier"
+#: glade/xcfa.glade:494
+msgid "Unfold"
 msgstr "Unfold"
 
-#: src/translate.c:67
-msgid "Replier"
+#: glade/xcfa.glade:548
+msgid "Fold"
 msgstr "Fold"
 
-#: src/translate.c:68
+#: glade/xcfa.glade:649
 msgid " Vers 2CH: Sub / Ambiance "
-msgstr " 2CH: Sub / Ambiance "
+msgstr " Vers 2CH: Sub / Ambiance "
 
-#: src/translate.c:69 src/translate.c:102
-msgid "Extraire"
-msgstr "Rip"
+#: glade/xcfa.glade:705
+msgid "Extraction"
+msgstr "Extraction"
 
-#: src/translate.c:70
+#: glade/xcfa.glade:756
 msgid " DVD "
 msgstr " DVD "
 
-#: src/translate.c:72
-msgid " Choix du peripherique / Lecture du CD "
-msgstr " CD player "
+#: glade/xcfa.glade:842
+msgid "Lecture"
+msgstr "Lecture"
+
+#: glade/xcfa.glade:870
+msgid " Choosing the peripheral / CD playback "
+msgstr " Choosing the peripheral / CD playback "
 
-#: src/translate.c:75
-msgid "Titre:"
+#: glade/xcfa.glade:1065
+msgid "Title:"
 msgstr "Title:"
 
-#: src/translate.c:76
+#: glade/xcfa.glade:1077
 msgid "Album:"
 msgstr "Album:"
 
-#: src/translate.c:77
-msgid "Artiste:"
+#: glade/xcfa.glade:1089
+msgid "Artist:"
 msgstr "Artist:"
 
-#: src/translate.c:78
-msgid " Annee:"
-msgstr "Year :"
+#: glade/xcfa.glade:1101
+msgid "Comment:"
+msgstr "Comment:"
+
+#: glade/xcfa.glade:1113
+msgid " Year:"
+msgstr " Year:"
 
-#: src/translate.c:79
+#: glade/xcfa.glade:1125
 msgid " Genre:"
-msgstr "Genre :"
+msgstr " Genre:"
 
-#: src/translate.c:80
-msgid " Piste:"
-msgstr "Track:"
+#: glade/xcfa.glade:1137
+msgid " Track:"
+msgstr " Track:"
 
-#: src/translate.c:81
+#: glade/xcfa.glade:1149
 msgid " *.m3u et xspf: "
-msgstr "m3u and xspf: "
+msgstr " *.m3u et xspf: "
 
-#: src/translate.c:82
-msgid "Commentaire:"
-msgstr "Comment:"
-
-#: src/translate.c:83
-msgid " Modification des tags Freedb "
-msgstr " Freedb tags modification "
+#: glade/xcfa.glade:1287
+msgid "Editing tags Freedb"
+msgstr "Editing tags Freedb"
 
-#: src/translate.c:84
+#: glade/xcfa.glade:1302
 msgid ""
 "%a [ %a=\"Artist\" ]\n"
 "\n"
@@ -1583,14 +1495,15 @@
 "\n"
 "%b [ %b=\"Album\" ]\n"
 "\n"
-"TI% - Tetsumaki lower\n"
+"%Tl - Tetsumaki lower\n"
 "\n"
-"Converts the string to lowercase except for the first character\n"
+"Transforme la chaine en minuscule sauf le premier caractere.\n"
 "\n"
-"In the fields 'Title' since [Changing FreeDB tag]\n"
-"the character or characters to be retained must be preceded bycharacter %"
+"Dans le champs 'Titre' depuis [ Modification des tags FreeDB ],\n"
+"le ou les caracteres devant etre conserves doivent etre precedes par le "
+"caractere %"
 
-#: src/translate.c:85
+#: glade/xcfa.glade:1312
 msgid ""
 "%a - artiste %b - titre "
 "de l'album %c - numero de la piste\n"
@@ -1601,1056 +1514,945 @@
 "%u - remplacement de caracteres: %u(AB=C) %u( =_) %Tl</"
 "b> - Tetsumaki lower"
 msgstr ""
-"%a - artist %b - album "
-"title %c - track number\n"
-"%d - track title %e - "
-"year %g - genre\n"
-"%f - create an m3u and xspf file %na</"
-"b> - no accent\n"
-"%u - replace special characters: %u(AB=C) %u( =_) %Tl</"
-"b> - Tetsumaki lower"
+"%a - artiste %b - titre "
+"de l'album %c - numero de la piste\n"
+"%d - titre de la chanson %e - "
+"annee %g - genre\n"
+"%f - creation d'un fichier *.m3u et *."
+"xspf %na - no accent\n"
+"%u - remplacement de caracteres: %u(AB=C) %u( =_) %Tl</"
+"b> - Tetsumaki lower"
 
-#: src/translate.c:86
-msgid " Arrangement des titres du CD "
-msgstr " Arrangement of CD titles "
+#: glade/xcfa.glade:1346
+msgid " Arrangement of CD titles"
+msgstr " Arrangement of CD titles"
 
-#: src/translate.c:87
-msgid "Creation d'un fichier unique au format: "
-msgstr "Create a single file in the format: "
+#: glade/xcfa.glade:1382
+msgid "Creation of a single file format: "
+msgstr "Creation of a single file format: "
 
-#: src/translate.c:88
-msgid " et dont le nom sera: "
-msgstr " Named: "
+#: glade/xcfa.glade:1430
+msgid " and whose name will be: "
+msgstr " and whose name will be: "
 
-#: src/translate.c:89
-msgid "Ecriture du fichier cue"
-msgstr "Write cue file"
+#: glade/xcfa.glade:1461
+msgid "Writing the cue file"
+msgstr "Writing the cue file"
 
-#: src/translate.c:90
-msgid " Au moins deux selections colonne Wav "
-msgstr " Make at least two selections in the Wav column "
+#: glade/xcfa.glade:1484
+msgid " At least two selections column Wav "
+msgstr " At least two selections column Wav "
 
-#: src/translate.c:91
+#: glade/xcfa.glade:1514
 msgid ""
-"Creation d'un fichier cue\n"
-"unique depuis une lecture\n"
-"du cd audio"
+"\n"
+"Creating a cue file from a single\n"
+"reading audio cd\n"
 msgstr ""
-"Create a single cue\n"
-"file from an audio-CD"
+"\n"
+"Creating a cue file from a single\n"
+"reading audio cd\n"
 
-#: src/translate.c:92
-msgid "Creation fichier cue uniquement"
-msgstr "Create cue file"
+#: glade/xcfa.glade:1562
+msgid "File Creation cue only"
+msgstr "File Creation cue only"
 
-#: src/translate.c:93
+#: glade/xcfa.glade:1597
 msgid " Creation Cue cd "
-msgstr " CD cue file creation "
+msgstr " Creation Cue cd "
+
+#: glade/xcfa.glade:1625
+msgid "  Creation of a single file"
+msgstr "  Creation of a single file"
 
-#: src/translate.c:94
-msgid " Creation d'un fichier unique "
-msgstr " Creating a single file "
+#: glade/xcfa.glade:1638
+msgid "Management of tags, titles and cue files"
+msgstr "Management of tags, titles and cue files"
 
-#: src/translate.c:95
-msgid "Gestion des tags, titres et fichiers cue"
-msgstr "Tags, titles and cue files management"
+#: glade/xcfa.glade:1688
+msgid " normalize "
+msgstr " normalize "
 
-#: src/translate.c:97
+#: glade/xcfa.glade:1749
 msgid "definit le serveur a contacter pour les recherches titre"
-msgstr "Sets the server to be contacted for title lookups"
+msgstr "definit le serveur a contacter pour les recherches titre"
 
-#: src/translate.c:98
+#: glade/xcfa.glade:1788
 msgid "Parametres par defaut"
-msgstr "Default parameters"
+msgstr "Parametres par defaut"
 
-#: src/translate.c:100
-msgid "Choix parmis les differentes bases de donnees pour le CD."
-msgstr "Choice among different databases for the CD."
-
-#: src/translate.c:101
+#: glade/xcfa.glade:1887
 msgid "DiscId"
 msgstr "DiscId"
 
-#: src/translate.c:103
+#: glade/xcfa.glade:1946
+msgid "Extract"
+msgstr "Extract"
+
+#: glade/xcfa.glade:2053
 msgid " CD "
 msgstr " CD "
 
-#: src/translate.c:104 src/translate.c:133
-msgid " Importer "
+#: glade/xcfa.glade:2135 glade/xcfa.glade:3271
+msgid " Import "
 msgstr " Import "
 
-#: src/translate.c:105
-msgid " Destination des conversions "
-msgstr " Export converted files: "
+#: glade/xcfa.glade:2190
+msgid " Destination conversions "
+msgstr " Destination conversions "
 
-#: src/translate.c:106
-msgid " Nettoyer "
-msgstr " Clear "
+#: glade/xcfa.glade:2266
+msgid " Clean up "
+msgstr " Clean up "
 
-#: src/translate.c:107 src/translate.c:114
+#: glade/xcfa.glade:2389
 msgid "Appliquer les modifications"
-msgstr "Apply the changes"
-
-#: src/translate.c:108
-msgid " Normalise: "
-msgstr " Normalise: "
-
-#: src/translate.c:109
-msgid " Choix niveau dBFS: "
-msgstr " dBFS level: "
-
-#: src/translate.c:110 src/translate.c:132
-msgid " Fichiers "
-msgstr " Files "
+msgstr "Appliquer les modifications"
 
-#: src/translate.c:111
-msgid "Quantification"
-msgstr "Quantification"
+#: glade/xcfa.glade:2444
+msgid " Normalize: "
+msgstr " Normalize: "
 
-#: src/translate.c:112
-msgid "Voie"
-msgstr "Channel"
+#: glade/xcfa.glade:2477
+msgid " Level selection dBFS: "
+msgstr " Level selection dBFS: "
 
-#: src/translate.c:113
-msgid " Frequence - Hertz "
-msgstr " Frequency -Hertz "
+#: glade/xcfa.glade:2615
+msgid "Apply changes"
+msgstr "Apply changes"
 
-#: src/translate.c:115
+#: glade/xcfa.glade:2651
 msgid " Wav "
 msgstr " Wav "
 
-#: src/translate.c:116 src/translate.c:202
-msgid " Lame (fichier mp3): "
-msgstr " Lame (mp3 file): "
-
-#: src/translate.c:117 src/translate.c:218
-msgid " Oggenc (fichier ogg): "
-msgstr " Oggenc (ogg file): "
-
-#: src/translate.c:118 src/translate.c:130
-msgid "Appliquer"
+#: glade/xcfa.glade:2735
+msgid "Apply"
 msgstr "Apply"
 
-#: src/translate.c:119
-msgid "Effacer"
-msgstr "Clear"
+#: glade/xcfa.glade:2789
+msgid "Delete"
+msgstr "Delete"
 
-#: src/translate.c:120
+#: glade/xcfa.glade:2826
 msgid " Mp3-Ogg "
 msgstr " Mp3-Ogg "
 
-#: src/translate.c:121
-msgid "Titre:"
+#: glade/xcfa.glade:2875
+msgid "Title:"
 msgstr "Title:"
 
-#: src/translate.c:122
+#: glade/xcfa.glade:2886
 msgid "Album:"
 msgstr "Album:"
 
-#: src/translate.c:123
-msgid "Artiste:"
+#: glade/xcfa.glade:2897
+msgid "Artist:"
 msgstr "Artist:"
 
-#: src/translate.c:124
-msgid "Commentaire:"
+#: glade/xcfa.glade:2908
+msgid "Comment:"
 msgstr "Comment:"
 
-#: src/translate.c:125
-msgid " Annee:"
+#: glade/xcfa.glade:2919
+msgid " Year:"
 msgstr " Year:"
 
-#: src/translate.c:126
+#: glade/xcfa.glade:2930
 msgid " Genre:"
 msgstr " Genre:"
 
-#: src/translate.c:127
-msgid " Piste:"
+#: glade/xcfa.glade:2941
+msgid " Track:"
 msgstr " Track:"
 
-#: src/translate.c:128
+#: glade/xcfa.glade:2952
 msgid " Modif.:"
-msgstr " Edit:"
+msgstr " Modif.:"
 
-#: src/translate.c:129
+#: glade/xcfa.glade:3078
 msgid "0"
 msgstr "0"
 
-#: src/translate.c:131 src/translate.c:315
+#: glade/xcfa.glade:3102
+msgid "Apply "
+msgstr "Apply "
+
+#: glade/xcfa.glade:3160 glade/xcfa.glade:10210
 msgid " Tags "
 msgstr " Tags "
 
-#: src/translate.c:135
+#: glade/xcfa.glade:3190
+msgid " Files "
+msgstr " Files "
+
+#: glade/xcfa.glade:3322
+msgid "   File Destination "
+msgstr "   File Destination "
+
+#: glade/xcfa.glade:3494
 msgid "Lecture de 5 secondes apres le marqueur de debut"
-msgstr "Reading 5 seconds after the beginning marker"
+msgstr "Lecture de 5 secondes apres le marqueur de debut"
 
-#: src/translate.c:136
+#: glade/xcfa.glade:3546
 msgid "Index de debut"
-msgstr "Index start"
+msgstr "Index de debut"
 
-#: src/translate.c:137 src/translate.c:144 src/translate.c:147
+#: glade/xcfa.glade:3547 glade/xcfa.glade:3813 glade/xcfa.glade:3874
 msgid "00h00m00s"
 msgstr "00h00m00s"
 
-#: src/translate.c:138
+#: glade/xcfa.glade:3600
 msgid "lecture"
-msgstr "Play"
+msgstr "lecture"
 
-#: src/translate.c:139
+#: glade/xcfa.glade:3653
 msgid "Pause"
 msgstr "Pause"
 
-#: src/translate.c:140
+#: glade/xcfa.glade:3712
 msgid "Index de lecture"
-msgstr "Index reading"
+msgstr "Index de lecture"
 
-#: src/translate.c:141 src/translate.c:180
+#: glade/xcfa.glade:3713 glade/xcfa.glade:4767
 msgid "label"
 msgstr "label"
 
-#: src/translate.c:142
+#: glade/xcfa.glade:3760
 msgid "Lecture de 5 secondes avant le marqueur de fin"
-msgstr "Reading of 5 seconds before the end marker"
+msgstr "Lecture de 5 secondes avant le marqueur de fin"
 
-#: src/translate.c:143
+#: glade/xcfa.glade:3812
 msgid "Index de fin"
-msgstr "End index"
+msgstr "Index de fin"
 
-#: src/translate.c:145
+#: glade/xcfa.glade:3860
 msgid "Plage"
 msgstr "Plage"
 
-#: src/translate.c:146
+#: glade/xcfa.glade:3873
 msgid "Duree de la plage active"
-msgstr "Length of the active beach"
+msgstr "Duree de la plage active"
 
-#: src/translate.c:148
+#: glade/xcfa.glade:3955
 msgid "Suprimer tous les marqueurs pour les remplacer par un marqueur unique"
-msgstr "Wipe all markers and replace them with a single marker"
+msgstr "Suprimer tous les marqueurs pour les remplacer par un marqueur unique"
 
-#: src/translate.c:149
+#: glade/xcfa.glade:4044
 msgid "Le fichier CUE sera enregistre vers 'Destination des fichiers'."
-msgstr "CUE file to be recorded 'Destination file'."
+msgstr "Le fichier CUE sera enregistre vers 'Destination des fichiers'."
 
-#: src/translate.c:150
-msgid "Production fichier Cue"
-msgstr "Generate CUE file"
+#: glade/xcfa.glade:4073
+msgid "Production Cue file"
+msgstr "Production Cue file"
 
-#: src/translate.c:151
+#: glade/xcfa.glade:4098
 msgid "Le resultat du Split sera dirige vers 'Destination des fichiers'."
-msgstr "The result of the Split will be heading for 'Destination file'."
+msgstr "Le resultat du Split sera dirige vers 'Destination des fichiers'."
 
-#: src/translate.c:152
+#: glade/xcfa.glade:4127
 msgid "Split"
 msgstr "Split"
 
-#: src/translate.c:153
+#: glade/xcfa.glade:4188
 msgid " Split "
 msgstr " Split "
 
-#: src/translate.c:154
+#: glade/xcfa.glade:4253
 msgid "Importation du titre du CD."
-msgstr "Import the CD title."
+msgstr "Importation du titre du CD."
 
-#: src/translate.c:155
-msgid "Titre CD"
+#: glade/xcfa.glade:4276
+msgid "Title CD"
 msgstr "Title CD"
 
-#: src/translate.c:156
+#: glade/xcfa.glade:4296
 msgid "Choix d'une nouvelle police."
-msgstr "Choosing a new font."
+msgstr "Choix d'une nouvelle police."
 
-#: src/translate.c:157
+#: glade/xcfa.glade:4318
 msgid "Texte gras."
-msgstr "Bold text."
+msgstr "Texte gras."
 
-#: src/translate.c:158
+#: glade/xcfa.glade:4340
 msgid "Texte italique."
-msgstr "Italic text."
+msgstr "Texte italique."
 
-#: src/translate.c:159
-msgid ""
-"Apres une lecture de CD et un ajout d'etiquette, ce menu permet la mise en "
-"forme des titres, auteurs ..."
-msgstr ""
-"After reading a CD and add a label, this menu allows the formatting of "
-"titles, authors ..."
-
-#: src/translate.c:160
+#: glade/xcfa.glade:4375
 msgid "Ajouter du texte editable."
-msgstr "Add text editable."
+msgstr "Ajouter du texte editable."
 
-#: src/translate.c:161
-msgid "Texte"
+#: glade/xcfa.glade:4430
+msgid "Text"
 msgstr "Text"
 
-#: src/translate.c:162
+#: glade/xcfa.glade:4462
 msgid "Saisissez ici un critere de recherche d'images."
-msgstr "Enter here a search of images."
+msgstr "Saisissez ici un critere de recherche d'images."
 
-#: src/translate.c:163
+#: glade/xcfa.glade:4484
 msgid "Importation des images depuis le Web."
-msgstr "Importing images from the Web."
+msgstr "Importation des images depuis le Web."
 
-#: src/translate.c:164
-msgid "Import images web"
-msgstr "Import web images"
+#: glade/xcfa.glade:4509
+msgid "Import web images "
+msgstr "Import web images "
 
-#: src/translate.c:165
+#: glade/xcfa.glade:4578
 msgid "Supprimer l'image en selection"
-msgstr "Delete the image selection"
+msgstr "Supprimer l'image en selection"
 
-#: src/translate.c:166
+#: glade/xcfa.glade:4600
 msgid "AJouter de nouvelles images."
-msgstr "Add new images."
+msgstr "AJouter de nouvelles images."
 
-#: src/translate.c:167
+#: glade/xcfa.glade:4606
 msgid "Ouvre un fichier"
-msgstr "Open a file"
+msgstr "Ouvre un fichier"
 
-#: src/translate.c:168
+#: glade/xcfa.glade:4623
 msgid "Enregistrer la page au format png."
-msgstr "Save Page png."
+msgstr "Enregistrer la page au format png."
 
-#: src/translate.c:169
+#: glade/xcfa.glade:4629
 msgid "Sauvegarde le fichier"
-msgstr "Saving the file"
+msgstr "Sauvegarde le fichier"
 
-#: src/translate.c:170
+#: glade/xcfa.glade:4646
 msgid "Diminution de l'echelle."
-msgstr "Reduction in the scale."
+msgstr "Diminution de l'echelle."
 
-#: src/translate.c:171
+#: glade/xcfa.glade:4652
 msgid "Reduit l'agrandissement"
-msgstr "Reduced expansion"
+msgstr "Reduit l'agrandissement"
 
-#: src/translate.c:172
+#: glade/xcfa.glade:4669
 msgid "Echelle a 100%."
-msgstr "Scale 100%."
+msgstr "Echelle a 100%."
 
-#: src/translate.c:173
+#: glade/xcfa.glade:4675
 msgid "Remet l'echelle a 100%"
-msgstr "Gives the scale at 100%"
+msgstr "Remet l'echelle a 100%"
 
-#: src/translate.c:174
+#: glade/xcfa.glade:4692
 msgid "Augmentation de l'echelle."
-msgstr "Increase in scale."
+msgstr "Augmentation de l'echelle."
 
-#: src/translate.c:175
+#: glade/xcfa.glade:4698
 msgid "Augmente l'agrandissement"
-msgstr "Increasing expansion"
+msgstr "Augmente l'agrandissement"
 
-#: src/translate.c:176
+#: glade/xcfa.glade:4715
 msgid "Echelle compatible avec la taille de la fenetre."
-msgstr "Scale compatible with the size of the window."
+msgstr "Echelle compatible avec la taille de la fenetre."
 
-#: src/translate.c:177
+#: glade/xcfa.glade:4721
 msgid "Adapte l'echelle a la taille de la fenetre"
-msgstr "Adjusts the scale to the size of the window"
+msgstr "Adapte l'echelle a la taille de la fenetre"
 
-#: src/translate.c:178
+#: glade/xcfa.glade:4738
 msgid "Emplacement de sauvegarde des fichiers."
-msgstr "Backup location files."
+msgstr "Emplacement de sauvegarde des fichiers."
 
-#: src/translate.c:179
+#: glade/xcfa.glade:4752
 msgid "Nom (sans extention) du fichier a sauvegarder."
-msgstr "Name (without extension) file is saved."
+msgstr "Nom (sans extention) du fichier a sauvegarder."
 
-#: src/translate.c:181
+#: glade/xcfa.glade:4815
 msgid " Pochette "
-msgstr " CD Cover "
+msgstr " Pochette "
 
-#: src/translate.c:182
+#: glade/xcfa.glade:4861
 msgid "Nice"
 msgstr "Nice"
 
-#: src/translate.c:183
-msgid " Priorite systeme "
-msgstr " System priority "
+#: glade/xcfa.glade:4896
+msgid " Priority system "
+msgstr " Priority system "
 
-#: src/translate.c:184
+#: glade/xcfa.glade:4935
 msgid ""
-"Indiquez ici le dossier sur votre systeme qui servira de lieu\n"
-"de stockage provisoire pendant les differentes conversions.\n"
-msgstr "Enter the location of the temporary folder to be used by XCFA\n"
+"\n"
+"Enter here the folder on your system that will serve as\n"
+"temporary storage for the different conversions.\n"
+msgstr ""
+"\n"
+"Enter here the folder on your system that will serve as\n"
+"temporary storage for the different conversions.\n"
 
-#: src/translate.c:185
-msgid " Dossier provisoire des conversions "
-msgstr " Conversions temporary folder "
+#: glade/xcfa.glade:4971
+msgid " Provisional file conversions "
+msgstr " Provisional file conversions "
 
-#: src/translate.c:186
+#: glade/xcfa.glade:5017
 msgid "button"
 msgstr "button"
 
-#: src/translate.c:187
-msgid " Jouer une musique en fin de tache "
-msgstr " Play music at the end of task "
+#: glade/xcfa.glade:5038
+msgid " Playing a job end music "
+msgstr " Playing a job end music "
 
-#: src/translate.c:188
+#: glade/xcfa.glade:5058
 msgid " General "
 msgstr " General "
 
-#: src/translate.c:189
+#: glade/xcfa.glade:5100
 msgid "cdparanoia"
 msgstr "cdparanoia"
 
-#: src/translate.c:190
+#: glade/xcfa.glade:5120
+msgid "cdparanoia mode expert"
+msgstr "cdparanoia mode expert"
+
+#: glade/xcfa.glade:5140
+msgid "cdparanoia mode expert multi passes"
+msgstr "cdparanoia mode expert multi passes"
+
+#: glade/xcfa.glade:5168
 msgid "cdda2wav / icedax"
 msgstr "cdda2wav / icedax"
 
-#: src/translate.c:191
-msgid "cdparanoia mode expert"
-msgstr "cdparanoia expert mode"
-
-#: src/translate.c:192
+#: glade/xcfa.glade:5194
 msgid " Extraction cd-audio avec: "
-msgstr " Rip audio-CD with: "
+msgstr " Extraction cd-audio avec: "
 
-#: src/translate.c:193
+#: glade/xcfa.glade:5268
 msgid "HomePage"
-msgstr "Home Page"
+msgstr "HomePage"
 
-#: src/translate.c:194
+#: glade/xcfa.glade:5323
 msgid "ManPage "
-msgstr "Man Page "
+msgstr "ManPage "
 
-#: src/translate.c:195
+#: glade/xcfa.glade:5352
 msgid " Web cdparanoia "
 msgstr " Web cdparanoia "
 
-#: src/translate.c:196
+#: glade/xcfa.glade:5414
 msgid ""
-"%a - artiste %b - titre "
+"Le fichier LogExpertMode.txt sera cree dans le dossier des "
+"extractions"
+msgstr ""
+"Le fichier LogExpertMode.txt sera cree dans le dossier des "
+"extractions"
+
+#: glade/xcfa.glade:5431
+msgid "Generation of a report for: cdparanoia mode expert multi passes"
+msgstr "Generation of a report for: cdparanoia mode expert multi passes"
+
+#: glade/xcfa.glade:5467
+msgid ""
+"%a - artist %b - titre "
 "de l'album %c - numero de la piste\n"
 "%d - titre de la chanson %e - "
-"annee %g - genre\n"
+"year %g - genre\n"
 "%na - no accent %Tl "
 "- Tetsumaki lower\n"
-"%u - remplacement de caracteres: %u(AB=C) %u( =_)"
+"%u - replacement characters: %u(AB=C) %u( =_)"
 msgstr ""
-"%a - artist %b - album "
-"title %c - track number\n"
-"%d - track title %e - "
+"%a - artist %b - titre "
+"de l'album %c - numero de la piste\n"
+"%d - titre de la chanson %e - "
 "year %g - genre\n"
 "%na - no accent %Tl "
 "- Tetsumaki lower\n"
-"%u - replacing characters: %u(AB=C) %u( =_)"
+"%u - replacement characters: %u(AB=C) %u( =_)"
 
-#: src/translate.c:197
+#: glade/xcfa.glade:5536
 msgid " Dossier de stockage "
-msgstr " File storage "
+msgstr " Dossier de stockage "
 
-#: src/translate.c:198
+#: glade/xcfa.glade:5567
 msgid " CD "
 msgstr " CD "
 
-#: src/translate.c:199
+#: glade/xcfa.glade:5615
 msgid "ABR / CBR / VBR / VBR-NEW"
 msgstr "ABR / CBR / VBR / VBR-NEW"
 
-#: src/translate.c:200
+#: glade/xcfa.glade:5660 glade/xcfa.glade:6295
 msgid "Debit"
-msgstr "Bitrate"
+msgstr "Debit"
 
-#: src/translate.c:201
+#: glade/xcfa.glade:5705 glade/xcfa.glade:6317
 msgid "Mode"
 msgstr "Mode"
 
-#: src/translate.c:203 src/translate.c:219 src/translate.c:231
-#: src/translate.c:244 src/translate.c:261 src/translate.c:272
-#: src/translate.c:286 src/translate.c:300
+#: glade/xcfa.glade:5747
+msgid " Lame (fichier mp3): "
+msgstr " Lame (fichier mp3): "
+
+#: glade/xcfa.glade:5827 glade/xcfa.glade:6466 glade/xcfa.glade:6941
+#: glade/xcfa.glade:7469 glade/xcfa.glade:8200 glade/xcfa.glade:8659
+#: glade/xcfa.glade:9192 glade/xcfa.glade:9753
 msgid "Par defaut"
-msgstr "Default"
+msgstr "Par defaut"
 
-#: src/translate.c:204
+#: glade/xcfa.glade:5848
 msgid " Options LAME "
-msgstr " LAME Options "
+msgstr " Options LAME "
 
-#: src/translate.c:205 src/translate.c:233 src/translate.c:274
+#: glade/xcfa.glade:5909 glade/xcfa.glade:7023 glade/xcfa.glade:8741
 msgid "Site officiel"
-msgstr "Official website"
+msgstr "Site officiel"
 
-#: src/translate.c:206
+#: glade/xcfa.glade:5964
 msgid "Wiki mp3 "
-msgstr "mp3 wiki "
+msgstr "Wiki mp3 "
 
-#: src/translate.c:207
+#: glade/xcfa.glade:6020
 msgid "Wiki "
-msgstr "Lame wiki "
+msgstr "Wiki "
 
-#: src/translate.c:208
+#: glade/xcfa.glade:6076
 msgid "ManPage "
-msgstr "Man Page "
+msgstr "ManPage "
 
-#: src/translate.c:209
+#: glade/xcfa.glade:6105
 msgid " Web Lame "
-msgstr " Lame "
+msgstr " Web Lame "
 
-#: src/translate.c:210 src/translate.c:224 src/translate.c:237
-#: src/translate.c:248 src/translate.c:266 src/translate.c:277
-#: src/translate.c:292
+#: glade/xcfa.glade:6181 glade/xcfa.glade:6709 glade/xcfa.glade:7238
+#: glade/xcfa.glade:7644 glade/xcfa.glade:8442 glade/xcfa.glade:8901
+#: glade/xcfa.glade:9491
 msgid "["
 msgstr "["
 
-#: src/translate.c:211 src/translate.c:225 src/translate.c:238
-#: src/translate.c:249 src/translate.c:267 src/translate.c:278
-#: src/translate.c:293
+#: glade/xcfa.glade:6194 glade/xcfa.glade:6722 glade/xcfa.glade:7251
+#: glade/xcfa.glade:7657 glade/xcfa.glade:8455 glade/xcfa.glade:8914
+#: glade/xcfa.glade:9504
 msgid "string option interne"
-msgstr "internal string option"
+msgstr "string option interne"
 
-#: src/translate.c:212 src/translate.c:226 src/translate.c:239
-#: src/translate.c:250 src/translate.c:268 src/translate.c:279
-#: src/translate.c:294
+#: glade/xcfa.glade:6209 glade/xcfa.glade:6737 glade/xcfa.glade:7266
+#: glade/xcfa.glade:7672 glade/xcfa.glade:8470 glade/xcfa.glade:8929
+#: glade/xcfa.glade:9519
 msgid "]"
 msgstr "]"
 
-#: src/translate.c:213
-msgid ""
-" Options experts, definies par l'utilisateur - lame (wav -> mp3) "
-msgstr " User-defined expert options - lame (wav -> mp3) "
+#: glade/xcfa.glade:6234
+msgid " Experts options defined by the user- lame (wav -> mp3) "
+msgstr " Experts options defined by the user- lame (wav -> mp3) "
 
-#: src/translate.c:214
+#: glade/xcfa.glade:6254
 msgid " Mp3 "
 msgstr " Mp3 "
 
-#: src/translate.c:215
-msgid " Mode"
-msgstr " Mode"
+#: glade/xcfa.glade:6306
+msgid "Mode flux (streaming)"
+msgstr "Mode flux (streaming)"
 
-#: src/translate.c:216
-msgid " Mode flux (streaming)"
-msgstr " Streaming"
-
-#: src/translate.c:217
-msgid " Debit"
-msgstr "Bitrate"
+#: glade/xcfa.glade:6386
+msgid " Oggenc (fichier ogg): "
+msgstr " Oggenc (fichier ogg): "
 
-#: src/translate.c:220
+#: glade/xcfa.glade:6487
 msgid " Options OGGENC "
-msgstr " OGGENC Options "
+msgstr " Options OGGENC "
 
-#: src/translate.c:221
+#: glade/xcfa.glade:6548
 msgid "Wiki "
 msgstr "Wiki "
 
-#: src/translate.c:222 src/translate.c:264 src/translate.c:290
-#: src/translate.c:304
+#: glade/xcfa.glade:6604 glade/xcfa.glade:8337 glade/xcfa.glade:9386
+#: glade/xcfa.glade:9947
 msgid "ManPage"
-msgstr "Man Page"
+msgstr "ManPage"
 
-#: src/translate.c:223
+#: glade/xcfa.glade:6633
 msgid " Web Oggenc "
-msgstr " Oggenc "
+msgstr " Web Oggenc "
 
-#: src/translate.c:227
-msgid ""
-" Options experts, definies par l'utilisateur - oggenc (wav -> ogg) "
-msgstr " User-defined expert options - oggenc (wav -> ogg) "
+#: glade/xcfa.glade:6762
+msgid " Experts options defined by the user - oggenc (wav -> ogg) "
+msgstr " Experts options defined by the user - oggenc (wav -> ogg) "
 
-#: src/translate.c:228
+#: glade/xcfa.glade:6782
 msgid " Oggenc "
 msgstr " Oggenc "
 
-#: src/translate.c:229
+#: glade/xcfa.glade:6824
 msgid "Taux de compression"
-msgstr "Compression level"
+msgstr "Taux de compression"
 
-#: src/translate.c:230
+#: glade/xcfa.glade:6861
 msgid " Flac (fichier flac): "
-msgstr " Flac (flac file): "
+msgstr " Flac (fichier flac): "
 
-#: src/translate.c:232
+#: glade/xcfa.glade:6962
 msgid " Options FLAC "
-msgstr " FLAC Options "
+msgstr " Options FLAC "
 
-#: src/translate.c:234 src/translate.c:275
+#: glade/xcfa.glade:7078 glade/xcfa.glade:8796
 msgid "Framasoft "
 msgstr "Framasoft "
 
-#: src/translate.c:235
+#: glade/xcfa.glade:7133
 msgid "ManPage "
-msgstr "Man Page "
+msgstr "ManPage "
 
-#: src/translate.c:236
+#: glade/xcfa.glade:7162
 msgid " Web Flac "
-msgstr " Flac "
+msgstr " Web Flac "
 
-#: src/translate.c:240
-msgid ""
-" Options experts, definies par l'utilisateur - flac (wav -> flac) "
-msgstr " User-defined expert options - flac (wav -> flac) "
+#: glade/xcfa.glade:7291
+msgid " Experts options defined by the user- flac (wav -> flac) "
+msgstr " Experts options defined by the user- flac (wav -> flac) "
 
-#: src/translate.c:241
+#: glade/xcfa.glade:7311
 msgid " Flac "
 msgstr " Flac "
 
-#: src/translate.c:242
+#: glade/xcfa.glade:7353
 msgid " Qualite"
-msgstr " Quality"
+msgstr " Qualite"
 
-#: src/translate.c:243
+#: glade/xcfa.glade:7389
 msgid " Mac (fichier ape): "
-msgstr " Mac (ape file): "
+msgstr " Mac (fichier ape): "
 
-#: src/translate.c:245
+#: glade/xcfa.glade:7490
 msgid " Options MAC "
-msgstr " MAC Options "
+msgstr " Options MAC "
 
-#: src/translate.c:246
+#: glade/xcfa.glade:7546
 msgid "Wiki"
 msgstr "Wiki"
 
-#: src/translate.c:247
+#: glade/xcfa.glade:7568
 msgid " Web Mac "
-msgstr " Mac "
+msgstr " Web Mac "
 
-#: src/translate.c:251
-msgid " Options experts, definies par l'utilisateur - mac (wav -> ape) "
-msgstr " User-defined expert options - mac (wav -> ape) "
+#: glade/xcfa.glade:7697
+msgid " Experts options defined by the user - mac (wav -> ape) "
+msgstr " Experts options defined by the user - mac (wav -> ape) "
 
-#: src/translate.c:252
+#: glade/xcfa.glade:7717
 msgid " Mac "
 msgstr " Mac "
 
-#: src/translate.c:253
+#: glade/xcfa.glade:7765
 msgid "Compression"
 msgstr "Compression"
 
-#: src/translate.c:254
+#: glade/xcfa.glade:7817
 msgid "Son"
-msgstr "Channel mode"
+msgstr "Son"
 
-#: src/translate.c:255
+#: glade/xcfa.glade:7869
 msgid "Mode hybride"
-msgstr "Hybrid mode"
+msgstr "Mode hybride"
 
-#: src/translate.c:256
+#: glade/xcfa.glade:7921
 msgid "Fichier de correction"
-msgstr "Correction file"
+msgstr "Fichier de correction"
 
-#: src/translate.c:257
+#: glade/xcfa.glade:7973
 msgid "Compression maximum"
-msgstr "Maximum compression"
+msgstr "Compression maximum"
 
-#: src/translate.c:258
+#: glade/xcfa.glade:8025
 msgid "Signature MD5"
-msgstr "MD5 signature"
+msgstr "Signature MD5"
 
-#: src/translate.c:259
+#: glade/xcfa.glade:8077
 msgid "Extra encode processing"
 msgstr "Extra encode processing"
 
-#: src/translate.c:260
+#: glade/xcfa.glade:8120
 msgid " WavPack (fichier wv): "
-msgstr " WavPack (wv file): "
+msgstr " WavPack (fichier wv): "
 
-#: src/translate.c:262
+#: glade/xcfa.glade:8221
 msgid " Options WAVPACK "
-msgstr " WAVPACK Options "
+msgstr " Options WAVPACK "
 
-#: src/translate.c:263
+#: glade/xcfa.glade:8282
 msgid "Wiki "
 msgstr "Wiki "
 
-#: src/translate.c:265
+#: glade/xcfa.glade:8366
 msgid " Web Wavpack "
-msgstr " Wavpack "
+msgstr " Web Wavpack "
 
-#: src/translate.c:269
-msgid ""
-" Options experts, definies par l'utilisateur - wavpack (wav -> wv) "
-msgstr " User-defined expert options - wavpack (wav -> wv) "
+#: glade/xcfa.glade:8495
+msgid " Experts options defined by the user - wavpack (wav -> wv) "
+msgstr " Experts options defined by the user - wavpack (wav -> wv) "
 
-#: src/translate.c:270
+#: glade/xcfa.glade:8515
 msgid " Wavpack "
 msgstr " Wavpack "
 
-#: src/translate.c:271
+#: glade/xcfa.glade:8579
 msgid " MusePack (fichier mpc): "
-msgstr " MusePack (mpc file): "
+msgstr " MusePack (fichier mpc): "
 
-#: src/translate.c:273
+#: glade/xcfa.glade:8680
 msgid " Options MUSEPACK "
-msgstr " MUSEPACK Options "
+msgstr " Options MUSEPACK "
 
-#: src/translate.c:276
+#: glade/xcfa.glade:8825
 msgid " Web Musepack "
-msgstr " Musepack "
+msgstr " Web Musepack "
 
-#: src/translate.c:280
-msgid ""
-" Options experts, definies par l'utilisateur - musepack (wav -> mpc) "
-msgstr " User-defined expert options - musepack (wav -> mpc) "
+#: glade/xcfa.glade:8954
+msgid " Experts options defined by the user- musepack (wav -> mpc) "
+msgstr " Experts options defined by the user- musepack (wav -> mpc) "
 
-#: src/translate.c:281
+#: glade/xcfa.glade:8974
 msgid " Musepack "
 msgstr " Musepack "
 
-#: src/translate.c:282
-msgid " Qualite VBR / Debit ABR"
-msgstr "VBR Quality / ABR rate"
+#: glade/xcfa.glade:9016
+msgid "Conteneur"
+msgstr "Conteneur"
 
-#: src/translate.c:283
-msgid " VBR / ABR"
-msgstr " VBR / ABR"
+#: glade/xcfa.glade:9027
+msgid "VBR / ABR"
+msgstr "VBR / ABR"
 
-#: src/translate.c:284
-msgid " Conteneur"
-msgstr " Container"
+#: glade/xcfa.glade:9038
+msgid "Qualite VBR / Debit ABR"
+msgstr "Qualite VBR / Debit ABR"
 
-#: src/translate.c:285
+#: glade/xcfa.glade:9112
 msgid " Faac (fichier .m4a): "
-msgstr " Faac (file .m4a): "
+msgstr " Faac (fichier .m4a): "
 
-#: src/translate.c:287
+#: glade/xcfa.glade:9213
 msgid " Options FAAC "
-msgstr " FAAC Options "
+msgstr " Options FAAC "
 
-#: src/translate.c:288 src/translate.c:302
+#: glade/xcfa.glade:9274 glade/xcfa.glade:9835
 msgid "Site officiel "
-msgstr "Official website "
+msgstr "Site officiel "
 
-#: src/translate.c:289 src/translate.c:303
+#: glade/xcfa.glade:9330 glade/xcfa.glade:9891
 msgid "Web Info "
-msgstr "Info "
+msgstr "Web Info "
 
-#: src/translate.c:291
+#: glade/xcfa.glade:9415
 msgid " Web Faac "
-msgstr " Faac "
+msgstr " Web Faac "
 
-#: src/translate.c:295
-msgid ""
-" Options experts, definies par l'utilisateur - faac (wav -> m4a) "
-msgstr " User-defined expert options - faac (wav -> m4a) "
+#: glade/xcfa.glade:9544
+msgid " Experts options defined by the user - faac (wav -> m4a) "
+msgstr " Experts options defined by the user - faac (wav -> m4a) "
 
-#: src/translate.c:296
+#: glade/xcfa.glade:9564
 msgid " Faac "
 msgstr " Faac "
 
-#: src/translate.c:297
-msgid " Stereo: Qualite en kbit/s"
-msgstr " Stereo: Quality in kbit/s"
+#: glade/xcfa.glade:9606
+msgid "Mono: Qualite en kbit/s"
+msgstr "Mono: Qualite en kbit/s"
 
-#: src/translate.c:298
-msgid " Mono: Qualite en kbit/s"
-msgstr " Mono: Quality en kbit/s"
+#: glade/xcfa.glade:9617
+msgid "Stereo: Qualite en kbit/s"
+msgstr "Stereo: Qualite en kbit/s"
 
-#: src/translate.c:299
+#: glade/xcfa.glade:9673
 msgid " AacplusEnc (fichier .aac): "
-msgstr " AacplusEnc (file .aac): "
+msgstr " AacplusEnc (fichier .aac): "
 
-#: src/translate.c:301
+#: glade/xcfa.glade:9774
 msgid " Options AacPlusEnc "
-msgstr " AacPlusEnc Options "
+msgstr " Options AacPlusEnc "
 
-#: src/translate.c:305
+#: glade/xcfa.glade:9976
 msgid " Web AacPlusEnc "
-msgstr " AacPlusEnc "
+msgstr " Web AacPlusEnc "
 
-#: src/translate.c:306
+#: glade/xcfa.glade:10021
 msgid " AacplusEnc "
 msgstr " AacplusEnc "
 
-#: src/translate.c:307
+#: glade/xcfa.glade:10051
 msgid "Artiste"
-msgstr "Artist"
+msgstr "Artiste"
 
-#: src/translate.c:308 src/translate.c:335
+#: glade/xcfa.glade:10070 glade/xcfa_win_treeview.glade:95
 msgid "Titre"
-msgstr "Title"
+msgstr "Titre"
 
-#: src/translate.c:309
+#: glade/xcfa.glade:10089
 msgid "Album"
 msgstr "Album"
 
-#: src/translate.c:310
+#: glade/xcfa.glade:10108
 msgid "Numero"
-msgstr "Number"
+msgstr "Numero"
 
-#: src/translate.c:311
+#: glade/xcfa.glade:10127
 msgid "Genre"
 msgstr "Genre"
 
-#: src/translate.c:312
+#: glade/xcfa.glade:10146
 msgid "Annee"
-msgstr "Year"
+msgstr "Annee"
 
-#: src/translate.c:313
+#: glade/xcfa.glade:10165
 msgid "Commentaire"
-msgstr "Comment"
+msgstr "Commentaire"
 
-#: src/translate.c:314
+#: glade/xcfa.glade:10190
 msgid " Exportation de "
-msgstr " Export "
+msgstr " Exportation de "
 
-#: src/translate.c:316
+#: glade/xcfa.glade:10226
 msgid " Preferences "
 msgstr " Preferences "
 
-#: src/translate.c:317
+#: glade/xcfa.glade:10289
 msgid "SCAN"
 msgstr "SCAN"
 
-#: src/translate.c:318
+#: glade/xcfa.glade:10303
 msgid " Installation "
 msgstr " Installation "
 
-#: src/translate.c:319
-msgid " Votre systeme utilise ... "
-msgstr " Your system uses ... "
+#: glade/xcfa.glade:10338
+msgid " Your system use ... "
+msgstr " Your system use ... "
 
-#: src/translate.c:320
+#: glade/xcfa.glade:10375
 msgid ""
 "\n"
-"Pour installer les programmes externes requis,\n"
-"veuillez utiliser l'installateur de votre distribution Gnu/Linux.\n"
+"To install the required external programs\n"
+"Please use the installer to your distribution Gnu / Linux.\n"
 msgstr ""
 "\n"
-"To install the required external software,\n"
-"please use the package manager of your Gnu/Linux distribution.\n"
+"To install the required external programs\n"
+"Please use the installer to your distribution Gnu / Linux.\n"
 
-#: src/translate.c:321
+#: glade/xcfa.glade:10393
 msgid ""
 "Le programme XCFA_INSTALL_ALL ecrit en Perl vous sera utile en ligne de "
 "commande pour une installation des programmes complementaire."
 msgstr ""
-"The program XCFA_INSTALL_ALL written in Perl will be useful on the command "
-"line for installation of supplementary programs"
+"Le programme XCFA_INSTALL_ALL ecrit en Perl vous sera utile en ligne de "
+"commande pour une installation des programmes complementaire."
 
-#: src/translate.c:322
+#: glade/xcfa.glade:10419
 msgid " Informations "
 msgstr " Informations "
 
-#: src/translate.c:323
-msgid " Application externes "
-msgstr " External programs "
+#: glade/xcfa.glade:10443
+msgid " External application "
+msgstr " External application "
 
-#: src/translate.c:324 src/translate.c:326
+#: glade/xcfa.glade:10514 glade/xcfa.glade:10618
 msgid "parametres:"
-msgstr "parameters:"
+msgstr "parametres:"
 
-#: src/translate.c:325
-msgid "Navigateur"
-msgstr "browsers"
-
-#: src/translate.c:327
-msgid "Lecteurs audio"
-msgstr "Audio player"
-
-#: src/translate.c:328
-msgid " Navigateurs / Lecteurs audio "
-msgstr " Browsers / Audio player"
-
-#: src/translate.c:329
-msgid " Applications externes "
-msgstr " External programs "
-
-#: src/translate.c:330
-msgid "Scan en cours ..."
-msgstr "Scan in progress ..."
-
-#: src/translate.c:331
-msgid "Scan du support en cours ..."
-msgstr "Media scan in progress..."
-
-#: src/translate.c:332
-msgid "Detail extraction mode expert"
-msgstr "Rip details - expert mode"
-
-#: src/translate.c:333
-msgid "Modification des champs"
-msgstr "Modify fields"
-
-#: src/translate.c:334
+#: glade/xcfa.glade:10527
 msgid ""
 "\n"
-"Modification des champs\n"
+" konqueror : newTab\n"
+" iceweasel : -new-window -new-tab \n"
 msgstr ""
 "\n"
-"Modify fields\n"
+" konqueror : newTab\n"
+" iceweasel : -new-window -new-tab \n"
 
-#: src/translate.c:342 src/translate.c:361 src/translate.c:382
-#: src/translate.c:394 src/translate.c:405 src/translate.c:413
-msgid " Visibilite "
-msgstr " Visibility "
-
-#: src/translate.c:343 src/translate.c:362 src/translate.c:383
-#: src/translate.c:395 src/translate.c:406 src/translate.c:414
-msgid "Nom a gauche"
-msgstr "Name to left"
-
-#: src/translate.c:344 src/translate.c:363 src/translate.c:384
-#: src/translate.c:396 src/translate.c:407 src/translate.c:415
-msgid "Nom au centre"
-msgstr "Name centred"
-
-#: src/translate.c:345 src/translate.c:364 src/translate.c:385
-#: src/translate.c:397 src/translate.c:408 src/translate.c:416
-msgid "Nom a droite"
-msgstr "Name to right"
-
-#: src/translate.c:346
-msgid "DVD"
-msgstr "DVD"
-
-#: src/translate.c:351 src/translate.c:372
-msgid "Wavpack"
-msgstr "Wavpack"
-
-#: src/translate.c:355 src/translate.c:376
-msgid "Musepack"
-msgstr "Musepack"
-
-#: src/translate.c:365
-msgid "CD"
-msgstr "CD"
-
-#: src/translate.c:380
-msgid "Replaygain"
-msgstr "Replaygain"
-
-#: src/translate.c:386
-msgid "CONVERSIONS"
-msgstr "CONVERSIONS"
-
-#: src/translate.c:387
-msgid "Hertz"
-msgstr "Hertz"
-
-#: src/translate.c:388
-msgid "New Hertz"
-msgstr "New Hertz"
-
-#: src/translate.c:389
-msgid "Voie"
-msgstr "Voice"
-
-#: src/translate.c:390
-msgid "New Voie"
-msgstr "New Voice"
-
-#: src/translate.c:391
-msgid "Bits"
-msgstr "Bits"
-
-#: src/translate.c:392
-msgid "New Bits"
-msgstr "New Bits"
-
-#: src/translate.c:398
-msgid "WAV"
-msgstr "WAV"
-
-#: src/translate.c:401
-msgid "New Bitrate"
-msgstr "New Bitrat"
-
-#: src/translate.c:402
-msgid "Size"
-msgstr "Size"
-
-#: src/translate.c:409
-msgid "MP3-OGG"
-msgstr "MP3-OGG"
-
-#: src/translate.c:417
-msgid "TAGS"
-msgstr "TAGS"
+#: glade/xcfa.glade:10548
+msgid "Navigateur"
+msgstr "Navigateur"
 
-#: src/translate.c:418
-msgid "Selection globale"
-msgstr "Select all"
+#: glade/xcfa.glade:10648
+msgid "Lecteurs audio"
+msgstr "Lecteurs audio"
 
-#: src/translate.c:419
-msgid "Deselection globale"
-msgstr "Clear all"
+#: glade/xcfa.glade:10669
+msgid "  Browsers / Audio Players "
+msgstr "  Browsers / Audio Players "
 
-#: src/translate.c:420
-msgid "Retour"
-msgstr "Return"
+#: glade/xcfa.glade:10692
+msgid " Applications externes "
+msgstr " Applications externes "
 
-#: src/translate.c:421
+#: glade/xcfa_win_about.glade:7
 msgid "About X Convert File Audio"
 msgstr "About X Convert File Audio"
 
-#: src/translate.c:422
+#: glade/xcfa_win_about.glade:103
 msgid "Author"
 msgstr "Author"
 
-#: src/translate.c:423
+#: glade/xcfa_win_about.glade:139
 msgid "Licence"
-msgstr "License"
+msgstr "Licence"
 
-#: src/translate.c:424
+#: glade/xcfa_win_about.glade:163
 msgid " Informations "
 msgstr " Informations "
 
-#: src/translate.c:425
+#: glade/xcfa_win_about.glade:198
 msgid " Machine "
-msgstr " Computer "
+msgstr " Machine "
 
-#: src/translate.c:426
+#: glade/xcfa_win_about.glade:333
 msgid "Ingenieurs du son\n"
-msgstr "Sound engineers\n"
+msgstr "Ingenieurs du son\n"
 
-#: src/translate.c:427
+#: glade/xcfa_win_about.glade:350
 msgid ""
 "\n"
 "Graphisme\n"
 msgstr ""
 "\n"
-"Graphics\n"
+"Graphisme\n"
 
-#: src/translate.c:428
+#: glade/xcfa_win_about.glade:370
 msgid ""
 "Traduction Anglaise\n"
 "\n"
 "\n"
 msgstr ""
-"English translation\n"
+"Traduction Anglaise\n"
 "\n"
 "\n"
 
-#: src/translate.c:429
+#: glade/xcfa_win_about.glade:391
 msgid ""
 "\n"
 "Traduction Allemande"
 msgstr ""
 "\n"
-"German translation"
+"Traduction Allemande"
 
-#: src/translate.c:430
+#: glade/xcfa_win_about.glade:628
 msgid ""
 "\n"
 "Codeur Xcfa"
 msgstr ""
 "\n"
-"XCFA programmer"
+"Codeur Xcfa"
 
-#: src/translate.c:431
+#: glade/xcfa_win_about.glade:665
 msgid ""
 "\n"
 "ElementSpeak pour Xcfa "
 msgstr ""
 "\n"
-"ElementSpeak for XCFA··"
+"ElementSpeak pour Xcfa "
 
-#: src/translate.c:432
+#: glade/xcfa_win_about.glade:702
 msgid ""
 "\n"
 "Codeur pages Web"
 msgstr ""
 "\n"
-"Webmasters"
+"Codeur pages Web"
 
-#: src/translate.c:433
+#: glade/xcfa_win_about.glade:739
 msgid ""
 "\n"
 "Traduction Italienne"
 msgstr ""
 "\n"
-"Italian translation"
+"Traduction Italienne"
 
-#: src/translate.c:434
+#: glade/xcfa_win_about.glade:800
 msgid ""
 "\n"
 "\n"
@@ -2658,53 +2460,45 @@
 msgstr ""
 "\n"
 "\n"
-"Useful links\n"
+"Pages a visiter\n"
 
-#: src/translate.c:435
+#: glade/xcfa_win_about.glade:1123
 msgid "Linux On The Root"
 msgstr "Linux On The Root"
 
-#: src/translate.c:436
+#: glade/xcfa_win_about.glade:1180
 msgid "Frugalware"
 msgstr "Frugalware"
 
-#: src/translate.c:437
+#: glade/xcfa_win_about.glade:1237
 msgid "Road2Mayotte"
 msgstr "Road2Mayotte"
 
-#: src/translate.c:438
+#: glade/xcfa_win_about.glade:1294
 msgid "La Linuxerie"
 msgstr "La Linuxerie"
 
-#: src/translate.c:439
-msgid "Audioptimisation by Dzef"
-msgstr "Audioptimisation by Dzef"
-
-#: src/translate.c:440
+#: glade/xcfa_win_about.glade:1351
 msgid "Tuxfamily"
 msgstr "Tuxfamily"
 
-#: src/translate.c:441
+#: glade/xcfa_win_about.glade:1408
 msgid "Framasoft"
 msgstr "Framasoft"
 
-#: src/translate.c:442
+#: glade/xcfa_win_about.glade:1465
 msgid "Ekd (EnKoDeur-Mixeur)"
 msgstr "Ekd (EnKoDeur-Mixeur)"
 
-#: src/translate.c:443
-msgid "Bishop's page"
-msgstr "Bishop's page"
+#: glade/xcfa_win_about.glade:1544
+msgid "Debian Multimedia"
+msgstr "Debian Multimedia"
 
-#: src/translate.c:444
+#: glade/xcfa_win_about.glade:1598
 msgid "Je suis libre"
 msgstr "Je suis libre"
 
-#: src/translate.c:445
-msgid "Debian Multimedia"
-msgstr "Debian Multimedia"
-
-#: src/translate.c:446
+#: glade/xcfa_win_about.glade:1705
 msgid ""
 "\n"
 "Forum\n"
@@ -2712,19 +2506,15 @@
 "\n"
 "Forum\n"
 
-#: src/translate.c:447
-msgid "XCFA Vorstellung "
-msgstr "XCFA Vorstellung "
+#: glade/xcfa_win_about.glade:1825
+msgid "Forum Xcfa"
+msgstr "Forum Xcfa"
 
-#: src/translate.c:448
+#: glade/xcfa_win_about.glade:1879
 msgid "XCFA LinuxForen.de"
 msgstr "XCFA LinuxForen.de"
 
-#: src/translate.c:449
-msgid "Forum Xcfa"
-msgstr "Forum Xcfa"
-
-#: src/translate.c:450
+#: glade/xcfa_win_about.glade:1929
 msgid ""
 "\n"
 "Documentation\n"
@@ -2732,102 +2522,208 @@
 "\n"
 "Documentation\n"
 
-#: src/translate.c:451
+#: glade/xcfa_win_about.glade:2164
 msgid "Wiki Xcfa par Shankarius"
-msgstr "XCFA wiki by Shankarius"
+msgstr "Wiki Xcfa par Shankarius"
 
-#: src/translate.c:452
+#: glade/xcfa_win_about.glade:2219
 msgid "Doc Xcfa par Patachon"
-msgstr "XCFA doc. by Patachon"
+msgstr "Doc Xcfa par Patachon"
 
-#: src/translate.c:453
+#: glade/xcfa_win_about.glade:2276
 msgid "Ogg Vorbis explique par Shankarius"
-msgstr "Ogg Vorbis explained by Shankarius"
+msgstr "Ogg Vorbis explique par Shankarius"
 
-#: src/translate.c:454
+#: glade/xcfa_win_about.glade:2333
 msgid "La normalisation expliquee par Dzef"
-msgstr "Normalisation explained by Dzef"
+msgstr "La normalisation expliquee par Dzef"
 
-#: src/translate.c:455
+#: glade/xcfa_win_about.glade:2390
 msgid "Xcfa sur Linux On The Root"
-msgstr "XCFA on Linux On The Root"
+msgstr "Xcfa sur Linux On The Root"
 
-#: src/translate.c:456
+#: glade/xcfa_win_about.glade:2433
 msgid " Contributions "
 msgstr " Contributions "
 
-#: src/translate.c:457
+#: glade/xcfa_win_about.glade:2461
 msgid " License "
-msgstr " Licence "
+msgstr " License "
 
-#: src/translate.c:458
+#: glade/xcfa_win_about.glade:2482
 msgid "OK"
 msgstr "OK"
 
-#: src/web.c:147 src/web.c:207
-msgid "PAS de navigateur present"
-msgstr "No web browser"
+#: glade/xcfa_win_scan.glade:9
+msgid "Scan en cours ..."
+msgstr "Scan en cours ..."
 
-#: src/web.c:148
-msgid "L'acces au web est impossible car aucun navigateur"
-msgstr "No Web access: no web browser"
+#: glade/xcfa_win_scan.glade:77
+msgid "Scan du support en cours ..."
+msgstr "Scan du support en cours ..."
 
-#: src/web.c:150
-msgid "n'est present dans votre configuration."
-msgstr "found in your system"
+#: glade/xcfa_win_scan.glade:128
+msgid "Detail extraction mode expert"
+msgstr "Detail extraction mode expert"
 
-#: src/web.c:152
-msgid "Veuillez installez un navigateur."
-msgstr "Please install a web browser"
+#: glade/xcfa_win_treeview.glade:7
+msgid "Modification des champs"
+msgstr "Modification des champs"
 
-#: src/web.c:161
-msgid "Vous devez ouvrir l'acces internet"
-msgstr "You need to enable web access"
+#: glade/xcfa_win_treeview.glade:41
+msgid ""
+"\n"
+"Modification des champs\n"
+msgstr ""
+"\n"
+"Modification des champs\n"
 
-#: src/web.c:209
-msgid " L'acces au web est impossible car aucun navigateur"
-msgstr " No Web access: no web browser"
+#: glade/xcfa_win_treeview.glade:129
+msgid "Temps"
+msgstr "Temps"
 
-#: src/web.c:211
-msgid " n'est present dans votre configuration."
-msgstr " found in your system"
+#: glade/xcfa_win_treeview.glade:163
+msgid "Choix"
+msgstr "Choix"
 
-#: src/web.c:213
-msgid " Veuillez installez un navigateur."
-msgstr " Please install a web browser"
+#: glade/xcfa_win_treeview.glade:197 glade/xcfa_win_treeview.glade:577
+#: glade/xcfa_win_treeview.glade:995 glade/xcfa_win_treeview.glade:1260
+#: glade/xcfa_win_treeview.glade:1508 glade/xcfa_win_treeview.glade:1706
+msgid "Nom"
+msgstr "Nom"
 
-#: src/web.c:222
-msgid "L'application est absente."
-msgstr "Application is missing."
+#: glade/xcfa_win_treeview.glade:220 glade/xcfa_win_treeview.glade:600
+#: glade/xcfa_win_treeview.glade:1018 glade/xcfa_win_treeview.glade:1283
+#: glade/xcfa_win_treeview.glade:1531 glade/xcfa_win_treeview.glade:1732
+msgid " Visibilite "
+msgstr " Visibilite "
 
-#: src/web.c:223
-msgid "Veuillez installer : "
-msgstr "Please install : "
+#: glade/xcfa_win_treeview.glade:250 glade/xcfa_win_treeview.glade:630
+#: glade/xcfa_win_treeview.glade:1048 glade/xcfa_win_treeview.glade:1313
+#: glade/xcfa_win_treeview.glade:1562 glade/xcfa_win_treeview.glade:1763
+msgid "Nom a gauche"
+msgstr "Nom a gauche"
 
-#: src/win_about.c:138
-msgid " Xcfa sur le web"
-msgstr " XCFA on the web"
+#: glade/xcfa_win_treeview.glade:267 glade/xcfa_win_treeview.glade:647
+#: glade/xcfa_win_treeview.glade:1065 glade/xcfa_win_treeview.glade:1330
+#: glade/xcfa_win_treeview.glade:1579 glade/xcfa_win_treeview.glade:1780
+msgid "Nom au centre"
+msgstr "Nom au centre"
 
-#: src/win_about.c:188
-msgid ""
-"\n"
-"Au tout debut:\n"
-"\n"
-"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
-"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
-"... ;-)\n"
-"\n"
-""
-msgstr ""
-"\n"
-"In the beginning:\n"
-"\n"
-"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
-"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
-"... ;-)\n"
-"\n"
-""
+#: glade/xcfa_win_treeview.glade:286 glade/xcfa_win_treeview.glade:666
+#: glade/xcfa_win_treeview.glade:1084 glade/xcfa_win_treeview.glade:1349
+#: glade/xcfa_win_treeview.glade:1598 glade/xcfa_win_treeview.glade:1799
+msgid "Nom a droite"
+msgstr "Nom a droite"
 
-#: src/win_scan.c:166
-msgid "Waiting ..."
-msgstr "Waiting ..."
+#: glade/xcfa_win_treeview.glade:326
+msgid "DVD"
+msgstr "DVD"
+
+#: glade/xcfa_win_treeview.glade:373 glade/xcfa_win_treeview.glade:791
+msgid "Wav"
+msgstr "Wav"
+
+#: glade/xcfa_win_treeview.glade:390 glade/xcfa_win_treeview.glade:808
+msgid "Flac"
+msgstr "Flac"
+
+#: glade/xcfa_win_treeview.glade:407 glade/xcfa_win_treeview.glade:825
+msgid "Ape"
+msgstr "Ape"
+
+#: glade/xcfa_win_treeview.glade:424 glade/xcfa_win_treeview.glade:842
+msgid "Wavpack"
+msgstr "Wavpack"
+
+#: glade/xcfa_win_treeview.glade:441 glade/xcfa_win_treeview.glade:859
+msgid "Ogg"
+msgstr "Ogg"
+
+#: glade/xcfa_win_treeview.glade:458 glade/xcfa_win_treeview.glade:876
+msgid "M4a"
+msgstr "M4a"
+
+#: glade/xcfa_win_treeview.glade:475 glade/xcfa_win_treeview.glade:893
+msgid "Aac"
+msgstr "Aac"
+
+#: glade/xcfa_win_treeview.glade:492 glade/xcfa_win_treeview.glade:910
+msgid "Musepack"
+msgstr "Musepack"
+
+#: glade/xcfa_win_treeview.glade:509 glade/xcfa_win_treeview.glade:927
+msgid "Mp3"
+msgstr "Mp3"
+
+#: glade/xcfa_win_treeview.glade:526
+msgid "Num"
+msgstr "Num"
+
+#: glade/xcfa_win_treeview.glade:709
+msgid "CD"
+msgstr "CD"
+
+#: glade/xcfa_win_treeview.glade:978
+msgid "Replaygain"
+msgstr "Replaygain"
+
+#: glade/xcfa_win_treeview.glade:1127
+msgid "CONVERSIONS"
+msgstr "CONVERSIONS"
+
+#: glade/xcfa_win_treeview.glade:1158
+msgid "Hertz"
+msgstr "Hertz"
+
+#: glade/xcfa_win_treeview.glade:1175
+msgid "New Hertz"
+msgstr "New Hertz"
+
+#: glade/xcfa_win_treeview.glade:1192
+msgid "Voie"
+msgstr "Voie"
+
+#: glade/xcfa_win_treeview.glade:1209
+msgid "New Voie"
+msgstr "New Voie"
+
+#: glade/xcfa_win_treeview.glade:1226
+msgid "Bits"
+msgstr "Bits"
+
+#: glade/xcfa_win_treeview.glade:1243
+msgid "New Bits"
+msgstr "New Bits"
+
+#: glade/xcfa_win_treeview.glade:1392
+msgid "WAV"
+msgstr "WAV"
+
+#: glade/xcfa_win_treeview.glade:1440
+msgid "Bitrate"
+msgstr "Bitrate"
+
+#: glade/xcfa_win_treeview.glade:1457
+msgid "New Bitrate"
+msgstr "New Bitrate"
+
+#: glade/xcfa_win_treeview.glade:1641
+msgid "MP3-OGG"
+msgstr "MP3-OGG"
+
+#: glade/xcfa_win_treeview.glade:1842
+msgid "TAGS"
+msgstr "TAGS"
+
+#: glade/xcfa_win_treeview.glade:1894
+msgid "Selection globale"
+msgstr "Selection globale"
+
+#: glade/xcfa_win_treeview.glade:1948
+msgid "Deselection globale"
+msgstr "Deselection globale"
+
+#: glade/xcfa_win_treeview.glade:2009
+msgid "Retour"
+msgstr "Retour"

xcfa-4.2.8.tar.gz/po/en_GB.gmo -> xcfa-5.0.2.tar.gz/po/en_GB.gmo Changed

xcfa-4.2.8.tar.gz/po/en_GB.po -> xcfa-5.0.2.tar.gz/po/en_GB.po Changed

@@ -5,239 +5,184 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xcfa 4.2.8\n"
+"Project-Id-Version: xcfa 5.0.2\n"
 "Report-Msgid-Bugs-To: xcfa@tuxfamily.org\n"
-"POT-Creation-Date: 2012-02-03 13:22+0100\n"
-"PO-Revision-Date: 2010-08-21 18:45+0100\n"
+"POT-Creation-Date: 2015-05-16 14:03+0200\n"
+"PO-Revision-Date: 2015-02-06 15:48+0100\n"
 "Last-Translator: Gerry Butler <gdebuitleirATgmailDOTcom>\n"
 "Language-Team: English <en@li.org>\n"
-"Language: en\n"
+"Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.7.3\n"
 
-#: src/cd_audio.c:815 src/dvd.c:684 src/dvd.c:1327
-msgid "MPLAYER deja en action"
+#: src/cd_audio.c:814 src/dvd.c:686 src/dvd.c:1345
+msgid "MPLAYER already in action"
 msgstr "MPLAYER already in action"
 
-#: src/cd_audio.c:816 src/dvd.c:685 src/dvd.c:1328
-msgid "MPLAYER est deja utilise !!"
+#: src/cd_audio.c:815 src/dvd.c:687 src/dvd.c:1346
+msgid "MPLAYER is already in use !!"
 msgstr "MPLAYER is already in use !!"
 
-#: src/cd_audio.c:1227 src/cd_audio.c:1233 src/dvd.c:871 src/file.c:2830
-msgid "(Click Droit = Menu) / En attente de selection."
+#: src/cd_audio.c:1227 src/cd_audio.c:1233 src/file.c:2837
+msgid "(Right click = Menu) / Waiting for selection."
 msgstr "(Right click = Menu) / Waiting for selection."
 
-#: src/cd_audio.c:1230 src/file.c:2827
-msgid "Le programme externe d'extraction est absent."
-msgstr "The external ripping program is missing"
+#: src/cd_audio.c:1230
+msgid "The external ripping program is missing."
+msgstr "The external ripping program is missing."
 
-#: src/cd_audio.c:1236 src/file.c:2833
-msgid "(Click Droit = Menu) / En attente de selection. Le fichier existe."
-msgstr "(Right click = Menu) / Waiting for Selection. File exists."
+#: src/cd_audio.c:1236
+msgid "(Right click = Menu) / Waiting for Selection. File exists.."
+msgstr "(Right click = Menu) / Waiting for Selection. File exists.."
 
-#: src/cd_audio.c:1239 src/file.c:2836
-msgid "(Click Droit = Menu) / En selection."
-msgstr "(Right click = Menu) / Selected files"
+#: src/cd_audio.c:1239
+msgid "(Right click = Menu) / Selected files."
+msgstr "(Right click = Menu) / Selected files."
 
-#: src/cd_audio.c:1242 src/file.c:2842
-msgid "(Click Droit = Menu) / Selection avec options expert."
+#: src/cd_audio.c:1242 src/file.c:2849
+msgid "(Right click = Menu) / Selection - expert mode."
 msgstr "(Right click = Menu) / Selection - expert mode."
 
-#: src/cd_audio.c:1245 src/file.c:2839
-msgid "(Click Droit = Menu) / En selection. Le fichier existe."
+#: src/cd_audio.c:1245 src/file.c:2846
+msgid "(Right click = Menu) / Selected files. File exists."
 msgstr "(Right click = Menu) / Selected files. File exists."
 
-#: src/cd_audio.c:1248 src/file.c:2845
-msgid ""
-"(Click Droit = Menu) / Selection avec options expert. Le fichier existe."
+#: src/cd_audio.c:1248 src/file.c:2852
+msgid "(Right click = Menu) / Selection - expert mode. File exists."
 msgstr "(Right click = Menu) / Selection - expert mode. File exists."
 
 #: src/cd_audio.c:1257
 msgid ""
-"(Click Droit = Menu) / Possibilite d'ajustement INDIVIDUEL ou COLLECTIF "
-"maximal du volume"
+"(Right click = Menu) / Possibilities for individual adaptation or maximum "
+"collection volume"
 msgstr ""
 "(Right click = Menu) / Possibilities for individual adaptation or maximum "
 "collection volume"
 
 #: src/cd_audio.c:1262
-msgid "(Click Droit = Menu) / Ajustement INDIVIDUEL maximal du volume"
-msgstr "(Click Droit = Menu) / INDIVIDUAL maximum volume adjustment"
+msgid "(Right click = Menu) / INDIVIDUAL maximum volume adjustment"
+msgstr "(Right click = Menu) / INDIVIDUAL maximum volume adjustment"
 
 #: src/cd_audio.c:1265
-msgid "(Click Droit = Menu) / Ajustement COLLECTIF maximal du volume"
-msgstr "(Click Droit = Menu) / COLLECTIVE maximum volume adjustment"
-
-#: src/cd_audio.c:1505 src/dvd.c:1103 src/file.c:3139 src/translate.c:336
-#: src/translate.c:347 src/translate.c:366
-msgid "Play"
-msgstr "Play"
-
-#: src/cd_audio.c:1546 src/file.c:3204 src/translate.c:348 src/translate.c:369
-msgid "Wav"
-msgstr "Wav"
-
-#: src/cd_audio.c:1567 src/file.c:3223 src/translate.c:349 src/translate.c:370
-msgid "Flac"
-msgstr "Flac"
-
-#: src/cd_audio.c:1587 src/file.c:3242 src/translate.c:350 src/translate.c:371
-msgid "Ape"
-msgstr "Ape"
-
-#: src/cd_audio.c:1607 src/file.c:3261
-msgid "WavP"
-msgstr "WavP"
-
-#: src/cd_audio.c:1627 src/file.c:3280 src/translate.c:352 src/translate.c:373
-msgid "Ogg"
-msgstr "Ogg"
-
-#: src/cd_audio.c:1648 src/file.c:3299 src/translate.c:353 src/translate.c:374
-msgid "M4a"
-msgstr "M4a"
-
-#: src/cd_audio.c:1669 src/file.c:3318 src/translate.c:354 src/translate.c:375
-msgid "Aac"
-msgstr "Aac"
-
-#: src/cd_audio.c:1689 src/file.c:3337
-msgid "Mpc"
-msgstr "Mpc"
-
-#: src/cd_audio.c:1709 src/file.c:3356 src/translate.c:356 src/translate.c:377
-msgid "Mp3"
-msgstr "Mp3"
+msgid "(Right click = Menu) / COLLECTIVE maximum volume adjustment"
+msgstr "(Right click = Menu) / COLLECTIVE maximum volume adjustment"
 
-#: src/cd_audio.c:1730 src/translate.c:357
-msgid "Num"
-msgstr "Num"
-
-#: src/cd_audio.c:1745 src/translate.c:358 src/translate.c:378
-#: src/translate.c:403 src/translate.c:411
-msgid "Time"
-msgstr "Time"
-
-#: src/cd_audio.c:1760 src/dvd.c:1171 src/file.c:3392 src/translate.c:340
-#: src/translate.c:359 src/translate.c:379
+#: src/cd_audio.c:1764 src/dvd.c:1187 src/file.c:3403
+#: glade/xcfa_win_treeview.glade:180 glade/xcfa_win_treeview.glade:560
+#: glade/xcfa_win_treeview.glade:961
 msgid "Normalise"
 msgstr "Normalise"
 
-#: src/cd_audio.c:1785 src/dvd.c:1191 src/file.c:3434 src/file_mp3ogg.c:1287
-#: src/file_tags.c:1209 src/file_wav.c:952 src/prg_init.c:614
-#: src/translate.c:341 src/translate.c:360 src/translate.c:381
-#: src/translate.c:393 src/translate.c:404 src/translate.c:412
-msgid "Nom"
+#: src/cd_audio.c:1789 src/dvd.c:1207 src/file.c:3445 src/file_mp3ogg.c:964
+#: src/file_tags.c:1253 src/file_wav.c:830 src/prg_init.c:609
+msgid "Name"
 msgstr "Name"
 
-#: src/cd_audio.c:2507
-msgid " Parametrage CDDB: [ Nom du serveur ]"
+#: src/cd_audio.c:2517
+msgid " Setting up CDDB: [ Server name ]"
 msgstr " Setting up CDDB: [ Server name ]"
 
-#: src/cd_audio.c:2516
-msgid " Parametrage PROXY: [ serveur ] [ port ]"
+#: src/cd_audio.c:2526
+msgid " Proxy settings: [ server ] [ port ] "
 msgstr " Proxy settings: [ server ] [ port ] "
 
-#: src/cd_audio.c:2526 src/translate.c:99
-msgid " Serveur "
+#: src/cd_audio.c:2536 glade/xcfa.glade:1842
+msgid " Server "
 msgstr " Server "
 
-#: src/cd_audio_extract.c:661
+#: src/cd_audio_extract.c:673
 #, c-format
-msgid ""
-"[Erreur du segment numero: %d]\n"
-"%d) Lecture PASS 1/2\n"
-msgstr ""
-"[Error on segment #%d]\n"
-"%d) Playing PASS 1/2\n"
+msgid "[Error on segment #%d] %d) Playing PASS 1/2\n"
+msgstr "[Error on segment #%d] %d) Playing PASS 1/2\n"
 
-#: src/cd_audio_extract.c:668
+#: src/cd_audio_extract.c:680
 #, c-format
 msgid ""
-"--> Deja %d fois 2 lectures du segment %d!\n"
+"--> Segment %d already read two %d times!\n"
 " Abandon :/\n"
 msgstr ""
 "--> Segment %d already read two %d times!\n"
 " Abandon :/\n"
 
-#: src/cd_audio_extract.c:688
+#: src/cd_audio_extract.c:700
 #, c-format
-msgid "%d) Lecture PASS 2/2\n"
+msgid "%d) Read PASS 2/2\n"
 msgstr "%d) Read PASS 2/2\n"
 
-#: src/cd_audio_extract.c:769
+#: src/cd_audio_extract.c:780
 #, c-format
 msgid ""
 "\n"
-"[Piste: %d]\n"
+"[Track: %d]\n"
 msgstr ""
 "\n"
 "[Track: %d]\n"
 
-#: src/cd_audio_extract.c:773
-msgid "Extraction mode expert PASS 1/2\n"
+#: src/cd_audio_extract.c:784
+msgid "Ripping expert mode PASS 1/2\n"
 msgstr "Ripping expert mode PASS 1/2\n"
 
-#: src/cd_audio_extract.c:784
-msgid "Extraction mode expert PASS 2/2\n"
+#: src/cd_audio_extract.c:795
+msgid "Ripping expert mode PASS 2/2\n"
 msgstr "Ripping expert mode PASS 2/2\n"
 
-#: src/cd_audio_extract.c:792
-msgid "Controle du contenu des fichiers extraits\n"
+#: src/cd_audio_extract.c:803
+msgid "Control the content of the extracted files\n"
 msgstr "Control the content of the extracted files\n"
 
-#: src/cd_audio_extract.c:1678 src/cd_audio_extract.c:1680
+#: src/cd_audio_extract.c:1710 src/cd_audio_extract.c:1712
 msgid "XCFA: Extraction CD"
-msgstr "XCFA: CD Ripping"
+msgstr "XCFA: Extraction CD"
 
-#: src/cd_audio_extract.c:1678 src/dvd_extract.c:412 src/file_action.c:190
-#: src/file_mp3ogg_conv.c:300 src/file_wav_conv.c:349
+#: src/cd_audio_extract.c:1710 src/dvd_extract.c:412 src/file_action.c:183
+#: src/file_mp3ogg_conv.c:329 src/file_wav_conv.c:343
 msgid "Ok"
-msgstr "Okay"
+msgstr "Ok"
 
-#: src/cd_audio_extract.c:1680 src/dvd_extract.c:414 src/file_action.c:192
-#: src/file_mp3ogg_conv.c:302 src/file_wav_conv.c:351
-msgid "Arret par l'utilisateur"
-msgstr "Stopped by user"
+#: src/cd_audio_extract.c:1712 src/dvd_extract.c:414 src/file_action.c:185
+#: src/file_mp3ogg_conv.c:331 src/file_wav_conv.c:345
+msgid "Stop by user"
+msgstr "Stop by user"
 
-#: src/cd_audio_extract.c:1938
-msgid "Nom de fichier unique absent"
+#: src/cd_audio_extract.c:1983
+msgid "File name not found"
 msgstr "File name not found"
 
-#: src/cd_audio_extract.c:1939
-msgid "Veuillez saisir un nom pour le fichier unique"
+#: src/cd_audio_extract.c:1984
+msgid "Please enter a file name"
 msgstr "Please enter a file name"
 
-#: src/cd_audio_toc.c:160
+#: src/cd_audio_toc.c:156
 msgid "cdda2wav and icedax NOT FOUND"
 msgstr "cdda2wav and icedax NOT FOUND"
 
-#: src/cd_audio_toc.c:161
+#: src/cd_audio_toc.c:157
 msgid "Please, install packages [ icedax, cdda2wav ]"
 msgstr "Please, install packages [ icedax, cdda2wav ]"
 
-#: src/cd_audio_toc.c:166
+#: src/cd_audio_toc.c:163
 msgid "icedax NOT FOUND"
 msgstr "icedax NOT FOUND"
 
-#: src/cd_audio_toc.c:167
+#: src/cd_audio_toc.c:164
 msgid "Please, install package [ icedax ]"
 msgstr "Please, install package [ icedax ]"
 
-#: src/cd_audio_toc.c:172
+#: src/cd_audio_toc.c:170
 msgid "cdda2wav NOT FOUND"
 msgstr "cdda2wav NOT FOUND"
 
-#: src/cd_audio_toc.c:173
+#: src/cd_audio_toc.c:171
 msgid "Please, install package [ cdda2wav ]"
 msgstr "Please, install package [ cdda2wav ]"
 
-#: src/cd_audio_toc.c:181
+#: src/cd_audio_toc.c:180
 msgid "cdparanoia NOT FOUND"
 msgstr "cdparanoia NOT FOUND"
 
-#: src/cd_audio_toc.c:182
+#: src/cd_audio_toc.c:181
 msgid "Please, install package [ cdparanoia ]"
 msgstr "Please, install package [ cdparanoia ]"
 
@@ -247,1325 +192,1292 @@
 
 #: src/cd_audio_toc.c:189
 msgid "Please, install packages [ cd-discid ]"
-msgstr "Please, install package [ cd-discid ]"
+msgstr "Please, install packages [ cd-discid ]"
 
-#: src/cd_audio_toc.c:202
-msgid "ERREUR datas proxy"
+#: src/cd_audio_toc.c:203
+msgid "ERROR datas proxy"
 msgstr "ERROR datas proxy"
 
-#: src/cd_audio_toc.c:203
-msgid "Veuillez renseigner les champs du proxy"
+#: src/cd_audio_toc.c:204
+msgid "Please complete all fields proxy"
 msgstr "Please complete all fields proxy"
 
-#: src/cd_curl.c:718 src/web.c:160
-msgid "La liaison internet est absente"
+#: src/cd_curl.c:734 src/web.c:187
+msgid "A web connection is missing"
 msgstr "A web connection is missing"
 
-#: src/cd_curl.c:1122
+#: src/cd_curl.c:1204
 msgid "Couldn't find CD"
 msgstr "Couldn't find CD"
 
-#: src/cd_curl.c:1185
+#: src/cd_curl.c:1267
 msgid "No Audio CD"
 msgstr "No Audio CD"
 
-#: src/dvd.c:863
+#: src/dvd.c:877
 msgid ""
-"(Click Droit = Menu) / PEAK-ALBUM: Amplification maximale du volume pour un "
-"groupe de fichiers en respectant les ecarts de niveau entre chacun d'eux."
+"(Right click = Menu) / Maximum volume amplification of a group of files "
+"keeping the level difference between each of them."
 msgstr ""
 "(Right click = Menu) / Maximum volume amplification of a group of files "
-"keeping the level difference between each of them"
+"keeping the level difference between each of them."
 
-#: src/dvd.c:866
-msgid ""
-"(Click Droit = Menu) / PEAK: Amplification maximale du volume pour chaque de "
-"fichier."
-msgstr ""
-"(Right click = Menu) / PEAK: Maximum volume amplification for each file"
+#: src/dvd.c:882 src/file.c:2882
+msgid "PEAK: Maximum volume amplification of each file."
+msgstr "PEAK: Maximum volume amplification of each file."
+
+#: src/dvd.c:887
+msgid "(Right click = Menu) / ReplayGain: Waiting for selection."
+msgstr "(Right click = Menu) / ReplayGain: Waiting for selection."
 
-#: src/dvd.c:904 src/dvd.c:924
-msgid "En attente de selection. Un click activera la conversion vers 2 canaux."
+#: src/dvd.c:920 src/dvd.c:940
+msgid ""
+"Waiting for selection. A click will activate the conversion to 2 channels."
 msgstr ""
 "Waiting for selection. A click will activate the conversion to 2 channels."
 
-#: src/dvd.c:916
-msgid "Conversion vers 2 canaux."
+#: src/dvd.c:932
+msgid "Conversion to 2 channels."
 msgstr "Conversion to 2 channels."
 
-#: src/dvd.c:928
+#: src/dvd.c:944
 #, c-format
-msgid "Conversion vers %s canaux."
+msgid "Conversion to %s channels."
 msgstr "Conversion to %s channels."
 
-#: src/dvd.c:933
+#: src/dvd.c:949
 #, c-format
 msgid ""
-"Conversion vers 2 canaux. Un second click activera la conversion vers %s "
-"canaux."
+"Conversion to 2 channels. A second click will activate the conversion to %s "
+"channels."
 msgstr ""
 "Conversion to 2 channels. A second click will activate the conversion to %s "
 "channels."
 
-#: src/dvd.c:948
-msgid "Musique en ecoute."
+#: src/dvd.c:964
+msgid "Playing music."
 msgstr "Playing music."
 
-#: src/dvd.c:951
-msgid "Musique en attente."
+#: src/dvd.c:967
+msgid "Music paused."
 msgstr "Music paused."
 
-#: src/dvd.c:966
+#: src/dvd.c:982
 #, c-format
 msgid "Total selection%s: %d, 2ch: %d"
 msgstr "Total selection%s: %d, 2ch: %d"
 
-#: src/dvd.c:967
+#: src/dvd.c:983
 msgid "s"
 msgstr "s"
 
-#: src/dvd.c:973
-msgid "Ce fichier ne peut etre extrait !"
+#: src/dvd.c:989
+msgid "This file can not be ripped !"
 msgstr "This file can not be ripped !"
 
-#: src/dvd.c:1091
-msgid "Titres"
-msgstr "Titls"
+#: src/dvd.c:1107
+msgid "Titles"
+msgstr "Titles"
 
-#: src/dvd.c:1115 src/file.c:3375 src/file_mp3ogg.c:1272 src/file_tags.c:1193
-#: src/translate.c:337
-msgid "Temps"
+#: src/dvd.c:1119 glade/xcfa_win_treeview.glade:112
+#: glade/xcfa_win_treeview.glade:356 glade/xcfa_win_treeview.glade:740
+msgid "Play"
+msgstr "Play"
+
+#: src/dvd.c:1131 src/file.c:3386 src/file_mp3ogg.c:949 src/file_tags.c:1237
+#: glade/xcfa_win_treeview.glade:543 glade/xcfa_win_treeview.glade:944
+#: glade/xcfa_win_treeview.glade:1491 glade/xcfa_win_treeview.glade:1689
+msgid "Time"
 msgstr "Time"
 
-#: src/dvd.c:1127 src/translate.c:338
+#: src/dvd.c:1143 glade/xcfa_win_treeview.glade:146
 msgid "Format"
 msgstr "Format"
 
-#: src/dvd.c:1139 src/translate.c:339
-msgid "Choix"
+#: src/dvd.c:1155
+msgid "Choice"
 msgstr "Choice"
 
-#: src/dvd.c:1253
-msgid "Fichier structure DVD"
+#: src/dvd.c:1267
+msgid "DVD file structure"
 msgstr "DVD file structure"
 
-#: src/dvd.c:1303
-msgid "Le DVD est absent du lecteur."
+#: src/dvd.c:1320
+msgid "The DVD player is absent."
 msgstr "The DVD player is absent."
 
-#: src/dvd.c:1338
-msgid "Scan ..."
-msgstr "Scan ..."
-
-#: src/dvd.c:1387
-msgid "lsdvd est absent !"
+#: src/dvd.c:1410
+msgid "lsdvd is missing !"
 msgstr "lsdvd is missing !"
 
-#: src/dvd.c:1388
-msgid "Il faut installer le programme: lsdvd"
+#: src/dvd.c:1411
+msgid "You must install the program: lsdvd"
 msgstr "You must install the program: lsdvd"
 
 #: src/dvd_extract.c:412 src/dvd_extract.c:414
-msgid "XCFA: Extraction DVD"
+msgid "XCFA: DVD rip"
 msgstr "XCFA: DVD rip"
 
-#: src/dvd_read.c:267
+#: src/dvd_read.c:226
 #, c-format
-msgid "Titre [%02d ** ]"
+msgid "Title [%02d ** ]"
 msgstr "Title [%02d ** ]"
 
-#: src/dvd_read.c:270
+#: src/dvd_read.c:227
 #, c-format
-msgid "Titre [%02d]"
+msgid "Title [%02d]"
 msgstr "Title [%02d]"
 
-#: src/dvd_read.c:313
-#, c-format
-msgid "Fichier_complet_%02d_%s"
-msgstr "Completed_file_%02d_%s"
-
-#: src/dvd_read.c:357
+#: src/dvd_read.c:252
 #, c-format
-msgid "Chapitre: [%02d]"
+msgid "Chapter: [%02d]"
 msgstr "Chapter: [%02d]"
 
-#: src/dvd_read.c:402
-#, c-format
-msgid "Titre_%02d_Chapitre_%02d_audio_%02d_%s"
-msgstr "Title_%02d_Chapter_%02d_audio_%02d_%s"
-
-#: src/file_action.c:190 src/file_action.c:192
-msgid "XCFA: Traitement fichiers"
+#: src/file_action.c:183 src/file_action.c:185
+msgid "XCFA: Processing files"
 msgstr "XCFA: Processing files"
 
-#: src/file_analyze.c:624
+#: src/file_analyze.c:731
 msgid "Package checkmp3 (mp3check) NOT FOUND !"
 msgstr "Package checkmp3 (mp3check) NOT FOUND !"
 
-#: src/file_analyze.c:625
+#: src/file_analyze.c:732
 msgid ""
-"Veuillez installer checkmp3 ou mp3check pour\n"
-"la prise en compte des fichiers mp3"
+"Please install or checkmp3 mp3check for\n"
+"consideration of mp3 files"
 msgstr ""
 "Please install or checkmp3 mp3check for\n"
 "consideration of mp3 files"
 
-#: src/file.c:332
+#: src/file.c:327
 #, c-format
-msgid "Total fichiers: %d, Selections: %d"
-msgstr "Total files: %d, Selected: %d"
+msgid "Total files: %d, Selections: %d"
+msgstr "Total files: %d, Selections: %d"
 
-#: src/file.c:445
-msgid "CAPACITE DOSSIER TEMPORAIRE TROP FAIBLE"
+#: src/file.c:441
+msgid "TEMPORARY CAPACITY TOO LOW"
 msgstr "TEMPORARY CAPACITY TOO LOW"
 
-#: src/file.c:446
-msgid "Pas assez de place dans le dossier temporaire"
+#: src/file.c:442 src/file.c:2875
+msgid "WARNING: Not enough space available in the temp folder."
 msgstr "WARNING: Not enough space available in the temp folder."
 
-#: src/file.c:452
-msgid "Veuillez deselectionner des PeakGroup."
+#: src/file.c:448
+msgid "Please deselect PeakGroup."
 msgstr "Please deselect PeakGroup."
 
-#: src/file.c:1439
-msgid "Conversion(s) vers la source"
+#: src/file.c:1431
+msgid "Conversion(s) to source"
 msgstr "Conversion(s) to source"
 
-#: src/file.c:1440
-msgid "Choix d'une nouvelle destination"
+#: src/file.c:1432
+msgid "Select a new destination"
 msgstr "Select a new destination"
 
-#: src/file.c:1510
+#: src/file.c:1501
 msgid "Select type: --"
-msgstr "Select type: -"
+msgstr "Select type: --"
 
-#: src/file.c:1595
+#: src/file.c:1584
 msgid "Peak/album"
 msgstr "Peak/album"
 
-#: src/file.c:1596
+#: src/file.c:1585
 msgid "Peak"
 msgstr "Peak"
 
-#: src/file.c:1597
+#: src/file.c:1586
 msgid "Mix (scan)Rms/album"
 msgstr "Mix (scan)Rms/album"
 
-#: src/file.c:1598
+#: src/file.c:1587
 msgid "Fix (scan)Rms"
 msgstr "Fix (scan)Rms"
 
-#: src/file.c:2854
+#: src/file.c:2834
+msgid "The external ripping program is missing"
+msgstr "The external ripping program is missing"
+
+#: src/file.c:2840
+msgid "(Right click = Menu) / Waiting for Selection. File exists."
+msgstr "(Right click = Menu) / Waiting for Selection. File exists."
+
+#: src/file.c:2843
+msgid "(Right click = Menu) / Selected files"
+msgstr "(Right click = Menu) / Selected files"
+
+#: src/file.c:2861
 #, c-format
-msgid "MAX FICHIERS ATTEINT = %d"
+msgid "MAX FILES REACHED = %d"
 msgstr "MAX FILES REACHED = %d"
 
-#: src/file.c:2864
-msgid "Normalise: En attente de selection."
+#: src/file.c:2871
+msgid "Normalise: Waiting for selection."
 msgstr "Normalise: Waiting for selection."
 
-#: src/file.c:2868
-msgid "ATTENTION: Pas assez de place dans le dossier temporaire."
-msgstr "WARNING: Not enough space available in the temp folder."
-
-#: src/file.c:2871
+#: src/file.c:2878
 msgid ""
-"PEAK-ALBUM: Amplification maximale du volume pour un groupe de fichiers en "
-"respectant les ecarts de niveau entre chacun d'eux."
+"PEAK-ALBUM: Maximum volume amplification for a group of files according to "
+"the deviations in level between them"
 msgstr ""
 "PEAK-ALBUM: Maximum volume amplification for a group of files according to "
 "the deviations in level between them"
 
-#: src/file.c:2875
-msgid "PEAK: Amplification maximale du volume pour chaque de fichier."
-msgstr "PEAK: Maximum volume amplification of each file."
-
-#: src/file.c:2878
+#: src/file.c:2885
 msgid ""
-"RMS-ALBUM: Ajustement du volume moyen pour un groupe de fichiers en "
-"respectant les ecarts de niveau moyen entre chacun d'eux."
+"RMS-ALBUM: Adjusting the average volume for a group of files according to "
+"the average level of deviation between them."
 msgstr ""
 "RMS-ALBUM: Adjusting the average volume for a group of files according to "
 "the average level of deviation between them."
 
-#: src/file.c:2881
-msgid "RMS: Ajustement du volume moyen de chaque de fichier."
+#: src/file.c:2888
+msgid "RMS: Average volume amplification of each file."
 msgstr "RMS: Average volume amplification of each file."
 
-#: src/file.c:2895
-msgid "(Click Droit = Menu) / ReplayGain: En attente de selection."
-msgstr "(Click Droit = Menu) / ReplayGain: Waiting for selection."
+#: src/file.c:2902
+msgid "(Right Click = Menu) / ReplayGain: Waiting for selection."
+msgstr "(Right Click = Menu) / ReplayGain: Waiting for selection."
 
-#: src/file.c:2898
-msgid "(Click Droit = Menu) / Mode piste."
-msgstr "(Click Droit = Menu) / Track mode."
+#: src/file.c:2905
+msgid "(Right Click = Menu) / Track mode."
+msgstr "(Right Click = Menu) / Track mode."
 
-#: src/file.c:2901
-msgid "(Click Droit = Menu) / Mode album."
-msgstr "(Click Droit = Menu) / Album mode."
+#: src/file.c:2908
+msgid "(Right Click = Menu) / Album mode."
+msgstr "(Right Click = Menu) / Album mode."
 
-#: src/file.c:2904
-msgid "(Click Droit = Menu) / Mode effacer."
-msgstr "(Click Droit = Menu) / Erase mode."
+#: src/file.c:2911
+msgid "(Right Click = Menu) / Erase mode."
+msgstr "(Right Click = Menu) / Erase mode."
 
-#: src/file.c:3016
+#: src/file.c:3026
 msgid ""
-"(Click Droit = Menu) / Cliquez ici pour envoyer ce fichier apres traitement "
-"a la corbeille"
+"(Click Droit = Menu) / Click here to send the processed file to the trash"
 msgstr ""
 "(Click Droit = Menu) / Click here to send the processed file to the trash"
 
-#: src/file.c:3019
+#: src/file.c:3029
 msgid ""
-"(Click Droit = Menu) / Ce fichier sera dirige apres traitement vers la "
-"corbeille"
+"(Right Click = Menu) / This file will be sent to the trash after processing"
 msgstr ""
 "(Right Click = Menu) / This file will be sent to the trash after processing"
 
-#: src/file.c:3152 src/file_trash.c:367 src/translate.c:367
+#: src/file.c:3163 src/file_trash.c:208 glade/xcfa_win_treeview.glade:757
 msgid "Trash"
 msgstr "Trash"
 
-#: src/file.c:3172 src/file_mp3ogg.c:1212 src/file_tags.c:1178
-#: src/translate.c:368 src/translate.c:399 src/translate.c:410
+#: src/file.c:3183 src/file_mp3ogg.c:889 src/file_tags.c:1222
+#: glade/xcfa_win_treeview.glade:774 glade/xcfa_win_treeview.glade:1423
+#: glade/xcfa_win_treeview.glade:1672
 msgid "Type"
 msgstr "Type"
 
-#: src/file.c:3411
-msgid "ReplayGain"
-msgstr "ReplayGain"
-
-#: src/file_mp3ogg.c:771
-msgid "128 -defaut"
-msgstr "128 -default"
-
-#: src/file_mp3ogg.c:787
-msgid "V0 -meilleure qualite"
-msgstr "V0 -best quality"
-
-#: src/file_mp3ogg.c:791 src/file_mp3ogg.c:811
-msgid "V4 -defaut"
-msgstr "V4 -default"
+#: src/file_conv.c:1187
+msgid "Error since MPLAYER !"
+msgstr "Error since MPLAYER !"
 
-#: src/file_mp3ogg.c:796
-msgid "V9 -moins bonne qualite"
-msgstr "V9 -worst quality"
+#: src/file_conv.c:1188 src/file_conv.c:1200 src/file_mp3ogg_conv.c:337
+#: src/file_mp3ogg_conv.c:349
+msgid "You can enable XCFA command line with: "
+msgstr "You can enable XCFA command line with: "
 
-#: src/file_mp3ogg.c:849
-msgid "Defaut"
-msgstr "Default"
+#: src/file_conv.c:1190 src/file_conv.c:1202 src/file_mp3ogg_conv.c:339
+#: src/file_mp3ogg_conv.c:351
+msgid "$ xcfa -verbose"
+msgstr "$ xcfa -verbose"
 
-#: src/file_mp3ogg.c:884
-msgid "Qualite -1 -Moins bonne qualite"
-msgstr "Quality -1 -worst quality"
+#: src/file_conv.c:1192 src/file_mp3ogg_conv.c:341
+msgid "to see the type of error returned by mplayer."
+msgstr "to see the type of error returned by mplayer."
 
-#: src/file_mp3ogg.c:885 src/options_oggenc.c:149
-msgid "Qualite 0"
-msgstr "Quality 0"
-
-#: src/file_mp3ogg.c:886 src/options_oggenc.c:150
-msgid "Qualite 1"
-msgstr "Quality 1"
-
-#: src/file_mp3ogg.c:887 src/options_oggenc.c:151
-msgid "Qualite 2"
-msgstr "Quality 2"
-
-#: src/file_mp3ogg.c:888
-msgid "Qualite 3 -Defaut"
-msgstr "Quality 3 -Default"
-
-#: src/file_mp3ogg.c:889 src/options_oggenc.c:153
-msgid "Qualite 4"
-msgstr "Quality 4"
-
-#: src/file_mp3ogg.c:890 src/options_oggenc.c:154
-msgid "Qualite 5"
-msgstr "Quality 5"
-
-#: src/file_mp3ogg.c:891 src/options_oggenc.c:155
-msgid "Qualite 6"
-msgstr "Quality 6"
-
-#: src/file_mp3ogg.c:892 src/options_oggenc.c:156
-msgid "Qualite 7"
-msgstr "Quality 7"
-
-#: src/file_mp3ogg.c:893 src/options_oggenc.c:157
-msgid "Qualite 8"
-msgstr "Quality 8"
+#: src/file_conv.c:1199
+msgid "Error since SOX !"
+msgstr "Error since SOX !"
 
-#: src/file_mp3ogg.c:894 src/options_oggenc.c:158
-msgid "Qualite 9"
-msgstr "Quality 9"
-
-#: src/file_mp3ogg.c:895
-msgid "Qualite 10 -Meilleure qualite"
-msgstr "Quality 10 -Best quality"
-
-#: src/file_mp3ogg.c:926 src/options_oggenc.c:189 src/options_wavpack.c:186
-#: src/options_wavpack.c:209 src/options_wavpack.c:232
-msgid "Oui"
-msgstr "Yes"
-
-#: src/file_mp3ogg.c:927 src/options_oggenc.c:190 src/options_wavpack.c:153
-#: src/options_wavpack.c:185 src/options_wavpack.c:208
-#: src/options_wavpack.c:231 src/options_wavpack.c:252
-msgid "Non"
-msgstr "No"
-
-#: src/file_mp3ogg.c:949 src/options_oggenc.c:211
-msgid "Mono force"
-msgstr "Force mono"
+#: src/file_conv.c:1204 src/file_mp3ogg_conv.c:353
+msgid "to see the type of error returned by sox."
+msgstr "to see the type of error returned by sox."
 
-#: src/file_mp3ogg.c:950 src/options_oggenc.c:212
-msgid "Stereo"
-msgstr "Stereo"
-
-#: src/file_mp3ogg.c:1228 src/translate.c:400
-msgid "Bitrate"
-msgstr "Bitrate"
+#: src/file_mp3ogg.c:670
+msgid "Right click: access popup"
+msgstr "Right click: access popup"
 
-#: src/file_mp3ogg.c:1244
-msgid "Nouveau bitrate"
+#: src/file_mp3ogg.c:921
+msgid "New bitrate"
 msgstr "New bitrate"
 
-#: src/file_mp3ogg.c:1258
-msgid "Taille"
+#: src/file_mp3ogg.c:935 glade/xcfa_win_treeview.glade:1474
+msgid "Size"
 msgstr "Size"
 
-#: src/file_mp3ogg_conv.c:300 src/file_mp3ogg_conv.c:302
-msgid "XCFA: Modification bitrate"
+#: src/file_mp3ogg_conv.c:329 src/file_mp3ogg_conv.c:331
+msgid "XCFA: Bitrate change"
 msgstr "XCFA: Bitrate change"
 
-#: src/file_mp3ogg_conv.c:379
+#: src/file_mp3ogg_conv.c:336
+msgid "Error from MPLAYER !"
+msgstr "Error from MPLAYER !"
+
+#: src/file_mp3ogg_conv.c:348
+msgid "Error from SOX !"
+msgstr "Error from SOX !"
+
+#: src/file_mp3ogg_conv.c:432
 #, c-format
-msgid " ATTENTION: Il faut installer %s%s%s"
+msgid " WARNING : you need to install %s%s%s"
 msgstr " WARNING : you need to install %s%s%s"
 
-#: src/file_mp3ogg_conv.c:387
+#: src/file_mp3ogg_conv.c:440
 #, c-format
-msgid " ATTENTION: Il faut installer %s%s"
+msgid " WARNING : you need to install %s%s"
 msgstr " WARNING : you need to install %s%s"
 
-#: src/file_mp3ogg_conv.c:394
+#: src/file_mp3ogg_conv.c:447
 #, c-format
-msgid " ATTENTION: Il faut installer %s"
+msgid " WARNING : you need to install %s"
 msgstr " WARNING : you need to install %s"
 
-#: src/file_mp3ogg_conv.c:400
+#: src/file_mp3ogg_conv.c:454
 msgid "Package NOT FOUND !"
 msgstr "Package NOT FOUND !"
 
-#: src/fileselect.c:116
-msgid "Choix d'un dossier de destination"
-msgstr "Select a destination folder"
+#: src/fileselect.c:105
+msgid "Choosing a destination folder"
+msgstr "Choosing a destination folder"
 
-#: src/fileselect.c:117
-msgid "Choix d'un fichier CUE WAV FLAC OGG MP3 APE WMA"
-msgstr "Select CUE WAV FLAC OGG MP3 APE WMA files"
+#: src/fileselect.c:106
+msgid "Choosing a file CUE WAV FLAC OGG MP3 APE WMA"
+msgstr "Choosing a file CUE WAV FLAC OGG MP3 APE WMA"
 
-#: src/fileselect.c:118
-msgid "Choix d'un fichier musical"
-msgstr "Selecting a music file"
+#: src/fileselect.c:107
+msgid "Choosing a file musical"
+msgstr "Choosing a file musical"
 
-#: src/fileselect.c:119
-msgid "Choix d'un fichier"
-msgstr "Select a file"
+#: src/fileselect.c:108 src/fileselect.c:109
+msgid "Choosing a file"
+msgstr "Choosing a file"
 
-#: src/fileselect.c:120
-msgid "Choix de fichiers"
-msgstr "Select files"
+#: src/fileselect.c:110
+msgid "Choosing a WAV file"
+msgstr "Choosing a WAV file"
 
-#: src/fileselect.c:121
-msgid "Choix de fichiers WAV"
-msgstr "Select a WAV file"
+#: src/fileselect.c:111
+msgid "Choosing a MP3 OGG file"
+msgstr "Choosing a MP3 OGG file"
 
-#: src/fileselect.c:122
-msgid "Choix de fichiers MP3/OGG"
-msgstr "Select MP3/OGG file"
+#: src/fileselect.c:112
+msgid "Choosing a FLAC MPC OGG MP3 file"
+msgstr "Choosing a FLAC MPC OGG MP3 file"
 
-#: src/fileselect.c:123
-msgid "Choix de fichiers FLAC MPC OGG MP3"
-msgstr "Select FLAC MPC OGG MP3 files"
+#: src/fileselect.c:113
+msgid "Import pictures for the cover"
+msgstr "Import pictures for the cover"
 
-#: src/fileselect.c:124
-msgid "Importer des images pour la pochette"
-msgstr "Import images for the cover"
+#: src/fileselect.c:114
+msgid "Choosing an Image Storage path"
+msgstr "Choosing an Image Storage path"
 
-#: src/fileselect.c:125
-msgid "Choix d'un chemin de stockage des images"
-msgstr "Select location for image storage"
+#: src/fileselect.c:115
+msgid "Choosing a place for backup"
+msgstr "Choosing a place for backup"
 
-#: src/fileselect.c:126
-msgid "Choix d'un lieu de sauvegarde"
-msgstr "Select a backup location"
+#: src/fileselect.c:396 src/fileselect.c:415 src/fileselect.c:703
+msgid "Cancel"
+msgstr "Cancel"
 
-#: src/fileselect.c:475 src/fileselect.c:591 src/fileselect.c:599
-#: src/fileselect.c:622
+#: src/fileselect.c:398 src/fileselect.c:417 src/fileselect.c:705
+msgid "Open"
+msgstr "Open"
+
+#: src/fileselect.c:494 src/fileselect.c:617 src/fileselect.c:627
+#: src/fileselect.c:650
 msgid "All Files (*.*)"
 msgstr "All Files (*.*)"
 
-#: src/file_trash.c:368
+#: src/file_trash.c:211
 msgid "Trash files ..."
 msgstr "Trash files ..."
 
-#: src/file_wav.c:629
-msgid "(Click Droit = Menu) / Choix de la frequence"
+#: src/file_wav.c:485
+msgid "(Right Click = Menu) / Select frequency"
 msgstr "(Right Click = Menu) / Select frequency"
 
-#: src/file_wav.c:632
-msgid "(Click Droit = Menu) / Choix du nombre de pistes (voies)"
+#: src/file_wav.c:488
+msgid "(Right Click = Menu) / Select number of tracks (channels)"
 msgstr "(Right Click = Menu) / Select number of tracks (channels)"
 
-#: src/file_wav.c:635
-msgid "(Click Droit = Menu) / Choix du codage en nombre de bits"
+#: src/file_wav.c:491
+msgid "(Right Click = Menu) / Encoding selection in number of bits"
 msgstr "(Right Click = Menu) / Encoding selection in number of bits"
 
-#: src/file_wav.c:861
-msgid "Frequence"
+#: src/file_wav.c:739
+msgid "Frequency"
 msgstr "Frequency"
 
-#: src/file_wav.c:877
-msgid "FREQUENCE"
+#: src/file_wav.c:755
+msgid "FREQUENCY"
 msgstr "FREQUENCY"
 
-#: src/file_wav.c:891
-msgid "Piste"
+#: src/file_wav.c:769
+msgid "Track"
 msgstr "Track"
 
-#: src/file_wav.c:907
-msgid "PISTE"
+#: src/file_wav.c:785
+msgid "TRACK"
 msgstr "TRACK"
 
-#: src/file_wav.c:921
+#: src/file_wav.c:799
 msgid "Quantification"
 msgstr "Quantification"
 
-#: src/file_wav.c:937
+#: src/file_wav.c:815
 msgid "QUANTIFICATION"
 msgstr "QUANTIFICATION"
 
-#: src/file_wav_conv.c:265
+#: src/file_wav_conv.c:261
 #, c-format
-msgid "%s Copie fichier: %d%%"
+msgid "%s Copy file: %d%%"
 msgstr "%s Copy file: %d%%"
 
-#: src/file_wav_conv.c:275
+#: src/file_wav_conv.c:271
 #, c-format
-msgid "%s Restitution fichier: %d%%"
+msgid "%s Return file: %d%%"
 msgstr "%s Return file: %d%%"
 
-#: src/file_wav_conv.c:285
+#: src/file_wav_conv.c:281
 #, c-format
-msgid "%s Traitement Sox: %d%%"
+msgid "%s Use Sox: %d%%"
 msgstr "%s Use Sox: %d%%"
 
-#: src/file_wav_conv.c:302
+#: src/file_wav_conv.c:298
 #, c-format
-msgid "%s Traitement Mplayer: %d%%"
+msgid "%s Use Mplayer: %d%%"
 msgstr "%s Use Mplayer: %d%%"
 
-#: src/file_wav_conv.c:349 src/file_wav_conv.c:351
+#: src/file_wav_conv.c:343 src/file_wav_conv.c:345
 msgid "XCFA: Conversions WAV TO WAV"
 msgstr "XCFA: Conversions WAV TO WAV"
 
-#: src/main.c:372
-msgid "= Adressage memoire invalide\n"
-msgstr "= Invalid memory address\n"
-
-#: src/main.c:375
-msgid "= Vous avez probablement trouve un bug dans XCFA\n"
-msgstr "= You've probably found a bug in XCFA\n"
-
-#: src/main.c:676
-msgid "MODE ADMINISTRATEUR"
+#: src/main.c:644
+msgid "ADMINISTRATOR MODE"
 msgstr "ADMINISTRATOR MODE"
 
-#: src/main.c:678
-msgid " Vous ne devriez pas utiliser "
-msgstr " You should not use "
+#: src/main.c:646
+msgid " You should not use "
+msgstr " You should not use "
 
-#: src/main.c:680
-msgid " XCFA sous ROOT !"
+#: src/main.c:648
+msgid " XCFA under ROOT !"
 msgstr " XCFA under ROOT !"
 
-#: src/options.c:175
-msgid "ERREUR: Lieu de stockage non autorise !"
+#: src/options.c:169
+msgid "ERROR : storage location not permitted !"
 msgstr "ERROR : storage location not permitted !"
 
-#: src/options.c:176
-msgid "Veuillez recommencer."
+#: src/options.c:170
+msgid "Please start again."
 msgstr "Please start again."
 
-#: src/options_cd.c:120
-msgid "Pour evaluer les templates, vous devez activer une lecture de cdaudio"
+#: src/options_cd.c:122
+msgid "To assess the templates, you must enable a reading cdaudio"
 msgstr "To assess the templates, you must enable a reading cdaudio"
 
-#: src/options_faac.c:101
+#: src/options_faac.c:94
 msgid "Transport Stream (ADTS) - Extension .aac"
 msgstr "Transport Stream (ADTS) - Extension .aac"
 
-#: src/options_faac.c:102
+#: src/options_faac.c:95
 msgid "MPEG-4 File Format (MP4) - Extension .m4a"
 msgstr "MPEG-4 File Format (MP4) - Extension .m4a"
 
-#: src/options_flac.c:72
-msgid "0 (Rapide)"
+#: src/options_flac.c:65
+msgid "0 (Fast)"
 msgstr "0 (Fast)"
 
-#: src/options_flac.c:80
-msgid "8 (Lent)"
-msgstr "8 (Slow)"
+#: src/options_flac.c:73
+msgid "8 (Low)"
+msgstr "8 (Low)"
 
-#: src/options_mp3.c:298
-msgid "V0 (meilleure qualite)"
-msgstr "V0·····(Best quality)"
+#: src/options_mp3.c:276
+msgid "V0 (Best quality)"
+msgstr "V0 (Best quality)"
 
-#: src/options_mp3.c:307
-msgid "V9 (moins bonne qualite)"
-msgstr "V9·····(Poor quality)"
+#: src/options_mp3.c:285
+msgid "V9 (Poor quality)"
+msgstr "V9 (Poor quality)"
 
-#: src/options_musepack.c:75
+#: src/options_musepack.c:68
 msgid "telephone: lowest quality : 32 .. 48 kbit/s"
-msgstr "Phone: (Lowest quality) : 32 .. 48 kbit/s"
+msgstr "telephone: lowest quality : 32 .. 48 kbit/s"
 
-#: src/options_musepack.c:76
+#: src/options_musepack.c:69
 msgid "thumb : low quality/internet : 58 .. 86 kbit/s"
 msgstr "thumb : low quality/internet : 58 .. 86 kbit/s"
 
-#: src/options_musepack.c:77
+#: src/options_musepack.c:70
 msgid "radio : medium (MP3) quality : 112 .. 152 kbit/s"
 msgstr "radio : medium (MP3) quality : 112 .. 152 kbit/s"
 
-#: src/options_musepack.c:78
+#: src/options_musepack.c:71
 msgid "standard : high quality (dflt) : 142 .. 184 kbit/s"
 msgstr "standard : high quality (dflt) : 142 .. 184 kbit/s"
 
-#: src/options_musepack.c:79
+#: src/options_musepack.c:72
 msgid "xtreme : extreme high quality : 168 .. 212 kbit/s"
 msgstr "xtreme : extreme high quality : 168 .. 212 kbit/s"
 
-#: src/options_musepack.c:80
+#: src/options_musepack.c:73
 msgid "insane : extreme high quality : 232 .. 268 kbit/s"
 msgstr "insane : extreme high quality : 232 .. 268 kbit/s"
 
-#: src/options_musepack.c:81
+#: src/options_musepack.c:74
 msgid "braindead : extreme high quality : 232 .. 278 kbit/s"
 msgstr "braindead : extreme high quality : 232 .. 278 kbit/s"
 
-#: src/options_oggenc.c:148
-msgid "Qualite -1 (Moins bonne qualite)"
+#: src/options_oggenc.c:137
+msgid "Quality -1 (Poor quality)"
 msgstr "Quality -1 (Poor quality)"
 
-#: src/options_oggenc.c:152
-msgid "Qualite 3"
+#: src/options_oggenc.c:138 src/popup.c:1294
+msgid "Quality 0"
+msgstr "Quality 0"
+
+#: src/options_oggenc.c:139 src/popup.c:1294
+msgid "Quality 1"
+msgstr "Quality 1"
+
+#: src/options_oggenc.c:140 src/popup.c:1294
+msgid "Quality 2"
+msgstr "Quality 2"
+
+#: src/options_oggenc.c:141
+msgid "Quality 3"
 msgstr "Quality 3"
 
-#: src/options_oggenc.c:159
-msgid "Qualite 10 (Meilleure qualite)"
+#: src/options_oggenc.c:142 src/popup.c:1295
+msgid "Quality 4"
+msgstr "Quality 4"
+
+#: src/options_oggenc.c:143 src/popup.c:1295
+msgid "Quality 5"
+msgstr "Quality 5"
+
+#: src/options_oggenc.c:144 src/popup.c:1295
+msgid "Quality 6"
+msgstr "Quality 6"
+
+#: src/options_oggenc.c:145 src/popup.c:1295
+msgid "Quality 7"
+msgstr "Quality 7"
+
+#: src/options_oggenc.c:146 src/popup.c:1296
+msgid "Quality 8"
+msgstr "Quality 8"
+
+#: src/options_oggenc.c:147 src/popup.c:1296
+msgid "Quality 9"
+msgstr "Quality 9"
+
+#: src/options_oggenc.c:148
+msgid "Quality 10 (Best quality)"
 msgstr "Quality 10 (Best quality)"
 
-#: src/options_wavpack.c:105
-msgid "Mode normal"
+#: src/options_oggenc.c:176 src/options_wavpack.c:173
+#: src/options_wavpack.c:194 src/options_wavpack.c:215 src/popup.c:1298
+msgid "Yes"
+msgstr "Yes"
+
+#: src/options_oggenc.c:177 src/options_wavpack.c:142
+#: src/options_wavpack.c:172 src/options_wavpack.c:193
+#: src/options_wavpack.c:214 src/options_wavpack.c:233 src/popup.c:1298
+msgid "No"
+msgstr "No"
+
+#: src/options_oggenc.c:196
+msgid "Force mono"
+msgstr "Force mono"
+
+#: src/options_oggenc.c:197
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/options_wavpack.c:98
+msgid "Standard"
 msgstr "Standard"
 
-#: src/options_wavpack.c:106
-msgid "Mode rapide de compression"
+#: src/options_wavpack.c:99
+msgid "Fast (Faster encode and decode)"
 msgstr "Fast (Faster encode and decode)"
 
-#: src/options_wavpack.c:107
-msgid "Bonne qualite de compression"
+#: src/options_wavpack.c:100
+msgid "High quality (Better compression ratio)"
 msgstr "High quality (Better compression ratio)"
 
-#: src/options_wavpack.c:108
-msgid "Meilleure qualite de compression"
+#: src/options_wavpack.c:101
+msgid "Very high quality (Best compression but slowest)"
 msgstr "Very high quality (Best compression but slowest)"
 
-#: src/options_wavpack.c:134
+#: src/options_wavpack.c:125
 msgid "stereo left/right"
 msgstr "stereo left/right"
 
-#: src/options_wavpack.c:135
+#: src/options_wavpack.c:126
 msgid "stereo mid/side"
 msgstr "stereo mid/side"
 
-#: src/options_wavpack.c:253
+#: src/options_wavpack.c:234
 msgid "1 (fast / rapide)"
-msgstr "1 (fast)"
+msgstr "1 (fast / rapide)"
 
-#: src/options_wavpack.c:258
+#: src/options_wavpack.c:239
 msgid "6 (very slow / tres lent)"
-msgstr "6 (very slow)"
+msgstr "6 (very slow / tres lent)"
 
-#: src/play_file.c:112
-msgid "PAS de lecteur audio present"
+#: src/play_file.c:107
+msgid "NO audio player present"
 msgstr "NO audio player present"
 
-#: src/play_file.c:113
-msgid "Veuillez installez un lecteur audio."
-msgstr "Please install an audio player"
+#: src/play_file.c:108
+msgid "Please install an audio player."
+msgstr "Please install an audio player."
 
-#: src/poche_dir.c:436
+#: src/poche_dir.c:433
 msgid ""
 "Utilisez le glisser / deplacer - Effacer une image avec Ctrl + "
 "Click"
 msgstr ""
-"Use drag / drop - delete an image with Ctrl +Click"
+"Utilisez le glisser / deplacer - Effacer une image avec Ctrl + "
+"Click"
 
 #: src/poche_save.c:117
-msgid "Nom de fichier absent !!"
+msgid "File name not found !!"
 msgstr "File name not found !!"
 
-#: src/poche_save.c:118 src/poche_web.c:361 src/poche_web.c:382
-msgid "Pour resoudre ce probleme:"
+#: src/poche_save.c:118 src/poche_web.c:323 src/poche_web.c:345
+msgid "To solve this problem :"
 msgstr "To solve this problem :"
 
 #: src/poche_save.c:121
-msgid "Saisissez un nom de fichier sans extention"
+msgid "Enter a file name without extension"
 msgstr "Enter a file name without extension"
 
-#: src/poche_save.c:132
-msgid "Sauvegarde aux formats PDF et PostScript"
-msgstr "Saving to PDF and PostScript"
+#: src/poche_save.c:131
+msgid "Saving to PDF"
+msgstr "Saving to PDF"
 
-#: src/poche_save.c:157
-msgid "Sauvegarde au format PNG"
-msgstr "Saving as PNG"
-
-#: src/poche_web.c:360
-msgid "Aucun fichier trouve !"
+#: src/poche_web.c:322
+msgid "No file found !"
 msgstr "No file found !"
 
-#: src/poche_web.c:364
-msgid "Modifiez la chaine de recherche et"
+#: src/poche_web.c:326 src/poche_web.c:348
+msgid "Modify the search parameters and"
 msgstr "Modify the search parameters and"
 
-#: src/poche_web.c:366 src/poche_web.c:387
-msgid "recommencez."
-msgstr "start again"
+#: src/poche_web.c:328 src/poche_web.c:350
+msgid "start again."
+msgstr "start again."
 
-#: src/poche_web.c:381
-msgid "Critere de recherche absent !!"
+#: src/poche_web.c:344
+msgid "Search criteria away !!"
 msgstr "Search criteria away !!"
 
-#: src/poche_web.c:385
-msgid "Saisissez une chaine de recherche et"
-msgstr "Enter a search string and"
-
-#: src/poche_web.c:394
-msgid "[Recherche des fichiers images]"
+#: src/poche_web.c:362
+msgid "[Search images files]"
 msgstr "[Search images files]"
 
-#: src/popup.c:87 src/popup.c:106
+#: src/popup.c:81 src/popup.c:100
 msgid " Deselection globale"
-msgstr " Deselect all"
+msgstr " Deselection globale"
 
-#: src/popup.c:88 src/popup.c:107 src/popup.c:168
+#: src/popup.c:82 src/popup.c:101 src/popup.c:162
 msgid " Deselection verticale"
-msgstr " Vertically deselect"
+msgstr " Deselection verticale"
 
-#: src/popup.c:89 src/popup.c:108
+#: src/popup.c:83 src/popup.c:102
 msgid " Deselection horizontale"
-msgstr " Horizontally deselect"
+msgstr " Deselection horizontale"
 
-#: src/popup.c:90 src/popup.c:93 src/popup.c:109 src/popup.c:112
-#: src/popup.c:126 src/popup.c:139 src/popup.c:153
+#: src/popup.c:84 src/popup.c:87 src/popup.c:103 src/popup.c:106
+#: src/popup.c:120 src/popup.c:133 src/popup.c:147
 msgid " ---"
 msgstr " ---"
 
-#: src/popup.c:91 src/popup.c:110
+#: src/popup.c:85 src/popup.c:104
 msgid " Selection verticale"
-msgstr " Vertically select"
+msgstr " Selection verticale"
 
-#: src/popup.c:92 src/popup.c:111
+#: src/popup.c:86 src/popup.c:105
 msgid " Selection Expert verticale"
-msgstr " Vertical expert select"
+msgstr " Selection Expert verticale"
 
-#: src/popup.c:94 src/popup.c:113
+#: src/popup.c:88 src/popup.c:107
 msgid " Selection horizontale"
-msgstr " Horizontally select"
+msgstr " Selection horizontale"
 
-#: src/popup.c:95 src/popup.c:114
+#: src/popup.c:89 src/popup.c:108
 msgid " Selection Expert horizontale "
-msgstr " Horizontal expert select"
+msgstr " Selection Expert horizontale "
 
-#: src/popup.c:125 src/popup.c:138
+#: src/popup.c:119 src/popup.c:132
 msgid " Deselection verticale "
-msgstr " Vertically deselect "
+msgstr " Deselection verticale "
 
-#: src/popup.c:127 src/popup.c:140
+#: src/popup.c:121 src/popup.c:134
 msgid " Selection verticale "
-msgstr " Vertically select "
+msgstr " Selection verticale "
 
-#: src/popup.c:151
+#: src/popup.c:145
 msgid "---SELECTION VERTICALE-----"
-msgstr "---VERTICAL SELECTION------"
+msgstr "---SELECTION VERTICALE-----"
 
-#: src/popup.c:152
+#: src/popup.c:146
 msgid " Deselection verticale "
-msgstr " Vertically deselect "
+msgstr " Deselection verticale "
 
-#: src/popup.c:154
+#: src/popup.c:148
 msgid " Selection PISTE "
-msgstr " TRACK selection "
+msgstr " Selection PISTE "
 
-#: src/popup.c:155
+#: src/popup.c:149
 msgid " Selection ALBUM "
-msgstr " ALBUM selection "
+msgstr " Selection ALBUM "
 
-#: src/popup.c:156
+#: src/popup.c:150
 msgid " Selection NETTOYER "
-msgstr " ERASE selection "
+msgstr " Selection NETTOYER "
 
-#: src/popup.c:167
+#: src/popup.c:161
 msgid "---MENU TRASH--------------"
-msgstr "---TRASH MENU--------------"
+msgstr "---MENU TRASH--------------"
 
-#: src/popup.c:169
+#: src/popup.c:163
 msgid " Selection verticale "
-msgstr " Vertically select "
-
-#: src/popup.c:544 src/popup.c:752 src/popup.c:968
-msgid "Cellule"
-msgstr "Cell"
-
-#: src/popup.c:551 src/popup.c:577
-msgid "1 piste"
-msgstr "1 track"
+msgstr " Selection verticale "
 
-#: src/popup.c:554 src/popup.c:580
-msgid "2 pistes"
-msgstr "2 track"
-
-#: src/popup.c:557 src/popup.c:583
-msgid "4 pistes"
-msgstr "4 track"
-
-#: src/popup.c:560 src/popup.c:586
-msgid "6 pistes"
-msgstr "6 track"
-
-#: src/popup.c:566 src/popup.c:592 src/popup.c:786 src/popup.c:824
-#: src/popup.c:993 src/popup.c:1023
-msgid "Valeur d'origine"
+#: src/popup.c:504 src/popup.c:619 src/popup.c:715
+msgid "Original value"
 msgstr "Original value"
 
-#: src/popup.c:570 src/popup.c:790 src/popup.c:997
-msgid "Colonne"
-msgstr "Column"
-
-#: src/popup.c:759 src/popup.c:797
-msgid " 8000 Hertz"
-msgstr " 8000 Hertz"
-
-#: src/popup.c:762 src/popup.c:800
-msgid "22000 Hertz"
-msgstr "22000 Hertz"
-
-#: src/popup.c:765 src/popup.c:803
-msgid "32000 Hertz"
-msgstr "32000 Hertz"
-
-#: src/popup.c:768 src/popup.c:806
-msgid "44056 Hertz"
-msgstr "44056 Hertz"
-
-#: src/popup.c:771 src/popup.c:809
-msgid "44100 Hertz"
-msgstr "44100 Hertz"
+#: src/popup.c:765
+msgid "Next selector"
+msgstr "Next selector"
 
-#: src/popup.c:774 src/popup.c:812
-msgid "48000 Hertz"
-msgstr "48000 Hertz"
-
-#: src/popup.c:777 src/popup.c:815
-msgid "88200 Hertz"
-msgstr "88200 Hertz"
-
-#: src/popup.c:780 src/popup.c:818
-msgid "96000 Hertz"
-msgstr "96000 Hertz"
-
-#: src/popup.c:975 src/popup.c:1004
-msgid " 8 bits"
-msgstr " 8 bits"
-
-#: src/popup.c:978 src/popup.c:1008
-msgid "16 bits"
-msgstr "16 bits"
-
-#: src/popup.c:981 src/popup.c:1011
-msgid "24 bits"
-msgstr "24 bits"
-
-#: src/popup.c:984 src/popup.c:1014
-msgid "32 bits"
-msgstr "32 bits"
-
-#: src/popup.c:987 src/popup.c:1017
-msgid "64 bits"
-msgstr "64 bits"
-
-#: src/popup.c:1089
-msgid "Selecteur suivant"
-msgstr "Following selector"
-
-#: src/popup.c:1093
-msgid "Selecteur precedant"
+#: src/popup.c:769
+msgid "Previous selector"
 msgstr "Previous selector"
 
-#: src/popup.c:1101
-msgid "Supprimer la plage active"
+#: src/popup.c:777
+msgid "Delete the active range"
 msgstr "Delete the active range"
 
-#: src/popup.c:1173
-msgid "Retourner horizontalement"
+#: src/popup.c:850
+msgid "Flip Horizontal"
 msgstr "Flip Horizontal"
 
-#: src/popup.c:1177
-msgid "Retourner verticalement"
+#: src/popup.c:854
+msgid "Flip Vertical"
 msgstr "Flip Vertical"
 
-#: src/popup.c:1185
-msgid "Image au premier plan"
+#: src/popup.c:862
+msgid "Foreground image"
 msgstr "Foreground image"
 
-#: src/popup.c:1189
-msgid "Image au dessus"
+#: src/popup.c:866
+msgid "Image above"
 msgstr "Image above"
 
-#: src/popup.c:1193
-msgid "Image en dessous"
+#: src/popup.c:870
+msgid "Image below"
 msgstr "Image below"
 
-#: src/popup.c:1197
-msgid "Image au dernier plan"
+#: src/popup.c:874
+msgid "Image to the background"
 msgstr "Image to the background"
 
-#: src/popup.c:1205
-msgid "Effacer l'image"
+#: src/popup.c:882
+msgid "Clear image"
 msgstr "Clear image"
 
-#: src/popup.c:1242
-msgid "Supprimer l'image de la liste"
+#: src/popup.c:920
+msgid "Remove image from the list"
 msgstr "Remove image from the list"
 
-#: src/popup_systray.c:127
-msgid " Cacher Xcfa "
-msgstr " Hide Xcfa "
+#: src/popup.c:1111
+msgid "V0 [ best quality ]"
+msgstr "V0 [ best quality ]"
 
-#: src/popup_systray.c:130
-msgid " Montrer Xcfa "
-msgstr " Show Xcfa "
+#: src/popup.c:1111 src/popup.c:1114
+msgid "V4 [ default ]"
+msgstr "V4 [ default ]"
 
-#: src/popup_systray.c:150
-msgid " Quitter Xcfa "
-msgstr " Quit Xcfa "
+#: src/popup.c:1111
+msgid "V9 [ Lower quality ]"
+msgstr "V9 [ Lower quality ]"
 
-#: src/popup_systray.c:201
-msgid ""
-"XCFA\n"
-"Programme pour convertir les fichiers audio."
-msgstr ""
-"XCFA\n"
-"Program for converting audio files."
+#: src/popup.c:1294
+msgid "Quality -1 [ Lower quality ]"
+msgstr "Quality -1 [ Lower quality ]"
+
+#: src/popup.c:1295
+msgid "Quality 3 [ Defaut ]"
+msgstr "Quality 3 [ Defaut ]"
 
-#: src/prg_init.c:90
+#: src/popup.c:1296
+msgid "Quality 10 [ Best Quality ]"
+msgstr "Quality 10 [ Best Quality ]"
+
+#: src/prg_init.c:85
 msgid " Decode ATSC A/52 audio streams"
 msgstr " Decode ATSC A/52 audio streams"
 
-#: src/prg_init.c:101
+#: src/prg_init.c:96
 msgid " AAC+ encoder"
 msgstr " AAC+ encoder"
 
-#: src/prg_init.c:112 src/prg_init.c:178
+#: src/prg_init.c:107 src/prg_init.c:173
 msgid " Extracteur cd audio"
-msgstr " InCrEdible Digital Audio eXtractor"
+msgstr " Extracteur cd audio"
 
-#: src/prg_init.c:123
+#: src/prg_init.c:118
 msgid " Read CD and get CDDB discid information"
 msgstr " Read CD and get CDDB discid information"
 
-#: src/prg_init.c:134
+#: src/prg_init.c:129
 msgid " Cherche des renseignements sur les formats mp3"
-msgstr " Check validity of mp3s"
+msgstr " Cherche des renseignements sur les formats mp3"
 
-#: src/prg_init.c:145
+#: src/prg_init.c:140
 msgid " Audio Codeur freeware"
-msgstr " MPEG-4 and MPEG-2 AAC encoder"
+msgstr " Audio Codeur freeware"
 
-#: src/prg_init.c:156
+#: src/prg_init.c:151
 msgid " MPEG-4 AAC decodeur"
-msgstr " MPEG-4 AAC decoder"
+msgstr " MPEG-4 AAC decodeur"
 
-#: src/prg_init.c:167
+#: src/prg_init.c:162
 msgid " Conversion wav : flac"
-msgstr " Create wav to flac"
+msgstr " Conversion wav : flac"
 
-#: src/prg_init.c:189
+#: src/prg_init.c:184
 msgid " Conversion wav : mp3"
-msgstr " Create mp3 audio files"
+msgstr " Conversion wav : mp3"
 
-#: src/prg_init.c:200
+#: src/prg_init.c:195
 msgid " Cherche les informations d'un dvd"
-msgstr " Read the contents of a DVD"
+msgstr " Cherche les informations d'un dvd"
 
-#: src/prg_init.c:212
+#: src/prg_init.c:207
 msgid " Monkey's Audio Console Front End : APE"
 msgstr " Monkey's Audio Console Front End : APE"
 
-#: src/prg_init.c:224 src/prg_init.c:235
+#: src/prg_init.c:219 src/prg_init.c:230
 msgid " MusePack commandline utilities"
 msgstr " MusePack commandline utilities"
 
-#: src/prg_init.c:246
+#: src/prg_init.c:241
 msgid " Lecteur et extracteur"
-msgstr " Video and audio player"
+msgstr " Lecteur et extracteur"
 
-#: src/prg_init.c:257
+#: src/prg_init.c:252
 msgid " Normaliseur de fichier mp3"
-msgstr " Lossless mp3 normaliser"
+msgstr " Normaliseur de fichier mp3"
 
-#: src/prg_init.c:268
+#: src/prg_init.c:263
 msgid " Normaliseur de fichier wav"
-msgstr " wav file normaliser"
+msgstr " Normaliseur de fichier wav"
 
-#: src/prg_init.c:279
+#: src/prg_init.c:274
 msgid " A program to send desktop notifications"
 msgstr " A program to send desktop notifications"
 
-#: src/prg_init.c:290
+#: src/prg_init.c:285
 msgid " Forte compression au format wave"
-msgstr " High compression for waveform files"
+msgstr " Forte compression au format wave"
 
-#: src/prg_init.c:301
+#: src/prg_init.c:296
 msgid " Decoupage de fichiers sans decodage"
-msgstr " Split mp3/ogg without decoding"
+msgstr " Decoupage de fichiers sans decodage"
 
-#: src/prg_init.c:312
+#: src/prg_init.c:307
 msgid " Transformation universelle de fichiers son"
-msgstr " Sound eXchange, the Swiss Army knife of audio manipulation"
+msgstr " Transformation universelle de fichiers son"
 
-#: src/prg_init.c:323
+#: src/prg_init.c:318
 msgid " Conversion wav : ogg"
-msgstr " Convert wav : ogg"
+msgstr " Conversion wav : ogg"
 
-#: src/prg_init.c:334
+#: src/prg_init.c:329
 msgid " Normaliseur de fichier ogg"
-msgstr " ogg file normaliser"
+msgstr " Normaliseur de fichier ogg"
 
-#: src/prg_init.c:345
+#: src/prg_init.c:340
 msgid " WAVPACK Hybrid Lossless Audio Compressor"
-msgstr " Wavpack Hybrid Lossless Audio Compressor"
+msgstr " WAVPACK Hybrid Lossless Audio Compressor"
 
-#: src/prg_init.c:362
-msgid " ... les paquets: deb "
-msgstr " ... Packets: deb "
+#: src/prg_init.c:357
+msgid " ... Packets: deb "
+msgstr " ... Packets: deb "
 
-#: src/prg_init.c:368
-msgid " ... les paquets: tgz "
-msgstr " ... Packets: tgz "
+#: src/prg_init.c:363
+msgid " ... Packets: tgz "
+msgstr " ... Packets: tgz "
 
-#: src/prg_init.c:374
-msgid " ... les paquets: fpm "
-msgstr " ... Packets: fpm "
+#: src/prg_init.c:369
+msgid " ... Packets: fpm "
+msgstr " ... Packets: fpm "
 
-#: src/prg_init.c:380
-msgid " ... les paquets: rpm "
-msgstr " ... Packets: rpm "
+#: src/prg_init.c:375
+msgid " ... Packets: rpm "
+msgstr " ... Packets: rpm "
 
-#: src/prg_init.c:386
-msgid " ... les paquets: pkg.tar.xz "
+#: src/prg_init.c:381
+msgid " ... Packets: pkg.tar.xz "
 msgstr " ... Packets: pkg.tar.xz "
 
-#: src/prg_init.c:392
-msgid " ... les paquets: ? "
-msgstr " ... Packets: ?"
+#: src/prg_init.c:387
+msgid " ... Packets: ? "
+msgstr " ... Packets: ? "
 
-#: src/prg_init.c:628
+#: src/prg_init.c:623
 msgid "Status"
 msgstr "Status"
 
-#: src/prg_init.c:642
-msgid "Paquet"
+#: src/prg_init.c:637
+msgid "Packets"
 msgstr "Packets"
 
-#: src/prg_init.c:657
+#: src/prg_init.c:652
 msgid "Action"
 msgstr "Action"
 
-#: src/scan.c:260
-msgid "PACKAGE dvd+rw-tools ABSENT"
+#: src/scan.c:259
+msgid "PACKAGE dvd+rw-tools is missing"
 msgstr "PACKAGE dvd+rw-tools is missing"
 
-#: src/scan.c:261
-msgid "Le package 'dvd+rw-tools' est absent"
+#: src/scan.c:260
+msgid "The package 'imagemagick' is missing"
 msgstr "The package 'imagemagick' is missing"
 
-#: src/scan.c:263
-msgid "de votre systeme !"
+#: src/scan.c:262
+msgid "on your system !"
 msgstr "on your system !"
 
-#: src/scan.c:265
-msgid "Veuillez l'installer car j'ai besoin de"
+#: src/scan.c:264 src/split.c:438
+msgid "Please install it and resume"
 msgstr "Please install it and resume"
 
-#: src/scan.c:267
-msgid "'dvd+rw-mediainfo' pour identifier le(s)"
+#: src/scan.c:266
+msgid "'Dvd + rw-mediainfo' to identify the"
 msgstr "'Dvd + rw-mediainfo' to identify the"
 
-#: src/scan.c:269
-msgid "lecteur(s) de cd / dvd."
+#: src/scan.c:268
+msgid "reader of cd / dvd."
 msgstr "reader of cd / dvd."
 
-#: src/split.c:284
+#: src/split.c:297
 msgid ""
-"Menu: Click droit / Ajout plage: Click bouton centre / Zoom: Ctrl+Scroll"
+"Menu: right click / Adding track: Click the center button / Zoom: Ctrl"
+"+Scroll"
 msgstr ""
 "Menu: right click / Adding track: Click the center button / Zoom: Ctrl"
 "+Scroll"
 
-#: src/split.c:287
-msgid "Ajout plage: Click bouton centre / Zoom: Ctrl+Scroll"
+#: src/split.c:300
+msgid "Adding track: Click the center button / Zoom: Ctrl+Scroll"
 msgstr "Adding track: Click the center button / Zoom: Ctrl+Scroll"
 
-#: src/split.c:291
-msgid ""
-"Pret pour l'import d'un fichier CUE, WAV, FLAC, OGG, MP3, APE, WMA"
+#: src/split.c:304
+msgid "Ready for imports and a CUE file, WAV, FLAC, OGG, MP3, APE, WMA"
 msgstr "Ready for imports and a CUE file, WAV, FLAC, OGG, MP3, APE, WMA"
 
-#: src/split.c:360 src/split.c:387
-msgid "Ce fichier appartient a XCFA"
+#: src/split.c:378 src/split.c:407
+msgid "This file belongs XCFA"
 msgstr "This file belongs XCFA"
 
-#: src/split.c:361 src/split.c:388
-msgid "Selectionnez un autre fichier."
+#: src/split.c:379 src/split.c:408
+msgid "Select another file."
 msgstr "Select another file."
 
-#: src/split.c:368
-msgid "Fichier vide"
+#: src/split.c:387
+msgid "Empty file"
 msgstr "Empty file"
 
-#: src/split.c:369
-msgid "Le fichier ne contient aucune donnee !!!"
+#: src/split.c:388
+msgid "The file contains no data !!!"
 msgstr "The file contains no data !!!"
 
-#: src/split.c:412
-msgid "Sox et Mplayer absents"
-msgstr "Sox and Mplayer is missing"
+#: src/split.c:433
+msgid "Sox and Mplayer not found"
+msgstr "Sox and Mplayer not found"
 
-#: src/split.c:413
-msgid "Sox et Mplayer sont absents de votre"
-msgstr "Sox and Mplayer is missing"
+#: src/split.c:434
+msgid "Sox et Mplayer are not found"
+msgstr "Sox et Mplayer are not found"
 
-#: src/split.c:415
-msgid "configuration."
-msgstr "configuration."
-
-#: src/split.c:417
-msgid "Veuillez les installer pour pouvoir continuer."
-msgstr "Please install it and resume"
+#: src/split.c:436
+msgid "in your configuration."
+msgstr "in your configuration."
 
-#: src/split.c:467
-msgid "Erreur de choix de fichier"
+#: src/split.c:492
+msgid "Error file select"
 msgstr "Error file select"
 
-#: src/split.c:468
-msgid "Veuillez selectionner un fichier de type WAV FLAC MP3 OGG APE"
+#: src/split.c:493
+msgid "Please select a file type of MP3 WAV OGG FLAC APE"
 msgstr "Please select a file type of MP3 WAV OGG FLAC APE"
 
-#: src/split.c:504 src/split.c:577
-msgid "Mauvais type de fichier"
+#: src/split.c:531 src/split.c:603
+msgid "Wrong type of file"
 msgstr "Wrong type of file"
 
-#: src/split.c:505 src/split.c:578
+#: src/split.c:532 src/split.c:604
 msgid ""
-"Les types de fichiers acceptes\n"
-"sont: WAV FLAC MP3 OGG APE WMA CUE"
+"File types accepted\n"
+"sare: WAV FLAC MP3 OGG APE WMA CUE"
 msgstr ""
 "File types accepted\n"
-"are: WAV FLAC MP3 OGG APE WMA CUE"
+"sare: WAV FLAC MP3 OGG APE WMA CUE"
 
-#: src/split_conv.c:312 src/split_conv.c:328
-msgid "Erreur SOX"
+#: src/split_conv.c:316 src/split_conv.c:333
+msgid "SOX Error"
 msgstr "SOX Error"
 
-#: src/split_conv.c:313 src/split_conv.c:329
-msgid "Le programme SOX de votre distribution"
+#: src/split_conv.c:317 src/split_conv.c:334
+msgid "The SOX program on your distribution"
 msgstr "The SOX program on your distribution"
 
-#: src/split_conv.c:315 src/split_conv.c:331
-msgid "a generer une erreur pendant la conversion."
-msgstr "has generated an error during conversion"
+#: src/split_conv.c:319 src/split_conv.c:336
+msgid "has generated an error during conversion."
+msgstr "has generated an error during conversion."
 
-#: src/split_cue.c:121
-msgid "Erreur de lecture !"
+#: src/split_cue.c:116
+msgid "Misreading !"
 msgstr "Misreading !"
 
-#: src/split_cue.c:181 src/split_cue.c:190 src/split_cue.c:199
-msgid "Erreur"
+#: src/split_cue.c:177 src/split_cue.c:187 src/split_cue.c:196
+msgid "Error"
 msgstr "Error"
 
-#: src/split_cue.c:182
-msgid "Aucun fichier de musique associe au cue-file !"
+#: src/split_cue.c:178
+msgid "No music file associated with the cue-file"
 msgstr "No music file associated with the cue-file"
 
-#: src/split_cue.c:191
-msgid "Pas de fichier WAV dans le cue-file !"
+#: src/split_cue.c:188
+msgid "No WAV file in the cue-file"
 msgstr "No WAV file in the cue-file"
 
-#: src/split_cue.c:200
-msgid "Aucun fichier de musique associe dans le dossier"
+#: src/split_cue.c:197
+msgid "No music file in the folder associated"
 msgstr "No music file in the folder associated"
 
-#: src/split_cue.c:202
-msgid "du cue-file"
+#: src/split_cue.c:199
+msgid "of cue-file"
 msgstr "of cue-file"
 
-#: src/split_cue.c:288
-msgid "Erreur de donnees dans le fichier CUE"
+#: src/split_cue.c:293
+msgid "Data errors in the CUE file"
 msgstr "Data errors in the CUE file"
 
-#: src/split_cue.c:289
-msgid "La solution est d'importer le fichier de"
+#: src/split_cue.c:294
+msgid "The solution is to import the file"
 msgstr "The solution is to import the file"
 
-#: src/split_cue.c:291
-msgid "musique qui sera reconnu et pre-decoupe"
+#: src/split_cue.c:296
+msgid "music that will be recognized and pre-cutting"
 msgstr "music that will be recognized and pre-cutting"
 
-#: src/split_cue.c:293
-msgid "dans le module Split."
-msgstr "Split in the module."
+#: src/split_cue.c:298
+msgid "in the split module."
+msgstr "in the split module."
 
-#: src/split_cue.c:295
-msgid "Il ne restera qu'a ajuster les plages pour"
+#: src/split_cue.c:300
+msgid "We will just adjust to the beaches"
 msgstr "We will just adjust to the beaches"
 
-#: src/split_cue.c:297
-msgid "generer un nouveau cue-file ou des decoupes"
+#: src/split_cue.c:302
+msgid "generate a new cue-file or cuts"
 msgstr "generate a new cue-file or cuts"
 
-#: src/split_cue.c:299
-msgid "correspondant aux plages."
+#: src/split_cue.c:304
+msgid "corresponding to the beaches."
 msgstr "corresponding to the beaches."
 
-#: src/split_selector.c:141
-msgid "Suppression pendant la lecture impossible"
+#: src/split_selector.c:136
+msgid "Deleting not during playback"
 msgstr "Deleting not during playback"
 
-#: src/split_selector.c:234 src/split_selector.c:240 src/split_selector.c:294
-#: src/split_selector.c:300 src/split_selector.c:357 src/split_selector.c:364
-#: src/split_selector.c:434 src/split_selector.c:440
-msgid "Temps inferieur a 5 secondes entre marqueur et curseur !"
+#: src/split_selector.c:231 src/split_selector.c:237 src/split_selector.c:291
+#: src/split_selector.c:297 src/split_selector.c:354 src/split_selector.c:361
+#: src/split_selector.c:431 src/split_selector.c:437
+msgid "Time of less than 5 seconds between marker and cursor !"
 msgstr "Time of less than 5 seconds between marker and cursor !"
 
-#: src/translate.c:55
-msgid "Fichier"
+#: src/web.c:173 src/web.c:221
+msgid "No web browser"
+msgstr "No web browser"
+
+#: src/web.c:174 src/web.c:222
+msgid "No Web access: no web browser"
+msgstr "No Web access: no web browser"
+
+#: src/web.c:176 src/web.c:224
+msgid "found in your system."
+msgstr "found in your system."
+
+#: src/web.c:178 src/web.c:226
+msgid "Please install a web browser."
+msgstr "Please install a web browser."
+
+#: src/web.c:188
+msgid "You need to enable web access"
+msgstr "You need to enable web access"
+
+#: src/web.c:236
+msgid "Application is missing."
+msgstr "Application is missing."
+
+#: src/web.c:237
+msgid "Please install : "
+msgstr "Please install : "
+
+#: src/win_about.c:124
+msgid " Xcfa on the web"
+msgstr " Xcfa on the web"
+
+#: src/win_about.c:174
+msgid ""
+"\n"
+"Au tout debut:\n"
+"\n"
+"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
+"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
+"... ;-)\n"
+"\n"
+""
+msgstr ""
+"\n"
+"Au tout debut:\n"
+"\n"
+"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
+"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
+"... ;-)\n"
+"\n"
+""
+
+#: src/win_scan.c:170
+msgid "Waiting ..."
+msgstr "Waiting ..."
+
+#: glade/xcfa.glade:66 glade/xcfa.glade:2533
+msgid "File"
 msgstr "File"
 
-#: src/translate.c:56
-msgid "Quitter"
+#: glade/xcfa.glade:75
+msgid "Quit"
 msgstr "Quit"
 
-#: src/translate.c:57
-msgid "Outils"
+#: glade/xcfa.glade:89
+msgid "Tools"
 msgstr "Tools"
 
-#: src/translate.c:58
-msgid "Visibilite des champs"
-msgstr "Visible fields"
+#: glade/xcfa.glade:99
+msgid "Visibility fields"
+msgstr "Visibility fields"
 
-#: src/translate.c:59
-msgid "Aide"
+#: glade/xcfa.glade:112
+msgid "Help"
 msgstr "Help"
 
-#: src/translate.c:60
-msgid "A propos"
+#: glade/xcfa.glade:121
+msgid "About"
 msgstr "About"
 
-#: src/translate.c:61 src/translate.c:71
-msgid "Lecture"
-msgstr "Play"
+#: glade/xcfa.glade:224
+msgid "Read"
+msgstr "Read"
 
-#: src/translate.c:62
-msgid " Choix du peripherique / Lecture du DVD "
-msgstr " DVD player / Import files "
+#: glade/xcfa.glade:252
+msgid " Choosing the peripheral / DVD playback "
+msgstr " Choosing the peripheral / DVD playback "
 
-#: src/translate.c:63 src/translate.c:73 src/translate.c:134
-msgid " Destination des fichiers "
-msgstr " Save location: "
+#: glade/xcfa.glade:303 glade/xcfa.glade:921
+msgid " File Destination "
+msgstr " File Destination "
 
-#: src/translate.c:64 src/translate.c:74
+#: glade/xcfa.glade:359 glade/xcfa.glade:1009
 msgid " Eject "
 msgstr " Eject "
 
-#: src/translate.c:65 src/translate.c:96
-msgid " Normaliser "
-msgstr " Normalise "
+#: glade/xcfa.glade:434
+msgid " Normalize "
+msgstr " Normalize "
 
-#: src/translate.c:66
-msgid "Deplier"
+#: glade/xcfa.glade:494
+msgid "Unfold"
 msgstr "Unfold"
 
-#: src/translate.c:67
-msgid "Replier"
+#: glade/xcfa.glade:548
+msgid "Fold"
 msgstr "Fold"
 
-#: src/translate.c:68
+#: glade/xcfa.glade:649
 msgid " Vers 2CH: Sub / Ambiance "
-msgstr " 2CH: Sub / Ambiance "
+msgstr " Vers 2CH: Sub / Ambiance "
 
-#: src/translate.c:69 src/translate.c:102
-msgid "Extraire"
-msgstr "Rip"
+#: glade/xcfa.glade:705
+msgid "Extraction"
+msgstr "Extraction"
 
-#: src/translate.c:70
+#: glade/xcfa.glade:756
 msgid " DVD "
 msgstr " DVD "
 
-#: src/translate.c:72
-msgid " Choix du peripherique / Lecture du CD "
-msgstr " CD player "
+#: glade/xcfa.glade:842
+msgid "Lecture"
+msgstr "Lecture"
+
+#: glade/xcfa.glade:870
+msgid " Choosing the peripheral / CD playback "
+msgstr " Choosing the peripheral / CD playback "
 
-#: src/translate.c:75
-msgid "Titre:"
+#: glade/xcfa.glade:1065
+msgid "Title:"
 msgstr "Title:"
 
-#: src/translate.c:76
+#: glade/xcfa.glade:1077
 msgid "Album:"
 msgstr "Album:"
 
-#: src/translate.c:77
-msgid "Artiste:"
+#: glade/xcfa.glade:1089
+msgid "Artist:"
 msgstr "Artist:"
 
-#: src/translate.c:78
-msgid " Annee:"
-msgstr "Year :"
+#: glade/xcfa.glade:1101
+msgid "Comment:"
+msgstr "Comment:"
+
+#: glade/xcfa.glade:1113
+msgid " Year:"
+msgstr " Year:"
 
-#: src/translate.c:79
+#: glade/xcfa.glade:1125
 msgid " Genre:"
-msgstr "Genre :"
+msgstr " Genre:"
 
-#: src/translate.c:80
-msgid " Piste:"
-msgstr "Track:"
+#: glade/xcfa.glade:1137
+msgid " Track:"
+msgstr " Track:"
 
-#: src/translate.c:81
+#: glade/xcfa.glade:1149
 msgid " *.m3u et xspf: "
-msgstr "m3u and xspf: "
+msgstr " *.m3u et xspf: "
 
-#: src/translate.c:82
-msgid "Commentaire:"
-msgstr "Comment:"
-
-#: src/translate.c:83
-msgid " Modification des tags Freedb "
-msgstr " Freedb tags modification "
+#: glade/xcfa.glade:1287
+msgid "Editing tags Freedb"
+msgstr "Editing tags Freedb"
 
-#: src/translate.c:84
+#: glade/xcfa.glade:1302
 msgid ""
 "%a [ %a=\"Artist\" ]\n"
 "\n"
@@ -1583,14 +1495,15 @@
 "\n"
 "%b [ %b=\"Album\" ]\n"
 "\n"
-"TI% - Tetsumaki lower\n"
+"%Tl - Tetsumaki lower\n"
 "\n"
-"Converts the string to lowercase except for the first character\n"
+"Transforme la chaine en minuscule sauf le premier caractere.\n"
 "\n"
-"In the fields 'Title' since [Changing FreeDB tag]\n"
-"the character or characters to be retained must be preceded bycharacter %"
+"Dans le champs 'Titre' depuis [ Modification des tags FreeDB ],\n"
+"le ou les caracteres devant etre conserves doivent etre precedes par le "
+"caractere %"
 
-#: src/translate.c:85
+#: glade/xcfa.glade:1312
 msgid ""
 "%a - artiste %b - titre "
 "de l'album %c - numero de la piste\n"
@@ -1601,1056 +1514,945 @@
 "%u - remplacement de caracteres: %u(AB=C) %u( =_) %Tl</"
 "b> - Tetsumaki lower"
 msgstr ""
-"%a - artist %b - album "
-"title %c - track number\n"
-"%d - track title %e - "
-"year %g - genre\n"
-"%f - create an m3u and xspf file %na</"
-"b> - no accent\n"
-"%u - replace special characters: %u(AB=C) %u( =_) %Tl</"
-"b> - Tetsumaki lower"
+"%a - artiste %b - titre "
+"de l'album %c - numero de la piste\n"
+"%d - titre de la chanson %e - "
+"annee %g - genre\n"
+"%f - creation d'un fichier *.m3u et *."
+"xspf %na - no accent\n"
+"%u - remplacement de caracteres: %u(AB=C) %u( =_) %Tl</"
+"b> - Tetsumaki lower"
 
-#: src/translate.c:86
-msgid " Arrangement des titres du CD "
-msgstr " Arrangement of CD titles "
+#: glade/xcfa.glade:1346
+msgid " Arrangement of CD titles"
+msgstr " Arrangement of CD titles"
 
-#: src/translate.c:87
-msgid "Creation d'un fichier unique au format: "
-msgstr "Create a single file in the format: "
+#: glade/xcfa.glade:1382
+msgid "Creation of a single file format: "
+msgstr "Creation of a single file format: "
 
-#: src/translate.c:88
-msgid " et dont le nom sera: "
-msgstr " Named: "
+#: glade/xcfa.glade:1430
+msgid " and whose name will be: "
+msgstr " and whose name will be: "
 
-#: src/translate.c:89
-msgid "Ecriture du fichier cue"
-msgstr "Write cue file"
+#: glade/xcfa.glade:1461
+msgid "Writing the cue file"
+msgstr "Writing the cue file"
 
-#: src/translate.c:90
-msgid " Au moins deux selections colonne Wav "
-msgstr " Make at least two selections in the Wav column "
+#: glade/xcfa.glade:1484
+msgid " At least two selections column Wav "
+msgstr " At least two selections column Wav "
 
-#: src/translate.c:91
+#: glade/xcfa.glade:1514
 msgid ""
-"Creation d'un fichier cue\n"
-"unique depuis une lecture\n"
-"du cd audio"
+"\n"
+"Creating a cue file from a single\n"
+"reading audio cd\n"
 msgstr ""
-"Create a single cue\n"
-"file from an audio-CD"
+"\n"
+"Creating a cue file from a single\n"
+"reading audio cd\n"
 
-#: src/translate.c:92
-msgid "Creation fichier cue uniquement"
-msgstr "Create cue file"
+#: glade/xcfa.glade:1562
+msgid "File Creation cue only"
+msgstr "File Creation cue only"
 
-#: src/translate.c:93
+#: glade/xcfa.glade:1597
 msgid " Creation Cue cd "
-msgstr " CD cue file creation "
+msgstr " Creation Cue cd "
+
+#: glade/xcfa.glade:1625
+msgid "  Creation of a single file"
+msgstr "  Creation of a single file"
 
-#: src/translate.c:94
-msgid " Creation d'un fichier unique "
-msgstr " Creating a single file "
+#: glade/xcfa.glade:1638
+msgid "Management of tags, titles and cue files"
+msgstr "Management of tags, titles and cue files"
 
-#: src/translate.c:95
-msgid "Gestion des tags, titres et fichiers cue"
-msgstr "Tags, titles and cue files management"
+#: glade/xcfa.glade:1688
+msgid " normalize "
+msgstr " normalize "
 
-#: src/translate.c:97
+#: glade/xcfa.glade:1749
 msgid "definit le serveur a contacter pour les recherches titre"
-msgstr "Sets the server to be contacted for title lookups"
+msgstr "definit le serveur a contacter pour les recherches titre"
 
-#: src/translate.c:98
+#: glade/xcfa.glade:1788
 msgid "Parametres par defaut"
-msgstr "Default parameters"
+msgstr "Parametres par defaut"
 
-#: src/translate.c:100
-msgid "Choix parmis les differentes bases de donnees pour le CD."
-msgstr "Choice among different databases for the CD."
-
-#: src/translate.c:101
+#: glade/xcfa.glade:1887
 msgid "DiscId"
 msgstr "DiscId"
 
-#: src/translate.c:103
+#: glade/xcfa.glade:1946
+msgid "Extract"
+msgstr "Extract"
+
+#: glade/xcfa.glade:2053
 msgid " CD "
 msgstr " CD "
 
-#: src/translate.c:104 src/translate.c:133
-msgid " Importer "
+#: glade/xcfa.glade:2135 glade/xcfa.glade:3271
+msgid " Import "
 msgstr " Import "
 
-#: src/translate.c:105
-msgid " Destination des conversions "
-msgstr " Export converted files: "
+#: glade/xcfa.glade:2190
+msgid " Destination conversions "
+msgstr " Destination conversions "
 
-#: src/translate.c:106
-msgid " Nettoyer "
-msgstr " Clear "
+#: glade/xcfa.glade:2266
+msgid " Clean up "
+msgstr " Clean up "
 
-#: src/translate.c:107 src/translate.c:114
+#: glade/xcfa.glade:2389
 msgid "Appliquer les modifications"
-msgstr "Apply the changes"
-
-#: src/translate.c:108
-msgid " Normalise: "
-msgstr " Normalise: "
-
-#: src/translate.c:109
-msgid " Choix niveau dBFS: "
-msgstr " dBFS level: "
-
-#: src/translate.c:110 src/translate.c:132
-msgid " Fichiers "
-msgstr " Files "
+msgstr "Appliquer les modifications"
 
-#: src/translate.c:111
-msgid "Quantification"
-msgstr "Quantification"
+#: glade/xcfa.glade:2444
+msgid " Normalize: "
+msgstr " Normalize: "
 
-#: src/translate.c:112
-msgid "Voie"
-msgstr "Channel"
+#: glade/xcfa.glade:2477
+msgid " Level selection dBFS: "
+msgstr " Level selection dBFS: "
 
-#: src/translate.c:113
-msgid " Frequence - Hertz "
-msgstr " Frequency -Hertz "
+#: glade/xcfa.glade:2615
+msgid "Apply changes"
+msgstr "Apply changes"
 
-#: src/translate.c:115
+#: glade/xcfa.glade:2651
 msgid " Wav "
 msgstr " Wav "
 
-#: src/translate.c:116 src/translate.c:202
-msgid " Lame (fichier mp3): "
-msgstr " Lame (mp3 file): "
-
-#: src/translate.c:117 src/translate.c:218
-msgid " Oggenc (fichier ogg): "
-msgstr " Oggenc (ogg file): "
-
-#: src/translate.c:118 src/translate.c:130
-msgid "Appliquer"
+#: glade/xcfa.glade:2735
+msgid "Apply"
 msgstr "Apply"
 
-#: src/translate.c:119
-msgid "Effacer"
-msgstr "Clear"
+#: glade/xcfa.glade:2789
+msgid "Delete"
+msgstr "Delete"
 
-#: src/translate.c:120
+#: glade/xcfa.glade:2826
 msgid " Mp3-Ogg "
 msgstr " Mp3-Ogg "
 
-#: src/translate.c:121
-msgid "Titre:"
+#: glade/xcfa.glade:2875
+msgid "Title:"
 msgstr "Title:"
 
-#: src/translate.c:122
+#: glade/xcfa.glade:2886
 msgid "Album:"
 msgstr "Album:"
 
-#: src/translate.c:123
-msgid "Artiste:"
+#: glade/xcfa.glade:2897
+msgid "Artist:"
 msgstr "Artist:"
 
-#: src/translate.c:124
-msgid "Commentaire:"
+#: glade/xcfa.glade:2908
+msgid "Comment:"
 msgstr "Comment:"
 
-#: src/translate.c:125
-msgid " Annee:"
+#: glade/xcfa.glade:2919
+msgid " Year:"
 msgstr " Year:"
 
-#: src/translate.c:126
+#: glade/xcfa.glade:2930
 msgid " Genre:"
 msgstr " Genre:"
 
-#: src/translate.c:127
-msgid " Piste:"
+#: glade/xcfa.glade:2941
+msgid " Track:"
 msgstr " Track:"
 
-#: src/translate.c:128
+#: glade/xcfa.glade:2952
 msgid " Modif.:"
-msgstr " Edit:"
+msgstr " Modif.:"
 
-#: src/translate.c:129
+#: glade/xcfa.glade:3078
 msgid "0"
 msgstr "0"
 
-#: src/translate.c:131 src/translate.c:315
+#: glade/xcfa.glade:3102
+msgid "Apply "
+msgstr "Apply "
+
+#: glade/xcfa.glade:3160 glade/xcfa.glade:10210
 msgid " Tags "
 msgstr " Tags "
 
-#: src/translate.c:135
+#: glade/xcfa.glade:3190
+msgid " Files "
+msgstr " Files "
+
+#: glade/xcfa.glade:3322
+msgid "   File Destination "
+msgstr "   File Destination "
+
+#: glade/xcfa.glade:3494
 msgid "Lecture de 5 secondes apres le marqueur de debut"
-msgstr "Reading 5 seconds after the beginning marker"
+msgstr "Lecture de 5 secondes apres le marqueur de debut"
 
-#: src/translate.c:136
+#: glade/xcfa.glade:3546
 msgid "Index de debut"
-msgstr "Index start"
+msgstr "Index de debut"
 
-#: src/translate.c:137 src/translate.c:144 src/translate.c:147
+#: glade/xcfa.glade:3547 glade/xcfa.glade:3813 glade/xcfa.glade:3874
 msgid "00h00m00s"
 msgstr "00h00m00s"
 
-#: src/translate.c:138
+#: glade/xcfa.glade:3600
 msgid "lecture"
-msgstr "Play"
+msgstr "lecture"
 
-#: src/translate.c:139
+#: glade/xcfa.glade:3653
 msgid "Pause"
 msgstr "Pause"
 
-#: src/translate.c:140
+#: glade/xcfa.glade:3712
 msgid "Index de lecture"
-msgstr "Index reading"
+msgstr "Index de lecture"
 
-#: src/translate.c:141 src/translate.c:180
+#: glade/xcfa.glade:3713 glade/xcfa.glade:4767
 msgid "label"
 msgstr "label"
 
-#: src/translate.c:142
+#: glade/xcfa.glade:3760
 msgid "Lecture de 5 secondes avant le marqueur de fin"
-msgstr "Reading of 5 seconds before the end marker"
+msgstr "Lecture de 5 secondes avant le marqueur de fin"
 
-#: src/translate.c:143
+#: glade/xcfa.glade:3812
 msgid "Index de fin"
-msgstr "End index"
+msgstr "Index de fin"
 
-#: src/translate.c:145
+#: glade/xcfa.glade:3860
 msgid "Plage"
 msgstr "Plage"
 
-#: src/translate.c:146
+#: glade/xcfa.glade:3873
 msgid "Duree de la plage active"
-msgstr "Length of the active beach"
+msgstr "Duree de la plage active"
 
-#: src/translate.c:148
+#: glade/xcfa.glade:3955
 msgid "Suprimer tous les marqueurs pour les remplacer par un marqueur unique"
-msgstr "Wipe all markers and replace them with a single marker"
+msgstr "Suprimer tous les marqueurs pour les remplacer par un marqueur unique"
 
-#: src/translate.c:149
+#: glade/xcfa.glade:4044
 msgid "Le fichier CUE sera enregistre vers 'Destination des fichiers'."
-msgstr "CUE file to be recorded 'Destination file'."
+msgstr "Le fichier CUE sera enregistre vers 'Destination des fichiers'."
 
-#: src/translate.c:150
-msgid "Production fichier Cue"
-msgstr "Generate CUE file"
+#: glade/xcfa.glade:4073
+msgid "Production Cue file"
+msgstr "Production Cue file"
 
-#: src/translate.c:151
+#: glade/xcfa.glade:4098
 msgid "Le resultat du Split sera dirige vers 'Destination des fichiers'."
-msgstr "The result of the Split will be heading for 'Destination file'."
+msgstr "Le resultat du Split sera dirige vers 'Destination des fichiers'."
 
-#: src/translate.c:152
+#: glade/xcfa.glade:4127
 msgid "Split"
 msgstr "Split"
 
-#: src/translate.c:153
+#: glade/xcfa.glade:4188
 msgid " Split "
 msgstr " Split "
 
-#: src/translate.c:154
+#: glade/xcfa.glade:4253
 msgid "Importation du titre du CD."
-msgstr "Import the CD title."
+msgstr "Importation du titre du CD."
 
-#: src/translate.c:155
-msgid "Titre CD"
+#: glade/xcfa.glade:4276
+msgid "Title CD"
 msgstr "Title CD"
 
-#: src/translate.c:156
+#: glade/xcfa.glade:4296
 msgid "Choix d'une nouvelle police."
-msgstr "Choosing a new font."
+msgstr "Choix d'une nouvelle police."
 
-#: src/translate.c:157
+#: glade/xcfa.glade:4318
 msgid "Texte gras."
-msgstr "Bold text."
+msgstr "Texte gras."
 
-#: src/translate.c:158
+#: glade/xcfa.glade:4340
 msgid "Texte italique."
-msgstr "Italic text."
+msgstr "Texte italique."
 
-#: src/translate.c:159
-msgid ""
-"Apres une lecture de CD et un ajout d'etiquette, ce menu permet la mise en "
-"forme des titres, auteurs ..."
-msgstr ""
-"After reading a CD and add a label, this menu allows the formatting of "
-"titles, authors ..."
-
-#: src/translate.c:160
+#: glade/xcfa.glade:4375
 msgid "Ajouter du texte editable."
-msgstr "Add text editable."
+msgstr "Ajouter du texte editable."
 
-#: src/translate.c:161
-msgid "Texte"
+#: glade/xcfa.glade:4430
+msgid "Text"
 msgstr "Text"
 
-#: src/translate.c:162
+#: glade/xcfa.glade:4462
 msgid "Saisissez ici un critere de recherche d'images."
-msgstr "Enter here a search of images."
+msgstr "Saisissez ici un critere de recherche d'images."
 
-#: src/translate.c:163
+#: glade/xcfa.glade:4484
 msgid "Importation des images depuis le Web."
-msgstr "Importing images from the Web."
+msgstr "Importation des images depuis le Web."
 
-#: src/translate.c:164
-msgid "Import images web"
-msgstr "Import web images"
+#: glade/xcfa.glade:4509
+msgid "Import web images "
+msgstr "Import web images "
 
-#: src/translate.c:165
+#: glade/xcfa.glade:4578
 msgid "Supprimer l'image en selection"
-msgstr "Delete the image selection"
+msgstr "Supprimer l'image en selection"
 
-#: src/translate.c:166
+#: glade/xcfa.glade:4600
 msgid "AJouter de nouvelles images."
-msgstr "Add new images."
+msgstr "AJouter de nouvelles images."
 
-#: src/translate.c:167
+#: glade/xcfa.glade:4606
 msgid "Ouvre un fichier"
-msgstr "Open a file"
+msgstr "Ouvre un fichier"
 
-#: src/translate.c:168
+#: glade/xcfa.glade:4623
 msgid "Enregistrer la page au format png."
-msgstr "Save Page png."
+msgstr "Enregistrer la page au format png."
 
-#: src/translate.c:169
+#: glade/xcfa.glade:4629
 msgid "Sauvegarde le fichier"
-msgstr "Saving the file"
+msgstr "Sauvegarde le fichier"
 
-#: src/translate.c:170
+#: glade/xcfa.glade:4646
 msgid "Diminution de l'echelle."
-msgstr "Reduction in the scale."
+msgstr "Diminution de l'echelle."
 
-#: src/translate.c:171
+#: glade/xcfa.glade:4652
 msgid "Reduit l'agrandissement"
-msgstr "Reduced expansion"
+msgstr "Reduit l'agrandissement"
 
-#: src/translate.c:172
+#: glade/xcfa.glade:4669
 msgid "Echelle a 100%."
-msgstr "Scale 100%."
+msgstr "Echelle a 100%."
 
-#: src/translate.c:173
+#: glade/xcfa.glade:4675
 msgid "Remet l'echelle a 100%"
-msgstr "Gives the scale at 100%"
+msgstr "Remet l'echelle a 100%"
 
-#: src/translate.c:174
+#: glade/xcfa.glade:4692
 msgid "Augmentation de l'echelle."
-msgstr "Increase in scale."
+msgstr "Augmentation de l'echelle."
 
-#: src/translate.c:175
+#: glade/xcfa.glade:4698
 msgid "Augmente l'agrandissement"
-msgstr "Increasing expansion"
+msgstr "Augmente l'agrandissement"
 
-#: src/translate.c:176
+#: glade/xcfa.glade:4715
 msgid "Echelle compatible avec la taille de la fenetre."
-msgstr "Scale compatible with the size of the window."
+msgstr "Echelle compatible avec la taille de la fenetre."
 
-#: src/translate.c:177
+#: glade/xcfa.glade:4721
 msgid "Adapte l'echelle a la taille de la fenetre"
-msgstr "Adjusts the scale to the size of the window"
+msgstr "Adapte l'echelle a la taille de la fenetre"
 
-#: src/translate.c:178
+#: glade/xcfa.glade:4738
 msgid "Emplacement de sauvegarde des fichiers."
-msgstr "Backup location files."
+msgstr "Emplacement de sauvegarde des fichiers."
 
-#: src/translate.c:179
+#: glade/xcfa.glade:4752
 msgid "Nom (sans extention) du fichier a sauvegarder."
-msgstr "Name (without extension) file is saved."
+msgstr "Nom (sans extention) du fichier a sauvegarder."
 
-#: src/translate.c:181
+#: glade/xcfa.glade:4815
 msgid " Pochette "
-msgstr " CD Cover "
+msgstr " Pochette "
 
-#: src/translate.c:182
+#: glade/xcfa.glade:4861
 msgid "Nice"
 msgstr "Nice"
 
-#: src/translate.c:183
-msgid " Priorite systeme "
-msgstr " System priority "
+#: glade/xcfa.glade:4896
+msgid " Priority system "
+msgstr " Priority system "
 
-#: src/translate.c:184
+#: glade/xcfa.glade:4935
 msgid ""
-"Indiquez ici le dossier sur votre systeme qui servira de lieu\n"
-"de stockage provisoire pendant les differentes conversions.\n"
-msgstr "Enter the location of the temporary folder to be used by XCFA\n"
+"\n"
+"Enter here the folder on your system that will serve as\n"
+"temporary storage for the different conversions.\n"
+msgstr ""
+"\n"
+"Enter here the folder on your system that will serve as\n"
+"temporary storage for the different conversions.\n"
 
-#: src/translate.c:185
-msgid " Dossier provisoire des conversions "
-msgstr " Conversions temporary folder "
+#: glade/xcfa.glade:4971
+msgid " Provisional file conversions "
+msgstr " Provisional file conversions "
 
-#: src/translate.c:186
+#: glade/xcfa.glade:5017
 msgid "button"
 msgstr "button"
 
-#: src/translate.c:187
-msgid " Jouer une musique en fin de tache "
-msgstr " Play music at the end of task "
+#: glade/xcfa.glade:5038
+msgid " Playing a job end music "
+msgstr " Playing a job end music "
 
-#: src/translate.c:188
+#: glade/xcfa.glade:5058
 msgid " General "
 msgstr " General "
 
-#: src/translate.c:189
+#: glade/xcfa.glade:5100
 msgid "cdparanoia"
 msgstr "cdparanoia"
 
-#: src/translate.c:190
+#: glade/xcfa.glade:5120
+msgid "cdparanoia mode expert"
+msgstr "cdparanoia mode expert"
+
+#: glade/xcfa.glade:5140
+msgid "cdparanoia mode expert multi passes"
+msgstr "cdparanoia mode expert multi passes"
+
+#: glade/xcfa.glade:5168
 msgid "cdda2wav / icedax"
 msgstr "cdda2wav / icedax"
 
-#: src/translate.c:191
-msgid "cdparanoia mode expert"
-msgstr "cdparanoia expert mode"
-
-#: src/translate.c:192
+#: glade/xcfa.glade:5194
 msgid " Extraction cd-audio avec: "
-msgstr " Rip audio-CD with: "
+msgstr " Extraction cd-audio avec: "
 
-#: src/translate.c:193
+#: glade/xcfa.glade:5268
 msgid "HomePage"
-msgstr "Home Page"
+msgstr "HomePage"
 
-#: src/translate.c:194
+#: glade/xcfa.glade:5323
 msgid "ManPage "
-msgstr "Man Page "
+msgstr "ManPage "
 
-#: src/translate.c:195
+#: glade/xcfa.glade:5352
 msgid " Web cdparanoia "
 msgstr " Web cdparanoia "
 
-#: src/translate.c:196
+#: glade/xcfa.glade:5414
 msgid ""
-"%a - artiste %b - titre "
+"Le fichier LogExpertMode.txt sera cree dans le dossier des "
+"extractions"
+msgstr ""
+"Le fichier LogExpertMode.txt sera cree dans le dossier des "
+"extractions"
+
+#: glade/xcfa.glade:5431
+msgid "Generation of a report for: cdparanoia mode expert multi passes"
+msgstr "Generation of a report for: cdparanoia mode expert multi passes"
+
+#: glade/xcfa.glade:5467
+msgid ""
+"%a - artist %b - titre "
 "de l'album %c - numero de la piste\n"
 "%d - titre de la chanson %e - "
-"annee %g - genre\n"
+"year %g - genre\n"
 "%na - no accent %Tl "
 "- Tetsumaki lower\n"
-"%u - remplacement de caracteres: %u(AB=C) %u( =_)"
+"%u - replacement characters: %u(AB=C) %u( =_)"
 msgstr ""
-"%a - artist %b - album "
-"title %c - track number\n"
-"%d - track title %e - "
+"%a - artist %b - titre "
+"de l'album %c - numero de la piste\n"
+"%d - titre de la chanson %e - "
 "year %g - genre\n"
 "%na - no accent %Tl "
 "- Tetsumaki lower\n"
-"%u - replacing characters: %u(AB=C) %u( =_)"
+"%u - replacement characters: %u(AB=C) %u( =_)"
 
-#: src/translate.c:197
+#: glade/xcfa.glade:5536
 msgid " Dossier de stockage "
-msgstr " File storage "
+msgstr " Dossier de stockage "
 
-#: src/translate.c:198
+#: glade/xcfa.glade:5567
 msgid " CD "
 msgstr " CD "
 
-#: src/translate.c:199
+#: glade/xcfa.glade:5615
 msgid "ABR / CBR / VBR / VBR-NEW"
 msgstr "ABR / CBR / VBR / VBR-NEW"
 
-#: src/translate.c:200
+#: glade/xcfa.glade:5660 glade/xcfa.glade:6295
 msgid "Debit"
-msgstr "Bitrate"
+msgstr "Debit"
 
-#: src/translate.c:201
+#: glade/xcfa.glade:5705 glade/xcfa.glade:6317
 msgid "Mode"
 msgstr "Mode"
 
-#: src/translate.c:203 src/translate.c:219 src/translate.c:231
-#: src/translate.c:244 src/translate.c:261 src/translate.c:272
-#: src/translate.c:286 src/translate.c:300
+#: glade/xcfa.glade:5747
+msgid " Lame (fichier mp3): "
+msgstr " Lame (fichier mp3): "
+
+#: glade/xcfa.glade:5827 glade/xcfa.glade:6466 glade/xcfa.glade:6941
+#: glade/xcfa.glade:7469 glade/xcfa.glade:8200 glade/xcfa.glade:8659
+#: glade/xcfa.glade:9192 glade/xcfa.glade:9753
 msgid "Par defaut"
-msgstr "Default"
+msgstr "Par defaut"
 
-#: src/translate.c:204
+#: glade/xcfa.glade:5848
 msgid " Options LAME "
-msgstr " LAME Options "
+msgstr " Options LAME "
 
-#: src/translate.c:205 src/translate.c:233 src/translate.c:274
+#: glade/xcfa.glade:5909 glade/xcfa.glade:7023 glade/xcfa.glade:8741
 msgid "Site officiel"
-msgstr "Official website"
+msgstr "Site officiel"
 
-#: src/translate.c:206
+#: glade/xcfa.glade:5964
 msgid "Wiki mp3 "
-msgstr "mp3 wiki "
+msgstr "Wiki mp3 "
 
-#: src/translate.c:207
+#: glade/xcfa.glade:6020
 msgid "Wiki "
-msgstr "Lame wiki "
+msgstr "Wiki "
 
-#: src/translate.c:208
+#: glade/xcfa.glade:6076
 msgid "ManPage "
-msgstr "Man Page "
+msgstr "ManPage "
 
-#: src/translate.c:209
+#: glade/xcfa.glade:6105
 msgid " Web Lame "
-msgstr " Lame "
+msgstr " Web Lame "
 
-#: src/translate.c:210 src/translate.c:224 src/translate.c:237
-#: src/translate.c:248 src/translate.c:266 src/translate.c:277
-#: src/translate.c:292
+#: glade/xcfa.glade:6181 glade/xcfa.glade:6709 glade/xcfa.glade:7238
+#: glade/xcfa.glade:7644 glade/xcfa.glade:8442 glade/xcfa.glade:8901
+#: glade/xcfa.glade:9491
 msgid "["
 msgstr "["
 
-#: src/translate.c:211 src/translate.c:225 src/translate.c:238
-#: src/translate.c:249 src/translate.c:267 src/translate.c:278
-#: src/translate.c:293
+#: glade/xcfa.glade:6194 glade/xcfa.glade:6722 glade/xcfa.glade:7251
+#: glade/xcfa.glade:7657 glade/xcfa.glade:8455 glade/xcfa.glade:8914
+#: glade/xcfa.glade:9504
 msgid "string option interne"
-msgstr "internal string option"
+msgstr "string option interne"
 
-#: src/translate.c:212 src/translate.c:226 src/translate.c:239
-#: src/translate.c:250 src/translate.c:268 src/translate.c:279
-#: src/translate.c:294
+#: glade/xcfa.glade:6209 glade/xcfa.glade:6737 glade/xcfa.glade:7266
+#: glade/xcfa.glade:7672 glade/xcfa.glade:8470 glade/xcfa.glade:8929
+#: glade/xcfa.glade:9519
 msgid "]"
 msgstr "]"
 
-#: src/translate.c:213
-msgid ""
-" Options experts, definies par l'utilisateur - lame (wav -> mp3) "
-msgstr " User-defined expert options - lame (wav -> mp3) "
+#: glade/xcfa.glade:6234
+msgid " Experts options defined by the user- lame (wav -> mp3) "
+msgstr " Experts options defined by the user- lame (wav -> mp3) "
 
-#: src/translate.c:214
+#: glade/xcfa.glade:6254
 msgid " Mp3 "
 msgstr " Mp3 "
 
-#: src/translate.c:215
-msgid " Mode"
-msgstr " Mode"
+#: glade/xcfa.glade:6306
+msgid "Mode flux (streaming)"
+msgstr "Mode flux (streaming)"
 
-#: src/translate.c:216
-msgid " Mode flux (streaming)"
-msgstr " Streaming"
-
-#: src/translate.c:217
-msgid " Debit"
-msgstr "Bitrate"
+#: glade/xcfa.glade:6386
+msgid " Oggenc (fichier ogg): "
+msgstr " Oggenc (fichier ogg): "
 
-#: src/translate.c:220
+#: glade/xcfa.glade:6487
 msgid " Options OGGENC "
-msgstr " OGGENC Options "
+msgstr " Options OGGENC "
 
-#: src/translate.c:221
+#: glade/xcfa.glade:6548
 msgid "Wiki "
 msgstr "Wiki "
 
-#: src/translate.c:222 src/translate.c:264 src/translate.c:290
-#: src/translate.c:304
+#: glade/xcfa.glade:6604 glade/xcfa.glade:8337 glade/xcfa.glade:9386
+#: glade/xcfa.glade:9947
 msgid "ManPage"
-msgstr "Man Page"
+msgstr "ManPage"
 
-#: src/translate.c:223
+#: glade/xcfa.glade:6633
 msgid " Web Oggenc "
-msgstr " Oggenc "
+msgstr " Web Oggenc "
 
-#: src/translate.c:227
-msgid ""
-" Options experts, definies par l'utilisateur - oggenc (wav -> ogg) "
-msgstr " User-defined expert options - oggenc (wav -> ogg) "
+#: glade/xcfa.glade:6762
+msgid " Experts options defined by the user - oggenc (wav -> ogg) "
+msgstr " Experts options defined by the user - oggenc (wav -> ogg) "
 
-#: src/translate.c:228
+#: glade/xcfa.glade:6782
 msgid " Oggenc "
 msgstr " Oggenc "
 
-#: src/translate.c:229
+#: glade/xcfa.glade:6824
 msgid "Taux de compression"
-msgstr "Compression level"
+msgstr "Taux de compression"
 
-#: src/translate.c:230
+#: glade/xcfa.glade:6861
 msgid " Flac (fichier flac): "
-msgstr " Flac (flac file): "
+msgstr " Flac (fichier flac): "
 
-#: src/translate.c:232
+#: glade/xcfa.glade:6962
 msgid " Options FLAC "
-msgstr " FLAC Options "
+msgstr " Options FLAC "
 
-#: src/translate.c:234 src/translate.c:275
+#: glade/xcfa.glade:7078 glade/xcfa.glade:8796
 msgid "Framasoft "
 msgstr "Framasoft "
 
-#: src/translate.c:235
+#: glade/xcfa.glade:7133
 msgid "ManPage "
-msgstr "Man Page "
+msgstr "ManPage "
 
-#: src/translate.c:236
+#: glade/xcfa.glade:7162
 msgid " Web Flac "
-msgstr " Flac "
+msgstr " Web Flac "
 
-#: src/translate.c:240
-msgid ""
-" Options experts, definies par l'utilisateur - flac (wav -> flac) "
-msgstr " User-defined expert options - flac (wav -> flac) "
+#: glade/xcfa.glade:7291
+msgid " Experts options defined by the user- flac (wav -> flac) "
+msgstr " Experts options defined by the user- flac (wav -> flac) "
 
-#: src/translate.c:241
+#: glade/xcfa.glade:7311
 msgid " Flac "
 msgstr " Flac "
 
-#: src/translate.c:242
+#: glade/xcfa.glade:7353
 msgid " Qualite"
-msgstr " Quality"
+msgstr " Qualite"
 
-#: src/translate.c:243
+#: glade/xcfa.glade:7389
 msgid " Mac (fichier ape): "
-msgstr " Mac (ape file): "
+msgstr " Mac (fichier ape): "
 
-#: src/translate.c:245
+#: glade/xcfa.glade:7490
 msgid " Options MAC "
-msgstr " MAC Options "
+msgstr " Options MAC "
 
-#: src/translate.c:246
+#: glade/xcfa.glade:7546
 msgid "Wiki"
 msgstr "Wiki"
 
-#: src/translate.c:247
+#: glade/xcfa.glade:7568
 msgid " Web Mac "
-msgstr " Mac "
+msgstr " Web Mac "
 
-#: src/translate.c:251
-msgid " Options experts, definies par l'utilisateur - mac (wav -> ape) "
-msgstr " User-defined expert options - mac (wav -> ape) "
+#: glade/xcfa.glade:7697
+msgid " Experts options defined by the user - mac (wav -> ape) "
+msgstr " Experts options defined by the user - mac (wav -> ape) "
 
-#: src/translate.c:252
+#: glade/xcfa.glade:7717
 msgid " Mac "
 msgstr " Mac "
 
-#: src/translate.c:253
+#: glade/xcfa.glade:7765
 msgid "Compression"
 msgstr "Compression"
 
-#: src/translate.c:254
+#: glade/xcfa.glade:7817
 msgid "Son"
-msgstr "Channel mode"
+msgstr "Son"
 
-#: src/translate.c:255
+#: glade/xcfa.glade:7869
 msgid "Mode hybride"
-msgstr "Hybrid mode"
+msgstr "Mode hybride"
 
-#: src/translate.c:256
+#: glade/xcfa.glade:7921
 msgid "Fichier de correction"
-msgstr "Correction file"
+msgstr "Fichier de correction"
 
-#: src/translate.c:257
+#: glade/xcfa.glade:7973
 msgid "Compression maximum"
-msgstr "Maximum compression"
+msgstr "Compression maximum"
 
-#: src/translate.c:258
+#: glade/xcfa.glade:8025
 msgid "Signature MD5"
-msgstr "MD5 signature"
+msgstr "Signature MD5"
 
-#: src/translate.c:259
+#: glade/xcfa.glade:8077
 msgid "Extra encode processing"
 msgstr "Extra encode processing"
 
-#: src/translate.c:260
+#: glade/xcfa.glade:8120
 msgid " WavPack (fichier wv): "
-msgstr " WavPack (wv file): "
+msgstr " WavPack (fichier wv): "
 
-#: src/translate.c:262
+#: glade/xcfa.glade:8221
 msgid " Options WAVPACK "
-msgstr " WAVPACK Options "
+msgstr " Options WAVPACK "
 
-#: src/translate.c:263
+#: glade/xcfa.glade:8282
 msgid "Wiki "
 msgstr "Wiki "
 
-#: src/translate.c:265
+#: glade/xcfa.glade:8366
 msgid " Web Wavpack "
-msgstr " Wavpack "
+msgstr " Web Wavpack "
 
-#: src/translate.c:269
-msgid ""
-" Options experts, definies par l'utilisateur - wavpack (wav -> wv) "
-msgstr " User-defined expert options - wavpack (wav -> wv) "
+#: glade/xcfa.glade:8495
+msgid " Experts options defined by the user - wavpack (wav -> wv) "
+msgstr " Experts options defined by the user - wavpack (wav -> wv) "
 
-#: src/translate.c:270
+#: glade/xcfa.glade:8515
 msgid " Wavpack "
 msgstr " Wavpack "
 
-#: src/translate.c:271
+#: glade/xcfa.glade:8579
 msgid " MusePack (fichier mpc): "
-msgstr " MusePack (mpc file): "
+msgstr " MusePack (fichier mpc): "
 
-#: src/translate.c:273
+#: glade/xcfa.glade:8680
 msgid " Options MUSEPACK "
-msgstr " MUSEPACK Options "
+msgstr " Options MUSEPACK "
 
-#: src/translate.c:276
+#: glade/xcfa.glade:8825
 msgid " Web Musepack "
-msgstr " Musepack "
+msgstr " Web Musepack "
 
-#: src/translate.c:280
-msgid ""
-" Options experts, definies par l'utilisateur - musepack (wav -> mpc) "
-msgstr " User-defined expert options - musepack (wav -> mpc) "
+#: glade/xcfa.glade:8954
+msgid " Experts options defined by the user- musepack (wav -> mpc) "
+msgstr " Experts options defined by the user- musepack (wav -> mpc) "
 
-#: src/translate.c:281
+#: glade/xcfa.glade:8974
 msgid " Musepack "
 msgstr " Musepack "
 
-#: src/translate.c:282
-msgid " Qualite VBR / Debit ABR"
-msgstr "VBR Quality / ABR rate"
+#: glade/xcfa.glade:9016
+msgid "Conteneur"
+msgstr "Conteneur"
 
-#: src/translate.c:283
-msgid " VBR / ABR"
-msgstr " VBR / ABR"
+#: glade/xcfa.glade:9027
+msgid "VBR / ABR"
+msgstr "VBR / ABR"
 
-#: src/translate.c:284
-msgid " Conteneur"
-msgstr " Container"
+#: glade/xcfa.glade:9038
+msgid "Qualite VBR / Debit ABR"
+msgstr "Qualite VBR / Debit ABR"
 
-#: src/translate.c:285
+#: glade/xcfa.glade:9112
 msgid " Faac (fichier .m4a): "
-msgstr " Faac (file .m4a): "
+msgstr " Faac (fichier .m4a): "
 
-#: src/translate.c:287
+#: glade/xcfa.glade:9213
 msgid " Options FAAC "
-msgstr " FAAC Options "
+msgstr " Options FAAC "
 
-#: src/translate.c:288 src/translate.c:302
+#: glade/xcfa.glade:9274 glade/xcfa.glade:9835
 msgid "Site officiel "
-msgstr "Official website "
+msgstr "Site officiel "
 
-#: src/translate.c:289 src/translate.c:303
+#: glade/xcfa.glade:9330 glade/xcfa.glade:9891
 msgid "Web Info "
-msgstr "Info "
+msgstr "Web Info "
 
-#: src/translate.c:291
+#: glade/xcfa.glade:9415
 msgid " Web Faac "
-msgstr " Faac "
+msgstr " Web Faac "
 
-#: src/translate.c:295
-msgid ""
-" Options experts, definies par l'utilisateur - faac (wav -> m4a) "
-msgstr " User-defined expert options - faac (wav -> m4a) "
+#: glade/xcfa.glade:9544
+msgid " Experts options defined by the user - faac (wav -> m4a) "
+msgstr " Experts options defined by the user - faac (wav -> m4a) "
 
-#: src/translate.c:296
+#: glade/xcfa.glade:9564
 msgid " Faac "
 msgstr " Faac "
 
-#: src/translate.c:297
-msgid " Stereo: Qualite en kbit/s"
-msgstr " Stereo: Quality in kbit/s"
+#: glade/xcfa.glade:9606
+msgid "Mono: Qualite en kbit/s"
+msgstr "Mono: Qualite en kbit/s"
 
-#: src/translate.c:298
-msgid " Mono: Qualite en kbit/s"
-msgstr " Mono: Quality en kbit/s"
+#: glade/xcfa.glade:9617
+msgid "Stereo: Qualite en kbit/s"
+msgstr "Stereo: Qualite en kbit/s"
 
-#: src/translate.c:299
+#: glade/xcfa.glade:9673
 msgid " AacplusEnc (fichier .aac): "
-msgstr " AacplusEnc (file .aac): "
+msgstr " AacplusEnc (fichier .aac): "
 
-#: src/translate.c:301
+#: glade/xcfa.glade:9774
 msgid " Options AacPlusEnc "
-msgstr " AacPlusEnc Options "
+msgstr " Options AacPlusEnc "
 
-#: src/translate.c:305
+#: glade/xcfa.glade:9976
 msgid " Web AacPlusEnc "
-msgstr " AacPlusEnc "
+msgstr " Web AacPlusEnc "
 
-#: src/translate.c:306
+#: glade/xcfa.glade:10021
 msgid " AacplusEnc "
 msgstr " AacplusEnc "
 
-#: src/translate.c:307
+#: glade/xcfa.glade:10051
 msgid "Artiste"
-msgstr "Artist"
+msgstr "Artiste"
 
-#: src/translate.c:308 src/translate.c:335
+#: glade/xcfa.glade:10070 glade/xcfa_win_treeview.glade:95
 msgid "Titre"
-msgstr "Title"
+msgstr "Titre"
 
-#: src/translate.c:309
+#: glade/xcfa.glade:10089
 msgid "Album"
 msgstr "Album"
 
-#: src/translate.c:310
+#: glade/xcfa.glade:10108
 msgid "Numero"
-msgstr "Number"
+msgstr "Numero"
 
-#: src/translate.c:311
+#: glade/xcfa.glade:10127
 msgid "Genre"
 msgstr "Genre"
 
-#: src/translate.c:312
+#: glade/xcfa.glade:10146
 msgid "Annee"
-msgstr "Year"
+msgstr "Annee"
 
-#: src/translate.c:313
+#: glade/xcfa.glade:10165
 msgid "Commentaire"
-msgstr "Comment"
+msgstr "Commentaire"
 
-#: src/translate.c:314
+#: glade/xcfa.glade:10190
 msgid " Exportation de "
-msgstr " Export "
+msgstr " Exportation de "
 
-#: src/translate.c:316
+#: glade/xcfa.glade:10226
 msgid " Preferences "
 msgstr " Preferences "
 
-#: src/translate.c:317
+#: glade/xcfa.glade:10289
 msgid "SCAN"
 msgstr "SCAN"
 
-#: src/translate.c:318
+#: glade/xcfa.glade:10303
 msgid " Installation "
 msgstr " Installation "
 
-#: src/translate.c:319
-msgid " Votre systeme utilise ... "
-msgstr " Your system uses ... "
+#: glade/xcfa.glade:10338
+msgid " Your system use ... "
+msgstr " Your system use ... "
 
-#: src/translate.c:320
+#: glade/xcfa.glade:10375
 msgid ""
 "\n"
-"Pour installer les programmes externes requis,\n"
-"veuillez utiliser l'installateur de votre distribution Gnu/Linux.\n"
+"To install the required external programs\n"
+"Please use the installer to your distribution Gnu / Linux.\n"
 msgstr ""
 "\n"
-"To install the required external software,\n"
-"please use the package manager of your Gnu/Linux distribution.\n"
+"To install the required external programs\n"
+"Please use the installer to your distribution Gnu / Linux.\n"
 
-#: src/translate.c:321
+#: glade/xcfa.glade:10393
 msgid ""
 "Le programme XCFA_INSTALL_ALL ecrit en Perl vous sera utile en ligne de "
 "commande pour une installation des programmes complementaire."
 msgstr ""
-"The program XCFA_INSTALL_ALL written in Perl will be useful on the command "
-"line for installation of supplementary programs"
+"Le programme XCFA_INSTALL_ALL ecrit en Perl vous sera utile en ligne de "
+"commande pour une installation des programmes complementaire."
 
-#: src/translate.c:322
+#: glade/xcfa.glade:10419
 msgid " Informations "
 msgstr " Informations "
 
-#: src/translate.c:323
-msgid " Application externes "
-msgstr " External programs "
+#: glade/xcfa.glade:10443
+msgid " External application "
+msgstr " External application "
 
-#: src/translate.c:324 src/translate.c:326
+#: glade/xcfa.glade:10514 glade/xcfa.glade:10618
 msgid "parametres:"
-msgstr "parameters:"
+msgstr "parametres:"
 
-#: src/translate.c:325
-msgid "Navigateur"
-msgstr "browsers"
-
-#: src/translate.c:327
-msgid "Lecteurs audio"
-msgstr "Audio player"
-
-#: src/translate.c:328
-msgid " Navigateurs / Lecteurs audio "
-msgstr " Browsers / Audio player"
-
-#: src/translate.c:329
-msgid " Applications externes "
-msgstr " External programs "
-
-#: src/translate.c:330
-msgid "Scan en cours ..."
-msgstr "Scan in progress ..."
-
-#: src/translate.c:331
-msgid "Scan du support en cours ..."
-msgstr "Media scan in progress..."
-
-#: src/translate.c:332
-msgid "Detail extraction mode expert"
-msgstr "Rip details - expert mode"
-
-#: src/translate.c:333
-msgid "Modification des champs"
-msgstr "Modify fields"
-
-#: src/translate.c:334
+#: glade/xcfa.glade:10527
 msgid ""
 "\n"
-"Modification des champs\n"
+" konqueror : newTab\n"
+" iceweasel : -new-window -new-tab \n"
 msgstr ""
 "\n"
-"Modify fields\n"
+" konqueror : newTab\n"
+" iceweasel : -new-window -new-tab \n"
 
-#: src/translate.c:342 src/translate.c:361 src/translate.c:382
-#: src/translate.c:394 src/translate.c:405 src/translate.c:413
-msgid " Visibilite "
-msgstr " Visibility "
-
-#: src/translate.c:343 src/translate.c:362 src/translate.c:383
-#: src/translate.c:395 src/translate.c:406 src/translate.c:414
-msgid "Nom a gauche"
-msgstr "Name to left"
-
-#: src/translate.c:344 src/translate.c:363 src/translate.c:384
-#: src/translate.c:396 src/translate.c:407 src/translate.c:415
-msgid "Nom au centre"
-msgstr "Name centred"
-
-#: src/translate.c:345 src/translate.c:364 src/translate.c:385
-#: src/translate.c:397 src/translate.c:408 src/translate.c:416
-msgid "Nom a droite"
-msgstr "Name to right"
-
-#: src/translate.c:346
-msgid "DVD"
-msgstr "DVD"
-
-#: src/translate.c:351 src/translate.c:372
-msgid "Wavpack"
-msgstr "Wavpack"
-
-#: src/translate.c:355 src/translate.c:376
-msgid "Musepack"
-msgstr "Musepack"
-
-#: src/translate.c:365
-msgid "CD"
-msgstr "CD"
-
-#: src/translate.c:380
-msgid "Replaygain"
-msgstr "Replaygain"
-
-#: src/translate.c:386
-msgid "CONVERSIONS"
-msgstr "CONVERSIONS"
-
-#: src/translate.c:387
-msgid "Hertz"
-msgstr "Hertz"
-
-#: src/translate.c:388
-msgid "New Hertz"
-msgstr "New Hertz"
-
-#: src/translate.c:389
-msgid "Voie"
-msgstr "Voice"
-
-#: src/translate.c:390
-msgid "New Voie"
-msgstr "New Voice"
-
-#: src/translate.c:391
-msgid "Bits"
-msgstr "Bits"
-
-#: src/translate.c:392
-msgid "New Bits"
-msgstr "New Bits"
-
-#: src/translate.c:398
-msgid "WAV"
-msgstr "WAV"
-
-#: src/translate.c:401
-msgid "New Bitrate"
-msgstr "New Bitrat"
-
-#: src/translate.c:402
-msgid "Size"
-msgstr "Size"
-
-#: src/translate.c:409
-msgid "MP3-OGG"
-msgstr "MP3-OGG"
-
-#: src/translate.c:417
-msgid "TAGS"
-msgstr "TAGS"
+#: glade/xcfa.glade:10548
+msgid "Navigateur"
+msgstr "Navigateur"
 
-#: src/translate.c:418
-msgid "Selection globale"
-msgstr "Select all"
+#: glade/xcfa.glade:10648
+msgid "Lecteurs audio"
+msgstr "Lecteurs audio"
 
-#: src/translate.c:419
-msgid "Deselection globale"
-msgstr "Clear all"
+#: glade/xcfa.glade:10669
+msgid "  Browsers / Audio Players "
+msgstr "  Browsers / Audio Players "
 
-#: src/translate.c:420
-msgid "Retour"
-msgstr "Return"
+#: glade/xcfa.glade:10692
+msgid " Applications externes "
+msgstr " Applications externes "
 
-#: src/translate.c:421
+#: glade/xcfa_win_about.glade:7
 msgid "About X Convert File Audio"
 msgstr "About X Convert File Audio"
 
-#: src/translate.c:422
+#: glade/xcfa_win_about.glade:103
 msgid "Author"
 msgstr "Author"
 
-#: src/translate.c:423
+#: glade/xcfa_win_about.glade:139
 msgid "Licence"
-msgstr "License"
+msgstr "Licence"
 
-#: src/translate.c:424
+#: glade/xcfa_win_about.glade:163
 msgid " Informations "
 msgstr " Informations "
 
-#: src/translate.c:425
+#: glade/xcfa_win_about.glade:198
 msgid " Machine "
-msgstr " Computer "
+msgstr " Machine "
 
-#: src/translate.c:426
+#: glade/xcfa_win_about.glade:333
 msgid "Ingenieurs du son\n"
-msgstr "Sound engineers\n"
+msgstr "Ingenieurs du son\n"
 
-#: src/translate.c:427
+#: glade/xcfa_win_about.glade:350
 msgid ""
 "\n"
 "Graphisme\n"
 msgstr ""
 "\n"
-"Graphics\n"
+"Graphisme\n"
 
-#: src/translate.c:428
+#: glade/xcfa_win_about.glade:370
 msgid ""
 "Traduction Anglaise\n"
 "\n"
 "\n"
 msgstr ""
-"English translation\n"
+"Traduction Anglaise\n"
 "\n"
 "\n"
 
-#: src/translate.c:429
+#: glade/xcfa_win_about.glade:391
 msgid ""
 "\n"
 "Traduction Allemande"
 msgstr ""
 "\n"
-"German translation"
+"Traduction Allemande"
 
-#: src/translate.c:430
+#: glade/xcfa_win_about.glade:628
 msgid ""
 "\n"
 "Codeur Xcfa"
 msgstr ""
 "\n"
-"XCFA programmer"
+"Codeur Xcfa"
 
-#: src/translate.c:431
+#: glade/xcfa_win_about.glade:665
 msgid ""
 "\n"
 "ElementSpeak pour Xcfa "
 msgstr ""
 "\n"
-"ElementSpeak for XCFA··"
+"ElementSpeak pour Xcfa "
 
-#: src/translate.c:432
+#: glade/xcfa_win_about.glade:702
 msgid ""
 "\n"
 "Codeur pages Web"
 msgstr ""
 "\n"
-"Webmasters"
+"Codeur pages Web"
 
-#: src/translate.c:433
+#: glade/xcfa_win_about.glade:739
 msgid ""
 "\n"
 "Traduction Italienne"
 msgstr ""
 "\n"
-"Italian translation"
+"Traduction Italienne"
 
-#: src/translate.c:434
+#: glade/xcfa_win_about.glade:800
 msgid ""
 "\n"
 "\n"
@@ -2658,53 +2460,45 @@
 msgstr ""
 "\n"
 "\n"
-"Useful links\n"
+"Pages a visiter\n"
 
-#: src/translate.c:435
+#: glade/xcfa_win_about.glade:1123
 msgid "Linux On The Root"
 msgstr "Linux On The Root"
 
-#: src/translate.c:436
+#: glade/xcfa_win_about.glade:1180
 msgid "Frugalware"
 msgstr "Frugalware"
 
-#: src/translate.c:437
+#: glade/xcfa_win_about.glade:1237
 msgid "Road2Mayotte"
 msgstr "Road2Mayotte"
 
-#: src/translate.c:438
+#: glade/xcfa_win_about.glade:1294
 msgid "La Linuxerie"
 msgstr "La Linuxerie"
 
-#: src/translate.c:439
-msgid "Audioptimisation by Dzef"
-msgstr "Audioptimisation by Dzef"
-
-#: src/translate.c:440
+#: glade/xcfa_win_about.glade:1351
 msgid "Tuxfamily"
 msgstr "Tuxfamily"
 
-#: src/translate.c:441
+#: glade/xcfa_win_about.glade:1408
 msgid "Framasoft"
 msgstr "Framasoft"
 
-#: src/translate.c:442
+#: glade/xcfa_win_about.glade:1465
 msgid "Ekd (EnKoDeur-Mixeur)"
 msgstr "Ekd (EnKoDeur-Mixeur)"
 
-#: src/translate.c:443
-msgid "Bishop's page"
-msgstr "Bishop's page"
+#: glade/xcfa_win_about.glade:1544
+msgid "Debian Multimedia"
+msgstr "Debian Multimedia"
 
-#: src/translate.c:444
+#: glade/xcfa_win_about.glade:1598
 msgid "Je suis libre"
 msgstr "Je suis libre"
 
-#: src/translate.c:445
-msgid "Debian Multimedia"
-msgstr "Debian Multimedia"
-
-#: src/translate.c:446
+#: glade/xcfa_win_about.glade:1705
 msgid ""
 "\n"
 "Forum\n"
@@ -2712,19 +2506,15 @@
 "\n"
 "Forum\n"
 
-#: src/translate.c:447
-msgid "XCFA Vorstellung "
-msgstr "XCFA Vorstellung "
+#: glade/xcfa_win_about.glade:1825
+msgid "Forum Xcfa"
+msgstr "Forum Xcfa"
 
-#: src/translate.c:448
+#: glade/xcfa_win_about.glade:1879
 msgid "XCFA LinuxForen.de"
 msgstr "XCFA LinuxForen.de"
 
-#: src/translate.c:449
-msgid "Forum Xcfa"
-msgstr "Forum Xcfa"
-
-#: src/translate.c:450
+#: glade/xcfa_win_about.glade:1929
 msgid ""
 "\n"
 "Documentation\n"
@@ -2732,102 +2522,208 @@
 "\n"
 "Documentation\n"
 
-#: src/translate.c:451
+#: glade/xcfa_win_about.glade:2164
 msgid "Wiki Xcfa par Shankarius"
-msgstr "XCFA wiki by Shankarius"
+msgstr "Wiki Xcfa par Shankarius"
 
-#: src/translate.c:452
+#: glade/xcfa_win_about.glade:2219
 msgid "Doc Xcfa par Patachon"
-msgstr "XCFA doc. by Patachon"
+msgstr "Doc Xcfa par Patachon"
 
-#: src/translate.c:453
+#: glade/xcfa_win_about.glade:2276
 msgid "Ogg Vorbis explique par Shankarius"
-msgstr "Ogg Vorbis explained by Shankarius"
+msgstr "Ogg Vorbis explique par Shankarius"
 
-#: src/translate.c:454
+#: glade/xcfa_win_about.glade:2333
 msgid "La normalisation expliquee par Dzef"
-msgstr "Normalisation explained by Dzef"
+msgstr "La normalisation expliquee par Dzef"
 
-#: src/translate.c:455
+#: glade/xcfa_win_about.glade:2390
 msgid "Xcfa sur Linux On The Root"
-msgstr "XCFA on Linux On The Root"
+msgstr "Xcfa sur Linux On The Root"
 
-#: src/translate.c:456
+#: glade/xcfa_win_about.glade:2433
 msgid " Contributions "
 msgstr " Contributions "
 
-#: src/translate.c:457
+#: glade/xcfa_win_about.glade:2461
 msgid " License "
-msgstr " Licence "
+msgstr " License "
 
-#: src/translate.c:458
+#: glade/xcfa_win_about.glade:2482
 msgid "OK"
 msgstr "OK"
 
-#: src/web.c:147 src/web.c:207
-msgid "PAS de navigateur present"
-msgstr "No web browser"
+#: glade/xcfa_win_scan.glade:9
+msgid "Scan en cours ..."
+msgstr "Scan en cours ..."
 
-#: src/web.c:148
-msgid "L'acces au web est impossible car aucun navigateur"
-msgstr "No Web access: no web browser"
+#: glade/xcfa_win_scan.glade:77
+msgid "Scan du support en cours ..."
+msgstr "Scan du support en cours ..."
 
-#: src/web.c:150
-msgid "n'est present dans votre configuration."
-msgstr "found in your system"
+#: glade/xcfa_win_scan.glade:128
+msgid "Detail extraction mode expert"
+msgstr "Detail extraction mode expert"
 
-#: src/web.c:152
-msgid "Veuillez installez un navigateur."
-msgstr "Please install a web browser"
+#: glade/xcfa_win_treeview.glade:7
+msgid "Modification des champs"
+msgstr "Modification des champs"
 
-#: src/web.c:161
-msgid "Vous devez ouvrir l'acces internet"
-msgstr "You need to enable web access"
+#: glade/xcfa_win_treeview.glade:41
+msgid ""
+"\n"
+"Modification des champs\n"
+msgstr ""
+"\n"
+"Modification des champs\n"
 
-#: src/web.c:209
-msgid " L'acces au web est impossible car aucun navigateur"
-msgstr " No Web access: no web browser"
+#: glade/xcfa_win_treeview.glade:129
+msgid "Temps"
+msgstr "Temps"
 
-#: src/web.c:211
-msgid " n'est present dans votre configuration."
-msgstr " found in your system"
+#: glade/xcfa_win_treeview.glade:163
+msgid "Choix"
+msgstr "Choix"
 
-#: src/web.c:213
-msgid " Veuillez installez un navigateur."
-msgstr " Please install a web browser"
+#: glade/xcfa_win_treeview.glade:197 glade/xcfa_win_treeview.glade:577
+#: glade/xcfa_win_treeview.glade:995 glade/xcfa_win_treeview.glade:1260
+#: glade/xcfa_win_treeview.glade:1508 glade/xcfa_win_treeview.glade:1706
+msgid "Nom"
+msgstr "Nom"
 
-#: src/web.c:222
-msgid "L'application est absente."
-msgstr "Application is missing."
+#: glade/xcfa_win_treeview.glade:220 glade/xcfa_win_treeview.glade:600
+#: glade/xcfa_win_treeview.glade:1018 glade/xcfa_win_treeview.glade:1283
+#: glade/xcfa_win_treeview.glade:1531 glade/xcfa_win_treeview.glade:1732
+msgid " Visibilite "
+msgstr " Visibilite "
 
-#: src/web.c:223
-msgid "Veuillez installer : "
-msgstr "Please install : "
+#: glade/xcfa_win_treeview.glade:250 glade/xcfa_win_treeview.glade:630
+#: glade/xcfa_win_treeview.glade:1048 glade/xcfa_win_treeview.glade:1313
+#: glade/xcfa_win_treeview.glade:1562 glade/xcfa_win_treeview.glade:1763
+msgid "Nom a gauche"
+msgstr "Nom a gauche"
 
-#: src/win_about.c:138
-msgid " Xcfa sur le web"
-msgstr " XCFA on the web"
+#: glade/xcfa_win_treeview.glade:267 glade/xcfa_win_treeview.glade:647
+#: glade/xcfa_win_treeview.glade:1065 glade/xcfa_win_treeview.glade:1330
+#: glade/xcfa_win_treeview.glade:1579 glade/xcfa_win_treeview.glade:1780
+msgid "Nom au centre"
+msgstr "Nom au centre"
 
-#: src/win_about.c:188
-msgid ""
-"\n"
-"Au tout debut:\n"
-"\n"
-"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
-"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
-"... ;-)\n"
-"\n"
-""
-msgstr ""
-"\n"
-"In the beginning:\n"
-"\n"
-"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
-"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
-"... ;-)\n"
-"\n"
-""
+#: glade/xcfa_win_treeview.glade:286 glade/xcfa_win_treeview.glade:666
+#: glade/xcfa_win_treeview.glade:1084 glade/xcfa_win_treeview.glade:1349
+#: glade/xcfa_win_treeview.glade:1598 glade/xcfa_win_treeview.glade:1799
+msgid "Nom a droite"
+msgstr "Nom a droite"
 
-#: src/win_scan.c:166
-msgid "Waiting ..."
-msgstr "Waiting ..."
+#: glade/xcfa_win_treeview.glade:326
+msgid "DVD"
+msgstr "DVD"
+
+#: glade/xcfa_win_treeview.glade:373 glade/xcfa_win_treeview.glade:791
+msgid "Wav"
+msgstr "Wav"
+
+#: glade/xcfa_win_treeview.glade:390 glade/xcfa_win_treeview.glade:808
+msgid "Flac"
+msgstr "Flac"
+
+#: glade/xcfa_win_treeview.glade:407 glade/xcfa_win_treeview.glade:825
+msgid "Ape"
+msgstr "Ape"
+
+#: glade/xcfa_win_treeview.glade:424 glade/xcfa_win_treeview.glade:842
+msgid "Wavpack"
+msgstr "Wavpack"
+
+#: glade/xcfa_win_treeview.glade:441 glade/xcfa_win_treeview.glade:859
+msgid "Ogg"
+msgstr "Ogg"
+
+#: glade/xcfa_win_treeview.glade:458 glade/xcfa_win_treeview.glade:876
+msgid "M4a"
+msgstr "M4a"
+
+#: glade/xcfa_win_treeview.glade:475 glade/xcfa_win_treeview.glade:893
+msgid "Aac"
+msgstr "Aac"
+
+#: glade/xcfa_win_treeview.glade:492 glade/xcfa_win_treeview.glade:910
+msgid "Musepack"
+msgstr "Musepack"
+
+#: glade/xcfa_win_treeview.glade:509 glade/xcfa_win_treeview.glade:927
+msgid "Mp3"
+msgstr "Mp3"
+
+#: glade/xcfa_win_treeview.glade:526
+msgid "Num"
+msgstr "Num"
+
+#: glade/xcfa_win_treeview.glade:709
+msgid "CD"
+msgstr "CD"
+
+#: glade/xcfa_win_treeview.glade:978
+msgid "Replaygain"
+msgstr "Replaygain"
+
+#: glade/xcfa_win_treeview.glade:1127
+msgid "CONVERSIONS"
+msgstr "CONVERSIONS"
+
+#: glade/xcfa_win_treeview.glade:1158
+msgid "Hertz"
+msgstr "Hertz"
+
+#: glade/xcfa_win_treeview.glade:1175
+msgid "New Hertz"
+msgstr "New Hertz"
+
+#: glade/xcfa_win_treeview.glade:1192
+msgid "Voie"
+msgstr "Voie"
+
+#: glade/xcfa_win_treeview.glade:1209
+msgid "New Voie"
+msgstr "New Voie"
+
+#: glade/xcfa_win_treeview.glade:1226
+msgid "Bits"
+msgstr "Bits"
+
+#: glade/xcfa_win_treeview.glade:1243
+msgid "New Bits"
+msgstr "New Bits"
+
+#: glade/xcfa_win_treeview.glade:1392
+msgid "WAV"
+msgstr "WAV"
+
+#: glade/xcfa_win_treeview.glade:1440
+msgid "Bitrate"
+msgstr "Bitrate"
+
+#: glade/xcfa_win_treeview.glade:1457
+msgid "New Bitrate"
+msgstr "New Bitrate"
+
+#: glade/xcfa_win_treeview.glade:1641
+msgid "MP3-OGG"
+msgstr "MP3-OGG"
+
+#: glade/xcfa_win_treeview.glade:1842
+msgid "TAGS"
+msgstr "TAGS"
+
+#: glade/xcfa_win_treeview.glade:1894
+msgid "Selection globale"
+msgstr "Selection globale"
+
+#: glade/xcfa_win_treeview.glade:1948
+msgid "Deselection globale"
+msgstr "Deselection globale"
+
+#: glade/xcfa_win_treeview.glade:2009
+msgid "Retour"
+msgstr "Retour"

xcfa-4.2.8.tar.gz/po/es.gmo -> xcfa-5.0.2.tar.gz/po/es.gmo Changed

xcfa-4.2.8.tar.gz/po/es.po -> xcfa-5.0.2.tar.gz/po/es.po Changed

@@ -4,243 +4,189 @@
 # Claude BULIN <xcfaudio@gmail.com>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: xcfa 4.2.8\n"
+"Project-Id-Version: xcfa 5.0.2\n"
 "Report-Msgid-Bugs-To: xcfa@tuxfamily.org\n"
-"POT-Creation-Date: 2012-02-03 13:22+0100\n"
-"PO-Revision-Date: 2011-09-06 22:12+0200\n"
+"POT-Creation-Date: 2015-05-16 14:03+0200\n"
+"PO-Revision-Date: 2015-02-06 21:45+0100\n"
 "Last-Translator: Claude BULIN <xcfaudio@gmail.com>\n"
 "Language-Team: Spain\n"
-"Language: Spain\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Virtaal 0.6.1\n"
+"X-Generator: Poedit 1.7.3\n"
 
-#: src/cd_audio.c:815 src/dvd.c:684 src/dvd.c:1327
-msgid "MPLAYER deja en action"
+#: src/cd_audio.c:814 src/dvd.c:686 src/dvd.c:1345
+msgid "MPLAYER already in action"
 msgstr "MPLAYER ya está en acción"
 
-#: src/cd_audio.c:816 src/dvd.c:685 src/dvd.c:1328
-msgid "MPLAYER est deja utilise !!"
+#: src/cd_audio.c:815 src/dvd.c:687 src/dvd.c:1346
+msgid "MPLAYER is already in use !!"
 msgstr "MPLAYER ya está en uso!"
 
-#: src/cd_audio.c:1227 src/cd_audio.c:1233 src/dvd.c:871 src/file.c:2830
-msgid "(Click Droit = Menu) / En attente de selection."
-msgstr "(Clic derecho = Menú) / espera para la selección."
+#: src/cd_audio.c:1227 src/cd_audio.c:1233 src/file.c:2837
+msgid "(Right click = Menu) / Waiting for selection."
+msgstr "(Clic derecho = Menú) / selección."
 
-#: src/cd_audio.c:1230 src/file.c:2827
-msgid "Le programme externe d'extraction est absent."
-msgstr "La extracción de un programa externo está ausente."
+#: src/cd_audio.c:1230
+msgid "The external ripping program is missing."
+msgstr "El programa de rasgadura externa ha desaparecido."
 
-#: src/cd_audio.c:1236 src/file.c:2833
-msgid "(Click Droit = Menu) / En attente de selection. Le fichier existe."
-msgstr "(Clic derecho = Menú) / espera para la selección. Existe el archivo."
+#: src/cd_audio.c:1236
+msgid "(Right click = Menu) / Waiting for Selection. File exists.."
+msgstr "(Clic derecho = Menú) / selección. Existe el archivo."
 
-#: src/cd_audio.c:1239 src/file.c:2836
-msgid "(Click Droit = Menu) / En selection."
+#: src/cd_audio.c:1239
+msgid "(Right click = Menu) / Selected files."
 msgstr "(Clic derecho = Menú) / selección."
 
-#: src/cd_audio.c:1242 src/file.c:2842
-msgid "(Click Droit = Menu) / Selection avec options expert."
+#: src/cd_audio.c:1242 src/file.c:2849
+msgid "(Right click = Menu) / Selection - expert mode."
 msgstr "(Clic derecho = Menú) / Selección con el experto en opciones."
 
-#: src/cd_audio.c:1245 src/file.c:2839
-msgid "(Click Droit = Menu) / En selection. Le fichier existe."
+#: src/cd_audio.c:1245 src/file.c:2846
+msgid "(Right click = Menu) / Selected files. File exists."
 msgstr "(Clic derecho = Menú) / selección. Existe el archivo."
 
-#: src/cd_audio.c:1248 src/file.c:2845
-msgid ""
-"(Click Droit = Menu) / Selection avec options expert. Le fichier existe."
+#: src/cd_audio.c:1248 src/file.c:2852
+msgid "(Right click = Menu) / Selection - expert mode. File exists."
 msgstr ""
 "(Clic derecho = Menú) / Selección con el experto en opciones. Existe el "
 "archivo."
 
 #: src/cd_audio.c:1257
 msgid ""
-"(Click Droit = Menu) / Possibilite d'ajustement INDIVIDUEL ou COLLECTIF "
-"maximal du volume"
+"(Right click = Menu) / Possibilities for individual adaptation or maximum "
+"collection volume"
 msgstr ""
-"(Clic derecho = Menú) / Posibilidad de ajuste individual o GROUP volumen "
-"máximo "
+"(Right click = Menu) / Las posibilidades de adaptación individual o volumen "
+"máximo colección"
 
 #: src/cd_audio.c:1262
-msgid "(Click Droit = Menu) / Ajustement INDIVIDUEL maximal du volume"
+msgid "(Right click = Menu) / INDIVIDUAL maximum volume adjustment"
 msgstr "(Clic derecho = Menú) / ajuste de volumen individual máximo"
 
 #: src/cd_audio.c:1265
-msgid "(Click Droit = Menu) / Ajustement COLLECTIF maximal du volume"
+msgid "(Right click = Menu) / COLLECTIVE maximum volume adjustment"
 msgstr "(Clic derecho = Menú) / Colecciones máximo volumen ajustable"
 
-#: src/cd_audio.c:1505 src/dvd.c:1103 src/file.c:3139 src/translate.c:336
-#: src/translate.c:347 src/translate.c:366
-msgid "Play"
-msgstr "Juego"
-
-#: src/cd_audio.c:1546 src/file.c:3204 src/translate.c:348 src/translate.c:369
-msgid "Wav"
-msgstr "Wav"
-
-#: src/cd_audio.c:1567 src/file.c:3223 src/translate.c:349 src/translate.c:370
-msgid "Flac"
-msgstr "Flac"
-
-#: src/cd_audio.c:1587 src/file.c:3242 src/translate.c:350 src/translate.c:371
-msgid "Ape"
-msgstr "Ape"
-
-#: src/cd_audio.c:1607 src/file.c:3261
-msgid "WavP"
-msgstr "WavP"
-
-#: src/cd_audio.c:1627 src/file.c:3280 src/translate.c:352 src/translate.c:373
-msgid "Ogg"
-msgstr "Ogg"
-
-#: src/cd_audio.c:1648 src/file.c:3299 src/translate.c:353 src/translate.c:374
-msgid "M4a"
-msgstr "M4a"
-
-#: src/cd_audio.c:1669 src/file.c:3318 src/translate.c:354 src/translate.c:375
-msgid "Aac"
-msgstr "Aac"
-
-#: src/cd_audio.c:1689 src/file.c:3337
-msgid "Mpc"
-msgstr "Mpc"
-
-#: src/cd_audio.c:1709 src/file.c:3356 src/translate.c:356 src/translate.c:377
-msgid "Mp3"
-msgstr "Mp3"
-
-#: src/cd_audio.c:1730 src/translate.c:357
-msgid "Num"
-msgstr "Num"
-
-#: src/cd_audio.c:1745 src/translate.c:358 src/translate.c:378
-#: src/translate.c:403 src/translate.c:411
-msgid "Time"
-msgstr "Tiempo"
-
-#: src/cd_audio.c:1760 src/dvd.c:1171 src/file.c:3392 src/translate.c:340
-#: src/translate.c:359 src/translate.c:379
+#: src/cd_audio.c:1764 src/dvd.c:1187 src/file.c:3403
+#: glade/xcfa_win_treeview.glade:180 glade/xcfa_win_treeview.glade:560
+#: glade/xcfa_win_treeview.glade:961
 msgid "Normalise"
 msgstr "Normaliza"
 
-#: src/cd_audio.c:1785 src/dvd.c:1191 src/file.c:3434 src/file_mp3ogg.c:1287
-#: src/file_tags.c:1209 src/file_wav.c:952 src/prg_init.c:614
-#: src/translate.c:341 src/translate.c:360 src/translate.c:381
-#: src/translate.c:393 src/translate.c:404 src/translate.c:412
-msgid "Nom"
-msgstr "Nom"
+#: src/cd_audio.c:1789 src/dvd.c:1207 src/file.c:3445 src/file_mp3ogg.c:964
+#: src/file_tags.c:1253 src/file_wav.c:830 src/prg_init.c:609
+msgid "Name"
+msgstr "Name"
 
-#: src/cd_audio.c:2507
-msgid " Parametrage CDDB: [ Nom du serveur ]"
+#: src/cd_audio.c:2517
+msgid " Setting up CDDB: [ Server name ]"
 msgstr " Configuración de CDDB: [nombre del servidor]"
 
-#: src/cd_audio.c:2516
-msgid " Parametrage PROXY: [ serveur ] [ port ]"
+#: src/cd_audio.c:2526
+msgid " Proxy settings: [ server ] [ port ] "
 msgstr " Instalación del Servidor Proxy: [servidor] [puerto]"
 
-#: src/cd_audio.c:2526 src/translate.c:99
-msgid " Serveur "
+#: src/cd_audio.c:2536 glade/xcfa.glade:1842
+msgid " Server "
 msgstr " servidor "
 
-#: src/cd_audio_extract.c:661
+#: src/cd_audio_extract.c:673
 #, c-format
-msgid ""
-"[Erreur du segment numero: %d]\n"
-"%d) Lecture PASS 1/2\n"
+msgid "[Error on segment #%d] %d) Playing PASS 1/2\n"
 msgstr ""
 "[Error número de segmento: %d]\n"
 "%d) lectura PASS 1/2\n"
 
-#: src/cd_audio_extract.c:668
+#: src/cd_audio_extract.c:680
 #, c-format
 msgid ""
-"--> Deja %d fois 2 lectures du segment %d!\n"
+"--> Segment %d already read two %d times!\n"
 " Abandon :/\n"
 msgstr ""
 "--> Deja %d fois 2 lectures du segment %d!\n"
 " Abandon :/\n"
 
-#: src/cd_audio_extract.c:688
+#: src/cd_audio_extract.c:700
 #, c-format
-msgid "%d) Lecture PASS 2/2\n"
+msgid "%d) Read PASS 2/2\n"
 msgstr "%d) Lectura PASS 2/2\n"
 
-#: src/cd_audio_extract.c:769
+#: src/cd_audio_extract.c:780
 #, c-format
 msgid ""
 "\n"
-"[Piste: %d]\n"
+"[Track: %d]\n"
 msgstr ""
 "\n"
 "[Pista: %d]\n"
 
-#: src/cd_audio_extract.c:773
-msgid "Extraction mode expert PASS 1/2\n"
+#: src/cd_audio_extract.c:784
+msgid "Ripping expert mode PASS 1/2\n"
 msgstr "Modo de extracción de expertos pasada 1/2\n"
 
-#: src/cd_audio_extract.c:784
-msgid "Extraction mode expert PASS 2/2\n"
+#: src/cd_audio_extract.c:795
+msgid "Ripping expert mode PASS 2/2\n"
 msgstr "Experto en la extracción de modo de pase de 2/2\n"
 
-#: src/cd_audio_extract.c:792
-msgid "Controle du contenu des fichiers extraits\n"
+#: src/cd_audio_extract.c:803
+msgid "Control the content of the extracted files\n"
 msgstr "Controlar el contenido de los archivos extraídos\n"
 
-#: src/cd_audio_extract.c:1678 src/cd_audio_extract.c:1680
+#: src/cd_audio_extract.c:1710 src/cd_audio_extract.c:1712
 msgid "XCFA: Extraction CD"
 msgstr "XCFA: Extracción de CD"
 
-#: src/cd_audio_extract.c:1678 src/dvd_extract.c:412 src/file_action.c:190
-#: src/file_mp3ogg_conv.c:300 src/file_wav_conv.c:349
+#: src/cd_audio_extract.c:1710 src/dvd_extract.c:412 src/file_action.c:183
+#: src/file_mp3ogg_conv.c:329 src/file_wav_conv.c:343
 msgid "Ok"
 msgstr "Ok"
 
-#: src/cd_audio_extract.c:1680 src/dvd_extract.c:414 src/file_action.c:192
-#: src/file_mp3ogg_conv.c:302 src/file_wav_conv.c:351
-msgid "Arret par l'utilisateur"
+#: src/cd_audio_extract.c:1712 src/dvd_extract.c:414 src/file_action.c:185
+#: src/file_mp3ogg_conv.c:331 src/file_wav_conv.c:345
+msgid "Stop by user"
 msgstr "Pase por el usuario"
 
-#: src/cd_audio_extract.c:1938
-msgid "Nom de fichier unique absent"
-msgstr "Nombre de archivo único que falta"
+#: src/cd_audio_extract.c:1983
+msgid "File name not found"
+msgstr "Nombre de archivo no encontrado"
 
-#: src/cd_audio_extract.c:1939
-msgid "Veuillez saisir un nom pour le fichier unique"
-msgstr "Por favor, introduzca un nombre para el archivo único"
+#: src/cd_audio_extract.c:1984
+msgid "Please enter a file name"
+msgstr "Por favor, introduzca un nombre de archivo"
 
-#: src/cd_audio_toc.c:160
+#: src/cd_audio_toc.c:156
 msgid "cdda2wav and icedax NOT FOUND"
 msgstr "cdda2wav y icedax NO SE ENCUENTRA"
 
-#: src/cd_audio_toc.c:161
+#: src/cd_audio_toc.c:157
 msgid "Please, install packages [ icedax, cdda2wav ]"
 msgstr "Por favor, instalar paquetes [ icedax, cdda2wav ]"
 
-#: src/cd_audio_toc.c:166
+#: src/cd_audio_toc.c:163
 msgid "icedax NOT FOUND"
 msgstr "icedax NOT FOUND"
 
-#: src/cd_audio_toc.c:167
+#: src/cd_audio_toc.c:164
 msgid "Please, install package [ icedax ]"
 msgstr "Please, install package [ icedax ]"
 
-#: src/cd_audio_toc.c:172
+#: src/cd_audio_toc.c:170
 msgid "cdda2wav NOT FOUND"
 msgstr "cdda2wav NOT FOUND"
 
-#: src/cd_audio_toc.c:173
+#: src/cd_audio_toc.c:171
 msgid "Please, install package [ cdda2wav ]"
 msgstr "Please, install package [ cdda2wav ]"
 
-#: src/cd_audio_toc.c:181
+#: src/cd_audio_toc.c:180
 msgid "cdparanoia NOT FOUND"
 msgstr "cdparanoia NOT FOUND"
 
-#: src/cd_audio_toc.c:182
+#: src/cd_audio_toc.c:181
 msgid "Please, install package [ cdparanoia ]"
 msgstr "Please, install package [ cdparanoia ]"
 
@@ -252,669 +198,657 @@
 msgid "Please, install packages [ cd-discid ]"
 msgstr "Please, install packages [ cd-discid ]"
 
-#: src/cd_audio_toc.c:202
-msgid "ERREUR datas proxy"
+#: src/cd_audio_toc.c:203
+msgid "ERROR datas proxy"
 msgstr "ERROR datas del proxy"
 
-#: src/cd_audio_toc.c:203
-msgid "Veuillez renseigner les champs du proxy"
+#: src/cd_audio_toc.c:204
+msgid "Please complete all fields proxy"
 msgstr "Por favor, complete todos los campos del proxy"
 
-#: src/cd_curl.c:718 src/web.c:160
-msgid "La liaison internet est absente"
-msgstr "La conexión a Internet está ausente"
+#: src/cd_curl.c:734 src/web.c:187
+msgid "A web connection is missing"
+msgstr "Una conexión a Internet no se encuentra"
 
-#: src/cd_curl.c:1122
+#: src/cd_curl.c:1204
 msgid "Couldn't find CD"
 msgstr "Couldn't find CD"
 
-#: src/cd_curl.c:1185
+#: src/cd_curl.c:1267
 msgid "No Audio CD"
 msgstr "No Audio CD"
 
-#: src/dvd.c:863
+#: src/dvd.c:877
 msgid ""
-"(Click Droit = Menu) / PEAK-ALBUM: Amplification maximale du volume pour un "
-"groupe de fichiers en respectant les ecarts de niveau entre chacun d'eux."
+"(Right click = Menu) / Maximum volume amplification of a group of files "
+"keeping the level difference between each of them."
 msgstr ""
-"(Clic = derecho = Menú) / PEAK-álbum: amplificación del volumen máximo de un "
-"grupo de archivos de acuerdo con la diferencia de nivel entre cada uno de "
-"ellos."
+"(Right click = Menu) / Amplificación de volumen máximo de un grupo de "
+"archivos de mantenimiento de la diferencia de nivel entre cada uno de ellos."
 
-#: src/dvd.c:866
-msgid ""
-"(Click Droit = Menu) / PEAK: Amplification maximale du volume pour chaque de "
-"fichier."
-msgstr ""
-"(Clic derecho = Menú) / PEAK: La amplificación de volumen máximo para cada "
-"uno de archivo."
+#: src/dvd.c:882 src/file.c:2882
+msgid "PEAK: Maximum volume amplification of each file."
+msgstr "PEAK: amplificación máximo volumen de cada archivo."
+
+#: src/dvd.c:887
+msgid "(Right click = Menu) / ReplayGain: Waiting for selection."
+msgstr "(Menú = clic derecho) / ReplayGain: En espera de la selección."
 
-#: src/dvd.c:904 src/dvd.c:924
-msgid "En attente de selection. Un click activera la conversion vers 2 canaux."
+#: src/dvd.c:920 src/dvd.c:940
+msgid ""
+"Waiting for selection. A click will activate the conversion to 2 channels."
 msgstr ""
 "De espera para la selección. Con un clic se activa la conversión de 2 "
 "canales."
 
-#: src/dvd.c:916
-msgid "Conversion vers 2 canaux."
+#: src/dvd.c:932
+msgid "Conversion to 2 channels."
 msgstr "La conversión a 2 canales."
 
-#: src/dvd.c:928
+#: src/dvd.c:944
 #, c-format
-msgid "Conversion vers %s canaux."
+msgid "Conversion to %s channels."
 msgstr "La conversión a %s canales."
 
-#: src/dvd.c:933
+#: src/dvd.c:949
 #, c-format
 msgid ""
-"Conversion vers 2 canaux. Un second click activera la conversion vers %s "
-"canaux."
+"Conversion to 2 channels. A second click will activate the conversion to %s "
+"channels."
 msgstr ""
 "Conversion vers 2 canaux. Un second click activera la conversion vers %s "
 "canaux."
 
-#: src/dvd.c:948
-msgid "Musique en ecoute."
-msgstr "Música escuchando"
+#: src/dvd.c:964
+msgid "Playing music."
+msgstr "Reproducción de música."
 
-#: src/dvd.c:951
-msgid "Musique en attente."
-msgstr "Música en espera."
+#: src/dvd.c:967
+msgid "Music paused."
+msgstr "De música en pausa."
 
-#: src/dvd.c:966
+#: src/dvd.c:982
 #, c-format
 msgid "Total selection%s: %d, 2ch: %d"
 msgstr "Total selection%s: %d, 2ch: %d"
 
-#: src/dvd.c:967
+#: src/dvd.c:983
 msgid "s"
 msgstr "s"
 
-#: src/dvd.c:973
-msgid "Ce fichier ne peut etre extrait !"
-msgstr "Este archivo se puede extraer !"
+#: src/dvd.c:989
+msgid "This file can not be ripped !"
+msgstr " El archivo no puede ser arrancado! "
 
-#: src/dvd.c:1091
-msgid "Titres"
-msgstr "Titres"
+#: src/dvd.c:1107
+msgid "Titles"
+msgstr "Títulos"
 
-#: src/dvd.c:1115 src/file.c:3375 src/file_mp3ogg.c:1272 src/file_tags.c:1193
-#: src/translate.c:337
-msgid "Temps"
-msgstr "Temps"
+#: src/dvd.c:1119 glade/xcfa_win_treeview.glade:112
+#: glade/xcfa_win_treeview.glade:356 glade/xcfa_win_treeview.glade:740
+msgid "Play"
+msgstr "Juego"
+
+#: src/dvd.c:1131 src/file.c:3386 src/file_mp3ogg.c:949 src/file_tags.c:1237
+#: glade/xcfa_win_treeview.glade:543 glade/xcfa_win_treeview.glade:944
+#: glade/xcfa_win_treeview.glade:1491 glade/xcfa_win_treeview.glade:1689
+msgid "Time"
+msgstr "Tiempo"
 
-#: src/dvd.c:1127 src/translate.c:338
+#: src/dvd.c:1143 glade/xcfa_win_treeview.glade:146
 msgid "Format"
 msgstr "Format"
 
-#: src/dvd.c:1139 src/translate.c:339
-msgid "Choix"
+#: src/dvd.c:1155
+msgid "Choice"
 msgstr "Choix"
 
-#: src/dvd.c:1253
-msgid "Fichier structure DVD"
+#: src/dvd.c:1267
+msgid "DVD file structure"
 msgstr "DVD estructura de archivos"
 
-#: src/dvd.c:1303
-msgid "Le DVD est absent du lecteur."
-msgstr "El reproductor de DVD está ausente."
-
-#: src/dvd.c:1338
-msgid "Scan ..."
-msgstr "Scan ..."
+#: src/dvd.c:1320
+msgid "The DVD player is absent."
+msgstr "Sox et Mplayer absents"
 
-#: src/dvd.c:1387
-msgid "lsdvd est absent !"
+#: src/dvd.c:1410
+msgid "lsdvd is missing !"
 msgstr "lsdvd está ausente !"
 
-#: src/dvd.c:1388
-msgid "Il faut installer le programme: lsdvd"
+#: src/dvd.c:1411
+msgid "You must install the program: lsdvd"
 msgstr "Debe instalar el programa: lsdvd"
 
 #: src/dvd_extract.c:412 src/dvd_extract.c:414
-msgid "XCFA: Extraction DVD"
-msgstr "XCFA: Extraction DVD"
+msgid "XCFA: DVD rip"
+msgstr "XCFA: DVD rip"
 
-#: src/dvd_read.c:267
+#: src/dvd_read.c:226
 #, c-format
-msgid "Titre [%02d ** ]"
+msgid "Title [%02d ** ]"
 msgstr "Titre [%02d ** ]"
 
-#: src/dvd_read.c:270
+#: src/dvd_read.c:227
 #, c-format
-msgid "Titre [%02d]"
+msgid "Title [%02d]"
 msgstr "Titre [%02d]"
 
-#: src/dvd_read.c:313
+#: src/dvd_read.c:252
 #, c-format
-msgid "Fichier_complet_%02d_%s"
-msgstr "Fichier_complet_%02d_%s"
-
-#: src/dvd_read.c:357
-#, c-format
-msgid "Chapitre: [%02d]"
+msgid "Chapter: [%02d]"
 msgstr "Chapitre: [%02d]"
 
-#: src/dvd_read.c:402
-#, c-format
-msgid "Titre_%02d_Chapitre_%02d_audio_%02d_%s"
-msgstr "Titre_%02d_Chapitre_%02d_audio_%02d_%s"
-
-#: src/file_action.c:190 src/file_action.c:192
-msgid "XCFA: Traitement fichiers"
-msgstr "XCFA: Traitement fichiers"
+#: src/file_action.c:183 src/file_action.c:185
+msgid "XCFA: Processing files"
+msgstr "XCFA: archivos de procesamiento"
 
-#: src/file_analyze.c:624
+#: src/file_analyze.c:731
 msgid "Package checkmp3 (mp3check) NOT FOUND !"
 msgstr "Package checkmp3 (mp3check) NOT FOUND !"
 
-#: src/file_analyze.c:625
+#: src/file_analyze.c:732
 msgid ""
-"Veuillez installer checkmp3 ou mp3check pour\n"
-"la prise en compte des fichiers mp3"
+"Please install or checkmp3 mp3check for\n"
+"consideration of mp3 files"
 msgstr ""
 "Veuillez installer checkmp3 ou mp3check pour\n"
 "la prise en compte des fichiers mp3"
 
-#: src/file.c:332
+#: src/file.c:327
 #, c-format
-msgid "Total fichiers: %d, Selections: %d"
+msgid "Total files: %d, Selections: %d"
 msgstr "Total fichiers: %d, Selections: %d"
 
-#: src/file.c:445
-msgid "CAPACITE DOSSIER TEMPORAIRE TROP FAIBLE"
-msgstr "CAPACIDAD archivo temporal DEMASIADO PEQUEÑO"
+#: src/file.c:441
+msgid "TEMPORARY CAPACITY TOO LOW"
+msgstr "Capacidad temporal DEMASIADO BAJO"
 
-#: src/file.c:446
-msgid "Pas assez de place dans le dossier temporaire"
-msgstr "No hay suficiente espacio en la carpeta temporal"
+#: src/file.c:442 src/file.c:2875
+msgid "WARNING: Not enough space available in the temp folder."
+msgstr ""
+"ADVERTENCIA: No hay suficiente espacio disponible en la carpeta temporal."
 
-#: src/file.c:452
-msgid "Veuillez deselectionner des PeakGroup."
+#: src/file.c:448
+msgid "Please deselect PeakGroup."
 msgstr "Por favor, desactive PeakGroup."
 
-#: src/file.c:1439
-msgid "Conversion(s) vers la source"
+#: src/file.c:1431
+msgid "Conversion(s) to source"
 msgstr "Conversión (s) a la fuente"
 
-#: src/file.c:1440
-msgid "Choix d'une nouvelle destination"
-msgstr "La elección de un nuevo destino"
+#: src/file.c:1432
+msgid "Select a new destination"
+msgstr "Seleccione un nuevo destino"
 
-#: src/file.c:1510
+#: src/file.c:1501
 msgid "Select type: --"
 msgstr "Select type: --"
 
-#: src/file.c:1595
+#: src/file.c:1584
 msgid "Peak/album"
 msgstr "Peak/albu"
 
-#: src/file.c:1596
+#: src/file.c:1585
 msgid "Peak"
 msgstr "Peak"
 
-#: src/file.c:1597
+#: src/file.c:1586
 msgid "Mix (scan)Rms/album"
 msgstr "Mix (scan)Rms/album"
 
-#: src/file.c:1598
+#: src/file.c:1587
 msgid "Fix (scan)Rms"
 msgstr "Fix (scan)Rm"
 
-#: src/file.c:2854
+#: src/file.c:2834
+msgid "The external ripping program is missing"
+msgstr "El programa de rasgadura externa falta"
+
+#: src/file.c:2840
+msgid "(Right click = Menu) / Waiting for Selection. File exists."
+msgstr "(Clic derecho = Menú) / selección. Existe el archivo."
+
+#: src/file.c:2843
+msgid "(Right click = Menu) / Selected files"
+msgstr "(Clic derecho = Menú) / selección."
+
+#: src/file.c:2861
 #, c-format
-msgid "MAX FICHIERS ATTEINT = %d"
+msgid "MAX FILES REACHED = %d"
 msgstr "MAX FICHIERS ATTEINT = %d"
 
-#: src/file.c:2864
-msgid "Normalise: En attente de selection."
+#: src/file.c:2871
+msgid "Normalise: Waiting for selection."
 msgstr "Normaliza: En espera de la selección."
 
-#: src/file.c:2868
-msgid "ATTENTION: Pas assez de place dans le dossier temporaire."
-msgstr "ADVERTENCIA: No suficiente espacio en la carpeta temporal."
-
-#: src/file.c:2871
+#: src/file.c:2878
 msgid ""
-"PEAK-ALBUM: Amplification maximale du volume pour un groupe de fichiers en "
-"respectant les ecarts de niveau entre chacun d'eux."
+"PEAK-ALBUM: Maximum volume amplification for a group of files according to "
+"the deviations in level between them"
 msgstr ""
-"PICO-álbum: La amplificación del volumen máximo de un grupo de archivos de "
-"acuerdo con la diferencia de nivel entre cada uno de ellos."
-
-#: src/file.c:2875
-msgid "PEAK: Amplification maximale du volume pour chaque de fichier."
-msgstr "PEAK: La amplificación de volumen máximo para cada archivo."
+"PEAK-álbum: amplificación del volumen máximo para un grupo de archivos de "
+"acuerdo a las desviaciones de nivel entre ellos"
 
-#: src/file.c:2878
+#: src/file.c:2885
 msgid ""
-"RMS-ALBUM: Ajustement du volume moyen pour un groupe de fichiers en "
-"respectant les ecarts de niveau moyen entre chacun d'eux."
+"RMS-ALBUM: Adjusting the average volume for a group of files according to "
+"the average level of deviation between them."
 msgstr ""
-"PICO-álbum: La amplificación del volumen máximo de un grupo de archivos de "
-"acuerdo con la diferencia de nivel entre cada uno de ellos."
+"RMS-álbum: Ajuste del volumen promedio de un grupo de archivos de acuerdo "
+"con el nivel medio de desviación entre ellos."
 
-#: src/file.c:2881
-msgid "RMS: Ajustement du volume moyen de chaque de fichier."
-msgstr "RMS: Ajuste del volumen medio de cada archivo."
+#: src/file.c:2888
+msgid "RMS: Average volume amplification of each file."
+msgstr "RMS: amplificación promedio de volumen de cada archivo."
 
-#: src/file.c:2895
-msgid "(Click Droit = Menu) / ReplayGain: En attente de selection."
+#: src/file.c:2902
+msgid "(Right Click = Menu) / ReplayGain: Waiting for selection."
 msgstr "(Menú = clic derecho) / ReplayGain: En espera de la selección."
 
-#: src/file.c:2898
-msgid "(Click Droit = Menu) / Mode piste."
+#: src/file.c:2905
+msgid "(Right Click = Menu) / Track mode."
 msgstr "(Click Droit = Menu) / Mode piste"
 
-#: src/file.c:2901
-msgid "(Click Droit = Menu) / Mode album."
+#: src/file.c:2908
+msgid "(Right Click = Menu) / Album mode."
 msgstr "(Click Droit = Menu) / Mode album."
 
-#: src/file.c:2904
-msgid "(Click Droit = Menu) / Mode effacer."
-msgstr "(Click Droit = Menu) / Mode effacer."
+#: src/file.c:2911
+msgid "(Right Click = Menu) / Erase mode."
+msgstr "(Clic derecho = Menú) / selección."
 
-#: src/file.c:3016
+#: src/file.c:3026
 msgid ""
-"(Click Droit = Menu) / Cliquez ici pour envoyer ce fichier apres traitement "
-"a la corbeille"
-msgstr ""
-"(Click Droit = Menu) / Haga clic aquí para enviar este archivo a la papelera "
-"después del tratamiento"
+"(Click Droit = Menu) / Click here to send the processed file to the trash"
+msgstr "(Click Droit = Menu) / Elección del número de bits de codificación"
 
-#: src/file.c:3019
+#: src/file.c:3029
 msgid ""
-"(Click Droit = Menu) / Ce fichier sera dirige apres traitement vers la "
-"corbeille"
+"(Right Click = Menu) / This file will be sent to the trash after processing"
 msgstr ""
-"(Click Droit = Menu) / Este archivo será dirigido a la basura después del "
-"tratamiento"
+"(Right Click = Menu) / Este archivo se enviará a la basura después de "
+"procesar"
 
-#: src/file.c:3152 src/file_trash.c:367 src/translate.c:367
+#: src/file.c:3163 src/file_trash.c:208 glade/xcfa_win_treeview.glade:757
 msgid "Trash"
 msgstr "Trash"
 
-#: src/file.c:3172 src/file_mp3ogg.c:1212 src/file_tags.c:1178
-#: src/translate.c:368 src/translate.c:399 src/translate.c:410
+#: src/file.c:3183 src/file_mp3ogg.c:889 src/file_tags.c:1222
+#: glade/xcfa_win_treeview.glade:774 glade/xcfa_win_treeview.glade:1423
+#: glade/xcfa_win_treeview.glade:1672
 msgid "Type"
 msgstr "Type"
 
-#: src/file.c:3411
-msgid "ReplayGain"
-msgstr "ReplayGain"
-
-#: src/file_mp3ogg.c:771
-msgid "128 -defaut"
-msgstr "128 -defauf"
-
-#: src/file_mp3ogg.c:787
-msgid "V0 -meilleure qualite"
-msgstr "V0 -meilleure qualit"
-
-#: src/file_mp3ogg.c:791 src/file_mp3ogg.c:811
-msgid "V4 -defaut"
-msgstr "V4 -defau"
-
-#: src/file_mp3ogg.c:796
-msgid "V9 -moins bonne qualite"
-msgstr "V9 -moins bonne qualit"
-
-#: src/file_mp3ogg.c:849
-msgid "Defaut"
-msgstr "Defaut"
-
-#: src/file_mp3ogg.c:884
-msgid "Qualite -1 -Moins bonne qualite"
-msgstr "Qualite -1 -Moins bonne qualite"
-
-#: src/file_mp3ogg.c:885 src/options_oggenc.c:149
-msgid "Qualite 0"
-msgstr "Qualite 0"
-
-#: src/file_mp3ogg.c:886 src/options_oggenc.c:150
-msgid "Qualite 1"
-msgstr "Qualite 1"
-
-#: src/file_mp3ogg.c:887 src/options_oggenc.c:151
-msgid "Qualite 2"
-msgstr "Qualite 2"
-
-#: src/file_mp3ogg.c:888
-msgid "Qualite 3 -Defaut"
-msgstr "Qualite 3 -Defaut"
+#: src/file_conv.c:1187
+msgid "Error since MPLAYER !"
+msgstr "Error, ya que MPlayer !"
 
-#: src/file_mp3ogg.c:889 src/options_oggenc.c:153
-msgid "Qualite 4"
-msgstr "Qualite 4"
+#: src/file_conv.c:1188 src/file_conv.c:1200 src/file_mp3ogg_conv.c:337
+#: src/file_mp3ogg_conv.c:349
+msgid "You can enable XCFA command line with: "
+msgstr "Puede habilitar la línea de comandos XCFA con: "
 
-#: src/file_mp3ogg.c:890 src/options_oggenc.c:154
-msgid "Qualite 5"
-msgstr "Qualite 5"
+#: src/file_conv.c:1190 src/file_conv.c:1202 src/file_mp3ogg_conv.c:339
+#: src/file_mp3ogg_conv.c:351
+msgid "$ xcfa -verbose"
+msgstr "$ xcfa -verbose"
 
-#: src/file_mp3ogg.c:891 src/options_oggenc.c:155
-msgid "Qualite 6"
-msgstr "Qualite 6"
+#: src/file_conv.c:1192 src/file_mp3ogg_conv.c:341
+msgid "to see the type of error returned by mplayer."
+msgstr "para ver el tipo de error devuelto por mplayer"
 
-#: src/file_mp3ogg.c:892 src/options_oggenc.c:156
-msgid "Qualite 7"
-msgstr "Qualite 7"
+#: src/file_conv.c:1199
+msgid "Error since SOX !"
+msgstr "Error, ya que SOX !"
 
-#: src/file_mp3ogg.c:893 src/options_oggenc.c:157
-msgid "Qualite 8"
-msgstr "Qualite 8"
+#: src/file_conv.c:1204 src/file_mp3ogg_conv.c:353
+msgid "to see the type of error returned by sox."
+msgstr "para ver el tipo de error devuelto por la ley SOX."
 
-#: src/file_mp3ogg.c:894 src/options_oggenc.c:158
-msgid "Qualite 9"
-msgstr "Qualite 9"
+#: src/file_mp3ogg.c:670
+msgid "Right click: access popup"
+msgstr "Clic derecho: el acceso emergente"
 
-#: src/file_mp3ogg.c:895
-msgid "Qualite 10 -Meilleure qualite"
-msgstr "Qualite 10 -Meilleure qualit"
-
-#: src/file_mp3ogg.c:926 src/options_oggenc.c:189 src/options_wavpack.c:186
-#: src/options_wavpack.c:209 src/options_wavpack.c:232
-msgid "Oui"
-msgstr "Oui"
-
-#: src/file_mp3ogg.c:927 src/options_oggenc.c:190 src/options_wavpack.c:153
-#: src/options_wavpack.c:185 src/options_wavpack.c:208
-#: src/options_wavpack.c:231 src/options_wavpack.c:252
-msgid "Non"
-msgstr "Non"
-
-#: src/file_mp3ogg.c:949 src/options_oggenc.c:211
-msgid "Mono force"
-msgstr "Mono force"
-
-#: src/file_mp3ogg.c:950 src/options_oggenc.c:212
-msgid "Stereo"
-msgstr "Stereo"
+#: src/file_mp3ogg.c:921
+msgid "New bitrate"
+msgstr "New Bitrate"
 
-#: src/file_mp3ogg.c:1228 src/translate.c:400
-msgid "Bitrate"
-msgstr "Bitrate"
+#: src/file_mp3ogg.c:935 glade/xcfa_win_treeview.glade:1474
+msgid "Size"
+msgstr "Size"
 
-#: src/file_mp3ogg.c:1244
-msgid "Nouveau bitrate"
-msgstr "Nouveau bitrate"
+#: src/file_mp3ogg_conv.c:329 src/file_mp3ogg_conv.c:331
+msgid "XCFA: Bitrate change"
+msgstr "XCFA: Traitement fichiers"
 
-#: src/file_mp3ogg.c:1258
-msgid "Taille"
-msgstr "Taille"
+#: src/file_mp3ogg_conv.c:336
+msgid "Error from MPLAYER !"
+msgstr "Error, ya que MPlayer !"
 
-#: src/file_mp3ogg_conv.c:300 src/file_mp3ogg_conv.c:302
-msgid "XCFA: Modification bitrate"
-msgstr "XCFA: bitrate Cambio"
+#: src/file_mp3ogg_conv.c:348
+msgid "Error from SOX !"
+msgstr "Error, ya que SOX !"
 
-#: src/file_mp3ogg_conv.c:379
+#: src/file_mp3ogg_conv.c:432
 #, c-format
-msgid " ATTENTION: Il faut installer %s%s%s"
+msgid " WARNING : you need to install %s%s%s"
 msgstr " ATTENTION: Il faut installer %s%s%s"
 
-#: src/file_mp3ogg_conv.c:387
+#: src/file_mp3ogg_conv.c:440
 #, c-format
-msgid " ATTENTION: Il faut installer %s%s"
+msgid " WARNING : you need to install %s%s"
 msgstr " ATTENTION: Il faut installer %s%s"
 
-#: src/file_mp3ogg_conv.c:394
+#: src/file_mp3ogg_conv.c:447
 #, c-format
-msgid " ATTENTION: Il faut installer %s"
+msgid " WARNING : you need to install %s"
 msgstr " ATTENTION: Il faut installer %s"
 
-#: src/file_mp3ogg_conv.c:400
+#: src/file_mp3ogg_conv.c:454
 msgid "Package NOT FOUND !"
 msgstr "Package NOT FOUND !"
 
-#: src/fileselect.c:116
-msgid "Choix d'un dossier de destination"
+#: src/fileselect.c:105
+msgid "Choosing a destination folder"
 msgstr "Elegir una carpeta de destino"
 
-#: src/fileselect.c:117
-msgid "Choix d'un fichier CUE WAV FLAC OGG MP3 APE WMA"
+#: src/fileselect.c:106
+msgid "Choosing a file CUE WAV FLAC OGG MP3 APE WMA"
 msgstr "La elección de un archivo CUE WAV OGG APE FLAC MP3 WMA"
 
-#: src/fileselect.c:118
-msgid "Choix d'un fichier musical"
+#: src/fileselect.c:107
+msgid "Choosing a file musical"
 msgstr "Selección de un archivo de música"
 
-#: src/fileselect.c:119
-msgid "Choix d'un fichier"
-msgstr "Al seleccionar un archivo"
+#: src/fileselect.c:108 src/fileselect.c:109
+msgid "Choosing a file"
+msgstr "La elección de un archivo"
 
-#: src/fileselect.c:120
-msgid "Choix de fichiers"
-msgstr "Selección de archivos"
+#: src/fileselect.c:110
+msgid "Choosing a WAV file"
+msgstr "La elección de un archivo WAV"
 
-#: src/fileselect.c:121
-msgid "Choix de fichiers WAV"
-msgstr "Elección de los archivos WAV"
+#: src/fileselect.c:111
+msgid "Choosing a MP3 OGG file"
+msgstr "La elección de un archivo OGG MP3"
 
-#: src/fileselect.c:122
-msgid "Choix de fichiers MP3/OGG"
-msgstr "Seleccione Archivo MP3/OGG"
-
-#: src/fileselect.c:123
-msgid "Choix de fichiers FLAC MPC OGG MP3"
+#: src/fileselect.c:112
+msgid "Choosing a FLAC MPC OGG MP3 file"
 msgstr "Seleccione Archivo MPC OGG FLAC MP3"
 
-#: src/fileselect.c:124
-msgid "Importer des images pour la pochette"
-msgstr "Importación de imágenes para la portada"
+#: src/fileselect.c:113
+msgid "Import pictures for the cover"
+msgstr "Importar imágenes de la cubierta"
+
+#: src/fileselect.c:114
+msgid "Choosing an Image Storage path"
+msgstr "La elección de una ruta de almacenamiento de imágenes"
 
-#: src/fileselect.c:125
-msgid "Choix d'un chemin de stockage des images"
-msgstr "La elección de un camino de almacenamiento de imágenes"
+#: src/fileselect.c:115
+msgid "Choosing a place for backup"
+msgstr "La elección de un lugar para la copia de seguridad"
 
-#: src/fileselect.c:126
-msgid "Choix d'un lieu de sauvegarde"
-msgstr "La elección de un lugar de almacenamiento"
+#: src/fileselect.c:396 src/fileselect.c:415 src/fileselect.c:703
+msgid "Cancel"
+msgstr "Cancel"
 
-#: src/fileselect.c:475 src/fileselect.c:591 src/fileselect.c:599
-#: src/fileselect.c:622
+#: src/fileselect.c:398 src/fileselect.c:417 src/fileselect.c:705
+msgid "Open"
+msgstr "Open"
+
+#: src/fileselect.c:494 src/fileselect.c:617 src/fileselect.c:627
+#: src/fileselect.c:650
 msgid "All Files (*.*)"
 msgstr "All Files (*.*)"
 
-#: src/file_trash.c:368
+#: src/file_trash.c:211
 msgid "Trash files ..."
 msgstr "Trash files ..."
 
-#: src/file_wav.c:629
-msgid "(Click Droit = Menu) / Choix de la frequence"
+#: src/file_wav.c:485
+msgid "(Right Click = Menu) / Select frequency"
 msgstr "(Click Droit = Menu) / Elección de la frecuencia"
 
-#: src/file_wav.c:632
-msgid "(Click Droit = Menu) / Choix du nombre de pistes (voies)"
-msgstr "(Click Droit = Menu) / La elección del número de pistas (tracks)"
+#: src/file_wav.c:488
+msgid "(Right Click = Menu) / Select number of tracks (channels)"
+msgstr "(Right Click = Menu) / Seleccione el número de pistas (canales)"
 
-#: src/file_wav.c:635
-msgid "(Click Droit = Menu) / Choix du codage en nombre de bits"
-msgstr "(Click Droit = Menu) / Elección del número de bits de codificación"
+#: src/file_wav.c:491
+msgid "(Right Click = Menu) / Encoding selection in number of bits"
+msgstr "(Clic derecho = Menú) / selección. Existe el archivo."
 
-#: src/file_wav.c:861
-msgid "Frequence"
+#: src/file_wav.c:739
+msgid "Frequency"
 msgstr "frecuencia"
 
-#: src/file_wav.c:877
-msgid "FREQUENCE"
+#: src/file_wav.c:755
+msgid "FREQUENCY"
 msgstr "FRECUENCIA"
 
-#: src/file_wav.c:891
-msgid "Piste"
-msgstr "Piste"
+#: src/file_wav.c:769
+msgid "Track"
+msgstr "Track"
 
-#: src/file_wav.c:907
-msgid "PISTE"
-msgstr "PISTE"
+#: src/file_wav.c:785
+msgid "TRACK"
+msgstr "TRACK"
 
-#: src/file_wav.c:921
+#: src/file_wav.c:799
 msgid "Quantification"
 msgstr "Quantification"
 
-#: src/file_wav.c:937
+#: src/file_wav.c:815
 msgid "QUANTIFICATION"
 msgstr "QUANTIFICATION"
 
-#: src/file_wav_conv.c:265
+#: src/file_wav_conv.c:261
 #, c-format
-msgid "%s Copie fichier: %d%%"
+msgid "%s Copy file: %d%%"
 msgstr "%s copia de archivos: %d%%"
 
-#: src/file_wav_conv.c:275
+#: src/file_wav_conv.c:271
 #, c-format
-msgid "%s Restitution fichier: %d%%"
+msgid "%s Return file: %d%%"
 msgstr "%s Volver archivo: %d%%"
 
-#: src/file_wav_conv.c:285
+#: src/file_wav_conv.c:281
 #, c-format
-msgid "%s Traitement Sox: %d%%"
+msgid "%s Use Sox: %d%%"
 msgstr "%s Traitement Sox: %d%%"
 
-#: src/file_wav_conv.c:302
+#: src/file_wav_conv.c:298
 #, c-format
-msgid "%s Traitement Mplayer: %d%%"
+msgid "%s Use Mplayer: %d%%"
 msgstr "%s Traitement Mplayer: %d%%"
 
-#: src/file_wav_conv.c:349 src/file_wav_conv.c:351
+#: src/file_wav_conv.c:343 src/file_wav_conv.c:345
 msgid "XCFA: Conversions WAV TO WAV"
 msgstr "XCFA: Conversions WAV TO WAV"
 
-#: src/main.c:372
-msgid "= Adressage memoire invalide\n"
-msgstr "= Adressage memoire invalide\n"
-
-#: src/main.c:375
-msgid "= Vous avez probablement trouve un bug dans XCFA\n"
-msgstr "= Vous avez probablement trouve un bug dans XCFA\n"
-
-#: src/main.c:676
-msgid "MODE ADMINISTRATEUR"
+#: src/main.c:644
+msgid "ADMINISTRATOR MODE"
 msgstr "MODE ADMINISTRATEUR"
 
-#: src/main.c:678
-msgid " Vous ne devriez pas utiliser "
-msgstr " Usted no debe usar "
+#: src/main.c:646
+msgid " You should not use "
+msgstr " Usted no debe usar "
 
-#: src/main.c:680
-msgid " XCFA sous ROOT !"
+#: src/main.c:648
+msgid " XCFA under ROOT !"
 msgstr " XCFA como root !"
 
-#: src/options.c:175
-msgid "ERREUR: Lieu de stockage non autorise !"
-msgstr "ERROR: Lugar de almacenamiento no autorizado !"
+#: src/options.c:169
+msgid "ERROR : storage location not permitted !"
+msgstr "ERROR: no se permite la ubicación de almacenamiento!"
 
-#: src/options.c:176
-msgid "Veuillez recommencer."
-msgstr "Por favor, inténtalo de nuevo."
+#: src/options.c:170
+msgid "Please start again."
+msgstr "Por favor, vuelva a empezar."
 
-#: src/options_cd.c:120
-msgid "Pour evaluer les templates, vous devez activer une lecture de cdaudio"
+#: src/options_cd.c:122
+msgid "To assess the templates, you must enable a reading cdaudio"
 msgstr "Para evaluar las plantillas, debe habilitar un cdaudio lectura"
 
-#: src/options_faac.c:101
+#: src/options_faac.c:94
 msgid "Transport Stream (ADTS) - Extension .aac"
 msgstr "Transport Stream (ADTS) - Extension .aac"
 
-#: src/options_faac.c:102
+#: src/options_faac.c:95
 msgid "MPEG-4 File Format (MP4) - Extension .m4a"
 msgstr "MPEG-4 File Format (MP4) - Extension .m4a"
 
-#: src/options_flac.c:72
-msgid "0 (Rapide)"
+#: src/options_flac.c:65
+msgid "0 (Fast)"
 msgstr "0 (Rapide)"
 
-#: src/options_flac.c:80
-msgid "8 (Lent)"
+#: src/options_flac.c:73
+msgid "8 (Low)"
 msgstr "8 (Lent)"
 
-#: src/options_mp3.c:298
-msgid "V0 (meilleure qualite)"
+#: src/options_mp3.c:276
+msgid "V0 (Best quality)"
 msgstr "V0 (meilleure qualite)"
 
-#: src/options_mp3.c:307
-msgid "V9 (moins bonne qualite)"
+#: src/options_mp3.c:285
+msgid "V9 (Poor quality)"
 msgstr "V9 (moins bonne qualite)"
 
-#: src/options_musepack.c:75
+#: src/options_musepack.c:68
 msgid "telephone: lowest quality : 32 .. 48 kbit/s"
 msgstr "telephone: lowest quality : 32 .. 48 kbit/s"
 
-#: src/options_musepack.c:76
+#: src/options_musepack.c:69
 msgid "thumb : low quality/internet : 58 .. 86 kbit/s"
 msgstr "thumb : low quality/internet : 58 .. 86 kbit/s"
 
-#: src/options_musepack.c:77
+#: src/options_musepack.c:70
 msgid "radio : medium (MP3) quality : 112 .. 152 kbit/s"
 msgstr "radio : medium (MP3) quality : 112 .. 152 kbit/s"
 
-#: src/options_musepack.c:78
+#: src/options_musepack.c:71
 msgid "standard : high quality (dflt) : 142 .. 184 kbit/s"
 msgstr "standard : high quality (dflt) : 142 .. 184 kbit/s"
 
-#: src/options_musepack.c:79
+#: src/options_musepack.c:72
 msgid "xtreme : extreme high quality : 168 .. 212 kbit/s"
 msgstr "xtreme : extreme high quality : 168 .. 212 kbit/"
 
-#: src/options_musepack.c:80
+#: src/options_musepack.c:73
 msgid "insane : extreme high quality : 232 .. 268 kbit/s"
 msgstr "insane : extreme high quality : 232 .. 268 kbit/s"
 
-#: src/options_musepack.c:81
+#: src/options_musepack.c:74
 msgid "braindead : extreme high quality : 232 .. 278 kbit/s"
 msgstr "braindead : extreme high quality : 232 .. 278 kbit/s"
 
+#: src/options_oggenc.c:137
+msgid "Quality -1 (Poor quality)"
+msgstr "calidad -1 (Moins bonne qualite)"
+
+#: src/options_oggenc.c:138 src/popup.c:1294
+msgid "Quality 0"
+msgstr "calidad 0"
+
+#: src/options_oggenc.c:139 src/popup.c:1294
+msgid "Quality 1"
+msgstr "calidad 1"
+
+#: src/options_oggenc.c:140 src/popup.c:1294
+msgid "Quality 2"
+msgstr "calidad 2"
+
+#: src/options_oggenc.c:141
+msgid "Quality 3"
+msgstr "calidad 3"
+
+#: src/options_oggenc.c:142 src/popup.c:1295
+msgid "Quality 4"
+msgstr "calidad 4"
+
+#: src/options_oggenc.c:143 src/popup.c:1295
+msgid "Quality 5"
+msgstr "calidad 5"
+
+#: src/options_oggenc.c:144 src/popup.c:1295
+msgid "Quality 6"
+msgstr "calidad 6"
+
+#: src/options_oggenc.c:145 src/popup.c:1295
+msgid "Quality 7"
+msgstr "calidad 7"
+
+#: src/options_oggenc.c:146 src/popup.c:1296
+msgid "Quality 8"
+msgstr "calidad 8"
+
+#: src/options_oggenc.c:147 src/popup.c:1296
+msgid "Quality 9"
+msgstr "calidad 9"
+
 #: src/options_oggenc.c:148
-msgid "Qualite -1 (Moins bonne qualite)"
-msgstr "Qualite -1 (Moins bonne qualite)"
+msgid "Quality 10 (Best quality)"
+msgstr "calidad 10 (Meilleure qualite)"
+
+#: src/options_oggenc.c:176 src/options_wavpack.c:173
+#: src/options_wavpack.c:194 src/options_wavpack.c:215 src/popup.c:1298
+msgid "Yes"
+msgstr "Yes"
+
+#: src/options_oggenc.c:177 src/options_wavpack.c:142
+#: src/options_wavpack.c:172 src/options_wavpack.c:193
+#: src/options_wavpack.c:214 src/options_wavpack.c:233 src/popup.c:1298
+msgid "No"
+msgstr "Nom"
 
-#: src/options_oggenc.c:152
-msgid "Qualite 3"
-msgstr "Qualite 3"
+#: src/options_oggenc.c:196
+msgid "Force mono"
+msgstr "Force mono"
 
-#: src/options_oggenc.c:159
-msgid "Qualite 10 (Meilleure qualite)"
-msgstr "Qualite 10 (Meilleure qualite)"
+#: src/options_oggenc.c:197
+msgid "Stereo"
+msgstr "Stereo"
 
-#: src/options_wavpack.c:105
-msgid "Mode normal"
-msgstr "Mode normal"
+#: src/options_wavpack.c:98
+msgid "Standard"
+msgstr "Standard"
 
-#: src/options_wavpack.c:106
-msgid "Mode rapide de compression"
-msgstr "Mode rapide de compression"
+#: src/options_wavpack.c:99
+msgid "Fast (Faster encode and decode)"
+msgstr "Fast (envío más rápido y recepción)"
 
-#: src/options_wavpack.c:107
-msgid "Bonne qualite de compression"
+#: src/options_wavpack.c:100
+msgid "High quality (Better compression ratio)"
 msgstr "Mode rapide de compression"
 
-#: src/options_wavpack.c:108
-msgid "Meilleure qualite de compression"
-msgstr "Meilleure qualite de compression"
+#: src/options_wavpack.c:101
+msgid "Very high quality (Best compression but slowest)"
+msgstr "Muy alta calidad (mejor compresión, pero más lento)"
 
-#: src/options_wavpack.c:134
+#: src/options_wavpack.c:125
 msgid "stereo left/right"
 msgstr "stereo left/right"
 
-#: src/options_wavpack.c:135
+#: src/options_wavpack.c:126
 msgid "stereo mid/side"
 msgstr "stereo mid/side"
 
-#: src/options_wavpack.c:253
+#: src/options_wavpack.c:234
 msgid "1 (fast / rapide)"
 msgstr "1 (fast / rapide)"
 
-#: src/options_wavpack.c:258
+#: src/options_wavpack.c:239
 msgid "6 (very slow / tres lent)"
 msgstr "6 (very slow / tres lent)"
 
-#: src/play_file.c:112
-msgid "PAS de lecteur audio present"
-msgstr "PAS de lecteur audio present"
+#: src/play_file.c:107
+msgid "NO audio player present"
+msgstr "NO reproductor de audio actual"
 
-#: src/play_file.c:113
-msgid "Veuillez installez un lecteur audio."
-msgstr "Veuillez installez un lecteur audio."
+#: src/play_file.c:108
+msgid "Please install an audio player."
+msgstr "Please, install package [ cdparanoia ]"
 
-#: src/poche_dir.c:436
+#: src/poche_dir.c:433
 msgid ""
 "Utilisez le glisser / deplacer - Effacer une image avec Ctrl + "
 "Click"
@@ -923,660 +857,635 @@
 "Click"
 
 #: src/poche_save.c:117
-msgid "Nom de fichier absent !!"
-msgstr "Nom de fichier absent !!"
+msgid "File name not found !!"
+msgstr "Nombre de archivo no encontrado !!"
 
-#: src/poche_save.c:118 src/poche_web.c:361 src/poche_web.c:382
-msgid "Pour resoudre ce probleme:"
+#: src/poche_save.c:118 src/poche_web.c:323 src/poche_web.c:345
+msgid "To solve this problem :"
 msgstr "Pour resoudre ce probleme:"
 
 #: src/poche_save.c:121
-msgid "Saisissez un nom de fichier sans extention"
-msgstr "Saisissez un nom de fichier sans extention"
-
-#: src/poche_save.c:132
-msgid "Sauvegarde aux formats PDF et PostScript"
-msgstr "Sauvegarde aux formats PDF et PostScript"
+msgid "Enter a file name without extension"
+msgstr "Introduzca un nombre de archivo sin extensión"
 
-#: src/poche_save.c:157
-msgid "Sauvegarde au format PNG"
-msgstr "Sauvegarde au format PNG"
+#: src/poche_save.c:131
+msgid "Saving to PDF"
+msgstr "Guardando en PDF"
 
-#: src/poche_web.c:360
-msgid "Aucun fichier trouve !"
-msgstr "Aucun fichier trouve !"
+#: src/poche_web.c:322
+msgid "No file found !"
+msgstr "Ningún archivo encontrado!"
 
-#: src/poche_web.c:364
-msgid "Modifiez la chaine de recherche et"
-msgstr "Modifiez la chaine de recherche et"
+#: src/poche_web.c:326 src/poche_web.c:348
+msgid "Modify the search parameters and"
+msgstr "Modificar los parámetros de búsqueda y"
 
-#: src/poche_web.c:366 src/poche_web.c:387
-msgid "recommencez."
-msgstr "recommencez."
+#: src/poche_web.c:328 src/poche_web.c:350
+msgid "start again."
+msgstr "empezar de nuevo."
 
-#: src/poche_web.c:381
-msgid "Critere de recherche absent !!"
-msgstr "Critere de recherche absent !!"
+#: src/poche_web.c:344
+msgid "Search criteria away !!"
+msgstr "Criterios de búsqueda de distancia !!"
 
-#: src/poche_web.c:385
-msgid "Saisissez une chaine de recherche et"
-msgstr "Saisissez une chaine de recherche et"
+#: src/poche_web.c:362
+msgid "[Search images files]"
+msgstr "[Buscar archivos de imágenes]"
 
-#: src/poche_web.c:394
-msgid "[Recherche des fichiers images]"
-msgstr "[Recherche des fichiers images]"
-
-#: src/popup.c:87 src/popup.c:106
+#: src/popup.c:81 src/popup.c:100
 msgid " Deselection globale"
 msgstr " Deselection globale"
 
-#: src/popup.c:88 src/popup.c:107 src/popup.c:168
+#: src/popup.c:82 src/popup.c:101 src/popup.c:162
 msgid " Deselection verticale"
 msgstr " Deselection verticale"
 
-#: src/popup.c:89 src/popup.c:108
+#: src/popup.c:83 src/popup.c:102
 msgid " Deselection horizontale"
 msgstr " Deselection horizontale"
 
-#: src/popup.c:90 src/popup.c:93 src/popup.c:109 src/popup.c:112
-#: src/popup.c:126 src/popup.c:139 src/popup.c:153
+#: src/popup.c:84 src/popup.c:87 src/popup.c:103 src/popup.c:106
+#: src/popup.c:120 src/popup.c:133 src/popup.c:147
 msgid " ---"
 msgstr " ---"
 
-#: src/popup.c:91 src/popup.c:110
+#: src/popup.c:85 src/popup.c:104
 msgid " Selection verticale"
 msgstr " Selection verticale"
 
-#: src/popup.c:92 src/popup.c:111
+#: src/popup.c:86 src/popup.c:105
 msgid " Selection Expert verticale"
 msgstr " Selection Expert verticale"
 
-#: src/popup.c:94 src/popup.c:113
+#: src/popup.c:88 src/popup.c:107
 msgid " Selection horizontale"
 msgstr " Selection horizontale"
 
-#: src/popup.c:95 src/popup.c:114
+#: src/popup.c:89 src/popup.c:108
 msgid " Selection Expert horizontale "
 msgstr " Selection Expert horizontale "
 
-#: src/popup.c:125 src/popup.c:138
+#: src/popup.c:119 src/popup.c:132
 msgid " Deselection verticale "
 msgstr " Deselection verticale "
 
-#: src/popup.c:127 src/popup.c:140
+#: src/popup.c:121 src/popup.c:134
 msgid " Selection verticale "
 msgstr " Selection verticale "
 
-#: src/popup.c:151
+#: src/popup.c:145
 msgid "---SELECTION VERTICALE-----"
 msgstr "---SELECTION VERTICALE-----"
 
-#: src/popup.c:152
+#: src/popup.c:146
 msgid " Deselection verticale "
 msgstr " Deselection verticale "
 
-#: src/popup.c:154
+#: src/popup.c:148
 msgid " Selection PISTE "
 msgstr " Selection PISTE "
 
-#: src/popup.c:155
+#: src/popup.c:149
 msgid " Selection ALBUM "
 msgstr " Selection ALBUM "
 
-#: src/popup.c:156
+#: src/popup.c:150
 msgid " Selection NETTOYER "
 msgstr " Selection NETTOYER "
 
-#: src/popup.c:167
+#: src/popup.c:161
 msgid "---MENU TRASH--------------"
 msgstr "---MENU TRASH--------------"
 
-#: src/popup.c:169
+#: src/popup.c:163
 msgid " Selection verticale "
 msgstr " Selection verticale "
 
-#: src/popup.c:544 src/popup.c:752 src/popup.c:968
-msgid "Cellule"
-msgstr "Cellule"
-
-#: src/popup.c:551 src/popup.c:577
-msgid "1 piste"
-msgstr "1 piste"
-
-#: src/popup.c:554 src/popup.c:580
-msgid "2 pistes"
-msgstr "2 pistes"
-
-#: src/popup.c:557 src/popup.c:583
-msgid "4 pistes"
-msgstr "4 pistes"
-
-#: src/popup.c:560 src/popup.c:586
-msgid "6 pistes"
-msgstr "6 pistes"
-
-#: src/popup.c:566 src/popup.c:592 src/popup.c:786 src/popup.c:824
-#: src/popup.c:993 src/popup.c:1023
-msgid "Valeur d'origine"
-msgstr "Valeur d'origine"
-
-#: src/popup.c:570 src/popup.c:790 src/popup.c:997
-msgid "Colonne"
-msgstr "Colonne"
-
-#: src/popup.c:759 src/popup.c:797
-msgid " 8000 Hertz"
-msgstr " 8000 Hertz"
+#: src/popup.c:504 src/popup.c:619 src/popup.c:715
+msgid "Original value"
+msgstr "valor original"
 
-#: src/popup.c:762 src/popup.c:800
-msgid "22000 Hertz"
-msgstr "22000 Hertz"
-
-#: src/popup.c:765 src/popup.c:803
-msgid "32000 Hertz"
-msgstr "32000 Hertz"
-
-#: src/popup.c:768 src/popup.c:806
-msgid "44056 Hertz"
-msgstr "44056 Hertz"
-
-#: src/popup.c:771 src/popup.c:809
-msgid "44100 Hertz"
-msgstr "44100 Hertz"
-
-#: src/popup.c:774 src/popup.c:812
-msgid "48000 Hertz"
-msgstr "48000 Hertz"
-
-#: src/popup.c:777 src/popup.c:815
-msgid "88200 Hertz"
-msgstr "88200 Hertz"
-
-#: src/popup.c:780 src/popup.c:818
-msgid "96000 Hertz"
-msgstr "96000 Hertz"
-
-#: src/popup.c:975 src/popup.c:1004
-msgid " 8 bits"
-msgstr " 8 bits"
-
-#: src/popup.c:978 src/popup.c:1008
-msgid "16 bits"
-msgstr "16 bits"
-
-#: src/popup.c:981 src/popup.c:1011
-msgid "24 bits"
-msgstr "24 bits"
-
-#: src/popup.c:984 src/popup.c:1014
-msgid "32 bits"
-msgstr "32 bits"
-
-#: src/popup.c:987 src/popup.c:1017
-msgid "64 bits"
-msgstr "64 bits"
-
-#: src/popup.c:1089
-msgid "Selecteur suivant"
-msgstr "Selecteur suivant"
+#: src/popup.c:765
+msgid "Next selector"
+msgstr "Índice de lectura"
 
-#: src/popup.c:1093
-msgid "Selecteur precedant"
-msgstr "Selecteur precedant"
+#: src/popup.c:769
+msgid "Previous selector"
+msgstr "selector Anterior"
 
-#: src/popup.c:1101
-msgid "Supprimer la plage active"
-msgstr "Supprimer la plage active"
+#: src/popup.c:777
+msgid "Delete the active range"
+msgstr "Eliminar el rango activo"
 
-#: src/popup.c:1173
-msgid "Retourner horizontalement"
-msgstr "Retourner horizontalement"
+#: src/popup.c:850
+msgid "Flip Horizontal"
+msgstr " Selection horizontale"
 
-#: src/popup.c:1177
-msgid "Retourner verticalement"
-msgstr "Retourner verticalement"
+#: src/popup.c:854
+msgid "Flip Vertical"
+msgstr "voltear vertical"
 
-#: src/popup.c:1185
-msgid "Image au premier plan"
-msgstr "Image au premier plan"
+#: src/popup.c:862
+msgid "Foreground image"
+msgstr "imagen en primer plano"
 
-#: src/popup.c:1189
-msgid "Image au dessus"
+#: src/popup.c:866
+msgid "Image above"
 msgstr "Image au dessus"
 
-#: src/popup.c:1193
-msgid "Image en dessous"
-msgstr "Image en dessous"
+#: src/popup.c:870
+msgid "Image below"
+msgstr "imagen de abajo"
 
-#: src/popup.c:1197
-msgid "Image au dernier plan"
-msgstr "Image au dernier plan"
+#: src/popup.c:874
+msgid "Image to the background"
+msgstr "Imagen para el fondo"
 
-#: src/popup.c:1205
-msgid "Effacer l'image"
+#: src/popup.c:882
+msgid "Clear image"
 msgstr "Effacer l'image"
 
-#: src/popup.c:1242
-msgid "Supprimer l'image de la liste"
-msgstr "Supprimer l'image de la liste"
+#: src/popup.c:920
+msgid "Remove image from the list"
+msgstr "Eliminar imagen de la lista"
 
-#: src/popup_systray.c:127
-msgid " Cacher Xcfa "
-msgstr " Cacher Xcfa "
+#: src/popup.c:1111
+msgid "V0 [ best quality ]"
+msgstr "V0 (meilleure qualite)"
 
-#: src/popup_systray.c:130
-msgid " Montrer Xcfa "
-msgstr " Montrer Xcfa "
+#: src/popup.c:1111 src/popup.c:1114
+msgid "V4 [ default ]"
+msgstr "V4 [ defaut ]"
 
-#: src/popup_systray.c:150
-msgid " Quitter Xcfa "
-msgstr " Quitter Xcfa "
+#: src/popup.c:1111
+msgid "V9 [ Lower quality ]"
+msgstr "V9 [ moins bonne qualite ]"
 
-#: src/popup_systray.c:201
-msgid ""
-"XCFA\n"
-"Programme pour convertir les fichiers audio."
-msgstr ""
-"XCFA\n"
-"Programme pour convertir les fichiers audio."
+#: src/popup.c:1294
+msgid "Quality -1 [ Lower quality ]"
+msgstr "Qualite -1 (Moins bonne qualite)"
+
+#: src/popup.c:1295
+msgid "Quality 3 [ Defaut ]"
+msgstr "Qualite 3 [ Defaut ]"
+
+#: src/popup.c:1296
+msgid "Quality 10 [ Best Quality ]"
+msgstr "Qualite 10 (Meilleure qualite)"
 
-#: src/prg_init.c:90
+#: src/prg_init.c:85
 msgid " Decode ATSC A/52 audio streams"
 msgstr " Decode ATSC A/52 audio streams"
 
-#: src/prg_init.c:101
+#: src/prg_init.c:96
 msgid " AAC+ encoder"
 msgstr " AAC+ encoder"
 
-#: src/prg_init.c:112 src/prg_init.c:178
+#: src/prg_init.c:107 src/prg_init.c:173
 msgid " Extracteur cd audio"
 msgstr " Extracteur cd audio"
 
-#: src/prg_init.c:123
+#: src/prg_init.c:118
 msgid " Read CD and get CDDB discid information"
 msgstr " Read CD and get CDDB discid information"
 
-#: src/prg_init.c:134
+#: src/prg_init.c:129
 msgid " Cherche des renseignements sur les formats mp3"
 msgstr " Cherche des renseignements sur les formats mp3"
 
-#: src/prg_init.c:145
+#: src/prg_init.c:140
 msgid " Audio Codeur freeware"
 msgstr " Audio Codeur freeware"
 
-#: src/prg_init.c:156
+#: src/prg_init.c:151
 msgid " MPEG-4 AAC decodeur"
 msgstr " MPEG-4 AAC decodeur"
 
-#: src/prg_init.c:167
+#: src/prg_init.c:162
 msgid " Conversion wav : flac"
 msgstr " Conversion wav : flac"
 
-#: src/prg_init.c:189
+#: src/prg_init.c:184
 msgid " Conversion wav : mp3"
 msgstr " Conversion wav : mp3"
 
-#: src/prg_init.c:200
+#: src/prg_init.c:195
 msgid " Cherche les informations d'un dvd"
 msgstr " Cherche les informations d'un dvd"
 
-#: src/prg_init.c:212
+#: src/prg_init.c:207
 msgid " Monkey's Audio Console Front End : APE"
 msgstr " Monkey's Audio Console Front End : APE"
 
-#: src/prg_init.c:224 src/prg_init.c:235
+#: src/prg_init.c:219 src/prg_init.c:230
 msgid " MusePack commandline utilities"
 msgstr " MusePack commandline utilities"
 
-#: src/prg_init.c:246
+#: src/prg_init.c:241
 msgid " Lecteur et extracteur"
 msgstr " Lecteur et extracteur"
 
-#: src/prg_init.c:257
+#: src/prg_init.c:252
 msgid " Normaliseur de fichier mp3"
 msgstr " Normaliseur de fichier mp3"
 
-#: src/prg_init.c:268
+#: src/prg_init.c:263
 msgid " Normaliseur de fichier wav"
 msgstr " Normaliseur de fichier wav"
 
-#: src/prg_init.c:279
+#: src/prg_init.c:274
 msgid " A program to send desktop notifications"
 msgstr " A program to send desktop notifications"
 
-#: src/prg_init.c:290
+#: src/prg_init.c:285
 msgid " Forte compression au format wave"
 msgstr " Forte compression au format wave"
 
-#: src/prg_init.c:301
+#: src/prg_init.c:296
 msgid " Decoupage de fichiers sans decodage"
 msgstr " Decoupage de fichiers sans decodage"
 
-#: src/prg_init.c:312
+#: src/prg_init.c:307
 msgid " Transformation universelle de fichiers son"
 msgstr " Transformation universelle de fichiers son"
 
-#: src/prg_init.c:323
+#: src/prg_init.c:318
 msgid " Conversion wav : ogg"
 msgstr " Conversion wav : ogg"
 
-#: src/prg_init.c:334
+#: src/prg_init.c:329
 msgid " Normaliseur de fichier ogg"
 msgstr " Normaliseur de fichier ogg"
 
-#: src/prg_init.c:345
+#: src/prg_init.c:340
 msgid " WAVPACK Hybrid Lossless Audio Compressor"
 msgstr " WAVPACK Hybrid Lossless Audio Compressor"
 
-#: src/prg_init.c:362
-msgid " ... les paquets: deb "
+#: src/prg_init.c:357
+msgid " ... Packets: deb "
 msgstr " ... les paquets: deb "
 
-#: src/prg_init.c:368
-msgid " ... les paquets: tgz "
+#: src/prg_init.c:363
+msgid " ... Packets: tgz "
 msgstr " ... les paquets: tgz "
 
-#: src/prg_init.c:374
-msgid " ... les paquets: fpm "
+#: src/prg_init.c:369
+msgid " ... Packets: fpm "
 msgstr " ... les paquets: fpm "
 
-#: src/prg_init.c:380
-msgid " ... les paquets: rpm "
+#: src/prg_init.c:375
+msgid " ... Packets: rpm "
 msgstr " ... les paquets: rpm "
 
-#: src/prg_init.c:386
-msgid " ... les paquets: pkg.tar.xz "
+#: src/prg_init.c:381
+msgid " ... Packets: pkg.tar.xz "
 msgstr " ... les paquets: pkg.tar.xz "
 
-#: src/prg_init.c:392
-msgid " ... les paquets: ? "
+#: src/prg_init.c:387
+msgid " ... Packets: ? "
 msgstr " ... les paquets: ? "
 
-#: src/prg_init.c:628
+#: src/prg_init.c:623
 msgid "Status"
 msgstr "Status"
 
-#: src/prg_init.c:642
-msgid "Paquet"
-msgstr "Paquet"
+#: src/prg_init.c:637
+msgid "Packets"
+msgstr "Packets"
 
-#: src/prg_init.c:657
+#: src/prg_init.c:652
 msgid "Action"
 msgstr "Action"
 
-#: src/scan.c:260
-msgid "PACKAGE dvd+rw-tools ABSENT"
+#: src/scan.c:259
+msgid "PACKAGE dvd+rw-tools is missing"
 msgstr "PACKAGE dvd+rw-tools ABSENT"
 
-#: src/scan.c:261
-msgid "Le package 'dvd+rw-tools' est absent"
-msgstr "Le package 'dvd+rw-tools' est absent"
+#: src/scan.c:260
+msgid "The package 'imagemagick' is missing"
+msgstr "El paquete 'imagemagick' falta"
 
-#: src/scan.c:263
-msgid "de votre systeme !"
+#: src/scan.c:262
+msgid "on your system !"
 msgstr "de votre systeme !"
 
-#: src/scan.c:265
-msgid "Veuillez l'installer car j'ai besoin de"
-msgstr "Veuillez l'installer car j'ai besoin de"
+#: src/scan.c:264 src/split.c:438
+msgid "Please install it and resume"
+msgstr "Instálelo y reanudar"
 
-#: src/scan.c:267
-msgid "'dvd+rw-mediainfo' pour identifier le(s)"
+#: src/scan.c:266
+msgid "'Dvd + rw-mediainfo' to identify the"
 msgstr "'dvd+rw-mediainfo' pour identifier le(s)"
 
-#: src/scan.c:269
-msgid "lecteur(s) de cd / dvd."
+#: src/scan.c:268
+msgid "reader of cd / dvd."
 msgstr "lecteur(s) de cd / dvd."
 
-#: src/split.c:284
+#: src/split.c:297
 msgid ""
-"Menu: Click droit / Ajout plage: Click bouton centre / Zoom: Ctrl+Scroll"
+"Menu: right click / Adding track: Click the center button / Zoom: Ctrl"
+"+Scroll"
 msgstr ""
 "Menu: Click droit / Ajout plage: Click bouton centre / Zoom: Ctrl+Scroll"
 
-#: src/split.c:287
-msgid "Ajout plage: Click bouton centre / Zoom: Ctrl+Scroll"
+#: src/split.c:300
+msgid "Adding track: Click the center button / Zoom: Ctrl+Scroll"
 msgstr "Ajout plage: Click bouton centre / Zoom: Ctrl+Scroll"
 
-#: src/split.c:291
-msgid ""
-"Pret pour l'import d'un fichier CUE, WAV, FLAC, OGG, MP3, APE, WMA"
+#: src/split.c:304
+msgid "Ready for imports and a CUE file, WAV, FLAC, OGG, MP3, APE, WMA"
 msgstr ""
 "Pret pour l'import d'un fichier CUE, WAV, FLAC, OGG, MP3, APE, WMA"
 
-#: src/split.c:360 src/split.c:387
-msgid "Ce fichier appartient a XCFA"
-msgstr "Ce fichier appartient a XCFA"
+#: src/split.c:378 src/split.c:407
+msgid "This file belongs XCFA"
+msgstr "Este archivo corresponde XCFA"
 
-#: src/split.c:361 src/split.c:388
-msgid "Selectionnez un autre fichier."
+#: src/split.c:379 src/split.c:408
+msgid "Select another file."
 msgstr "Selectionnez un autre fichier."
 
-#: src/split.c:368
-msgid "Fichier vide"
-msgstr "Fichier vide"
+#: src/split.c:387
+msgid "Empty file"
+msgstr "archivo vacío"
 
-#: src/split.c:369
-msgid "Le fichier ne contient aucune donnee !!!"
-msgstr "Le fichier ne contient aucune donnee !!!"
+#: src/split.c:388
+msgid "The file contains no data !!!"
+msgstr "El archivo no contiene datos !!!"
 
-#: src/split.c:412
-msgid "Sox et Mplayer absents"
+#: src/split.c:433
+msgid "Sox and Mplayer not found"
 msgstr "Sox et Mplayer absents"
 
-#: src/split.c:413
-msgid "Sox et Mplayer sont absents de votre"
-msgstr "Sox et Mplayer sont absents de votre"
+#: src/split.c:434
+msgid "Sox et Mplayer are not found"
+msgstr "Sox et Mplayer absents"
 
-#: src/split.c:415
-msgid "configuration."
+#: src/split.c:436
+msgid "in your configuration."
 msgstr "configuration."
 
-#: src/split.c:417
-msgid "Veuillez les installer pour pouvoir continuer."
-msgstr "Veuillez les installer pour pouvoir continuer."
-
-#: src/split.c:467
-msgid "Erreur de choix de fichier"
-msgstr "Erreur de choix de fichier"
+#: src/split.c:492
+msgid "Error file select"
+msgstr "Erreur de lecture !"
 
-#: src/split.c:468
-msgid "Veuillez selectionner un fichier de type WAV FLAC MP3 OGG APE"
-msgstr "Veuillez selectionner un fichier de type WAV FLAC MP3 OGG APE"
+#: src/split.c:493
+msgid "Please select a file type of MP3 WAV OGG FLAC APE"
+msgstr "Por favor, seleccione un tipo de archivo de WAV MP3 OGG FLAC APE"
 
-#: src/split.c:504 src/split.c:577
-msgid "Mauvais type de fichier"
-msgstr "Mauvais type de fichier"
+#: src/split.c:531 src/split.c:603
+msgid "Wrong type of file"
+msgstr "Tipo incorrecto de archivo"
 
-#: src/split.c:505 src/split.c:578
+#: src/split.c:532 src/split.c:604
 msgid ""
-"Les types de fichiers acceptes\n"
-"sont: WAV FLAC MP3 OGG APE WMA CUE"
+"File types accepted\n"
+"sare: WAV FLAC MP3 OGG APE WMA CUE"
 msgstr ""
 "Les types de fichiers acceptes\n"
 "sont: WAV FLAC MP3 OGG APE WMA CUE"
 
-#: src/split_conv.c:312 src/split_conv.c:328
-msgid "Erreur SOX"
-msgstr "Erreur SOX"
+#: src/split_conv.c:316 src/split_conv.c:333
+msgid "SOX Error"
+msgstr "SOX Error"
 
-#: src/split_conv.c:313 src/split_conv.c:329
-msgid "Le programme SOX de votre distribution"
+#: src/split_conv.c:317 src/split_conv.c:334
+msgid "The SOX program on your distribution"
 msgstr "Le programme SOX de votre distribution"
 
-#: src/split_conv.c:315 src/split_conv.c:331
-msgid "a generer une erreur pendant la conversion."
+#: src/split_conv.c:319 src/split_conv.c:336
+msgid "has generated an error during conversion."
 msgstr "a generer une erreur pendant la conversion."
 
-#: src/split_cue.c:121
-msgid "Erreur de lecture !"
-msgstr "Erreur de lecture !"
+#: src/split_cue.c:116
+msgid "Misreading !"
+msgstr "Leer mal!"
 
-#: src/split_cue.c:181 src/split_cue.c:190 src/split_cue.c:199
-msgid "Erreur"
-msgstr "Erreur"
+#: src/split_cue.c:177 src/split_cue.c:187 src/split_cue.c:196
+msgid "Error"
+msgstr "Error"
 
-#: src/split_cue.c:182
-msgid "Aucun fichier de musique associe au cue-file !"
-msgstr "No hay archivo de música asociado con cue-file !"
+#: src/split_cue.c:178
+msgid "No music file associated with the cue-file"
+msgstr "No archivo de música asociada con el archivo cue"
 
-#: src/split_cue.c:191
-msgid "Pas de fichier WAV dans le cue-file !"
-msgstr "No WAV en el cue-file !"
+#: src/split_cue.c:188
+msgid "No WAV file in the cue-file"
+msgstr "No hay archivo WAV en el archivo cue"
 
-#: src/split_cue.c:200
-msgid "Aucun fichier de musique associe dans le dossier"
-msgstr "No hay archivos de música en la carpeta asociada"
+#: src/split_cue.c:197
+msgid "No music file in the folder associated"
+msgstr "No archivo de música en la carpeta asociada"
 
-#: src/split_cue.c:202
-msgid "du cue-file"
+#: src/split_cue.c:199
+msgid "of cue-file"
 msgstr "la bola de archivo"
 
-#: src/split_cue.c:288
-msgid "Erreur de donnees dans le fichier CUE"
-msgstr "Errores de datos en el archivo CUE"
+#: src/split_cue.c:293
+msgid "Data errors in the CUE file"
+msgstr "Los errores de datos en el archivo CUE"
 
-#: src/split_cue.c:289
-msgid "La solution est d'importer le fichier de"
+#: src/split_cue.c:294
+msgid "The solution is to import the file"
 msgstr "La solución es importar el archivo"
 
-#: src/split_cue.c:291
-msgid "musique qui sera reconnu et pre-decoupe"
-msgstr "de música que será reconocido y pre-corte"
+#: src/split_cue.c:296
+msgid "music that will be recognized and pre-cutting"
+msgstr "música que será reconocido y precorte"
 
-#: src/split_cue.c:293
-msgid "dans le module Split."
-msgstr "en el Split."
+#: src/split_cue.c:298
+msgid "in the split module."
+msgstr "en el módulo de división."
 
-#: src/split_cue.c:295
-msgid "Il ne restera qu'a ajuster les plages pour"
-msgstr "Simplemente se ajustará a las playas"
+#: src/split_cue.c:300
+msgid "We will just adjust to the beaches"
+msgstr "No hacemos más que ajustarse a las playas"
 
-#: src/split_cue.c:297
-msgid "generer un nouveau cue-file ou des decoupes"
+#: src/split_cue.c:302
+msgid "generate a new cue-file or cuts"
 msgstr "generar una nueva señal de archivos o cortes"
 
-#: src/split_cue.c:299
-msgid "correspondant aux plages."
+#: src/split_cue.c:304
+msgid "corresponding to the beaches."
 msgstr "correspondientes a las playas."
 
-#: src/split_selector.c:141
-msgid "Suppression pendant la lecture impossible"
-msgstr "Eliminar no durante la reproducción"
+#: src/split_selector.c:136
+msgid "Deleting not during playback"
+msgstr "Eliminación no durante la reproducción"
 
-#: src/split_selector.c:234 src/split_selector.c:240 src/split_selector.c:294
-#: src/split_selector.c:300 src/split_selector.c:357 src/split_selector.c:364
-#: src/split_selector.c:434 src/split_selector.c:440
-msgid "Temps inferieur a 5 secondes entre marqueur et curseur !"
+#: src/split_selector.c:231 src/split_selector.c:237 src/split_selector.c:291
+#: src/split_selector.c:297 src/split_selector.c:354 src/split_selector.c:361
+#: src/split_selector.c:431 src/split_selector.c:437
+msgid "Time of less than 5 seconds between marker and cursor !"
 msgstr "Tiempo inferior a 5 segundos entre el marcador y el cursor !"
 
-#: src/translate.c:55
-msgid "Fichier"
-msgstr "Fichier"
+#: src/web.c:173 src/web.c:221
+msgid "No web browser"
+msgstr "No navegador web"
+
+#: src/web.c:174 src/web.c:222
+msgid "No Web access: no web browser"
+msgstr "No hay acceso a Internet: no hay ningún navegador web"
+
+#: src/web.c:176 src/web.c:224
+msgid "found in your system."
+msgstr "que se encuentra en su sistema."
+
+#: src/web.c:178 src/web.c:226
+msgid "Please install a web browser."
+msgstr "Please, install package [ icedax ]"
+
+#: src/web.c:188
+msgid "You need to enable web access"
+msgstr "Es necesario activar el acceso web"
+
+#: src/web.c:236
+msgid "Application is missing."
+msgstr "La aplicación no se encuentra."
+
+#: src/web.c:237
+msgid "Please install : "
+msgstr "Por favor, instale : "
+
+#: src/win_about.c:124
+msgid " Xcfa on the web"
+msgstr " Xcfa web"
+
+#: src/win_about.c:174
+msgid ""
+"\n"
+"Au tout debut:\n"
+"\n"
+"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
+"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
+"... ;-)\n"
+"\n"
+""
+msgstr ""
+"\n"
+"En el comienzo:\n"
+"\n"
+"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
+"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
+"... ;-)\n"
+"\n"
+""
+
+#: src/win_scan.c:170
+msgid "Waiting ..."
+msgstr "Espera ..."
+
+#: glade/xcfa.glade:66 glade/xcfa.glade:2533
+msgid "File"
+msgstr "File"
 
-#: src/translate.c:56
-msgid "Quitter"
+#: glade/xcfa.glade:75
+msgid "Quit"
 msgstr "Dejar"
 
-#: src/translate.c:57
-msgid "Outils"
-msgstr "Instrumentos"
+#: glade/xcfa.glade:89
+msgid "Tools"
+msgstr "Tools"
 
-#: src/translate.c:58
-msgid "Visibilite des champs"
+#: glade/xcfa.glade:99
+msgid "Visibility fields"
 msgstr "Campos de la visibilidad"
 
-#: src/translate.c:59
-msgid "Aide"
-msgstr "Ayuda"
+#: glade/xcfa.glade:112
+msgid "Help"
+msgstr "Help"
 
-#: src/translate.c:60
-msgid "A propos"
-msgstr "A propos"
+#: glade/xcfa.glade:121
+msgid "About"
+msgstr "About"
 
-#: src/translate.c:61 src/translate.c:71
-msgid "Lecture"
-msgstr "Lecture"
+#: glade/xcfa.glade:224
+msgid "Read"
+msgstr "Read"
 
-#: src/translate.c:62
-msgid " Choix du peripherique / Lecture du DVD "
+#: glade/xcfa.glade:252
+msgid " Choosing the peripheral / DVD playback "
 msgstr ""
 " Seleccionar el dispositivo de comunicación / Reproducción de DV "
 
-#: src/translate.c:63 src/translate.c:73 src/translate.c:134
-msgid " Destination des fichiers "
-msgstr " Destino de archivo "
+#: glade/xcfa.glade:303 glade/xcfa.glade:921
+msgid " File Destination "
+msgstr " Instalación "
 
-#: src/translate.c:64 src/translate.c:74
+#: glade/xcfa.glade:359 glade/xcfa.glade:1009
 msgid " Eject "
 msgstr " Eject "
 
-#: src/translate.c:65 src/translate.c:96
-msgid " Normaliser "
+#: glade/xcfa.glade:434
+msgid " Normalize "
 msgstr " Normaliser </b"
 
-#: src/translate.c:66
-msgid "Deplier"
-msgstr "Deplier"
+#: glade/xcfa.glade:494
+msgid "Unfold"
+msgstr "Unfold"
 
-#: src/translate.c:67
-msgid "Replier"
-msgstr "Replier"
+#: glade/xcfa.glade:548
+msgid "Fold"
+msgstr "Fold"
 
-#: src/translate.c:68
+#: glade/xcfa.glade:649
 msgid " Vers 2CH: Sub / Ambiance "
 msgstr " Vers 2CH: Sub / Ambiance "
 
-#: src/translate.c:69 src/translate.c:102
-msgid "Extraire"
-msgstr "Extraer"
+#: glade/xcfa.glade:705
+msgid "Extraction"
+msgstr "XCFA: Extracción de CD"
 
-#: src/translate.c:70
+#: glade/xcfa.glade:756
 msgid " DVD "
 msgstr " DVD "
 
-#: src/translate.c:72
-msgid " Choix du peripherique / Lecture du CD "
+#: glade/xcfa.glade:842
+msgid "Lecture"
+msgstr "Lecture"
+
+#: glade/xcfa.glade:870
+msgid " Choosing the peripheral / CD playback "
 msgstr ""
 " Seleccionar el dispositivo de comunicación / Reproducción de CD "
 
-#: src/translate.c:75
-msgid "Titre:"
+#: glade/xcfa.glade:1065
+msgid "Title:"
 msgstr "Titre:"
 
-#: src/translate.c:76
+#: glade/xcfa.glade:1077
 msgid "Album:"
 msgstr "Album:"
 
-#: src/translate.c:77
-msgid "Artiste:"
+#: glade/xcfa.glade:1089
+msgid "Artist:"
 msgstr "Artiste:"
 
-#: src/translate.c:78
-msgid " Annee:"
-msgstr " Annee:"
+#: glade/xcfa.glade:1101
+msgid "Comment:"
+msgstr "Comentario:"
+
+#: glade/xcfa.glade:1113
+msgid " Year:"
+msgstr " Genre:"
 
-#: src/translate.c:79
+#: glade/xcfa.glade:1125
 msgid " Genre:"
 msgstr " Genre:"
 
-#: src/translate.c:80
-msgid " Piste:"
-msgstr " Pista:"
+#: glade/xcfa.glade:1137
+msgid " Track:"
+msgstr "Titre:"
 
-#: src/translate.c:81
+#: glade/xcfa.glade:1149
 msgid " *.m3u et xspf: "
 msgstr " *.m3u et xspf: "
 
-#: src/translate.c:82
-msgid "Commentaire:"
-msgstr "Comentario:"
-
-#: src/translate.c:83
-msgid " Modification des tags Freedb "
+#: glade/xcfa.glade:1287
+msgid "Editing tags Freedb"
 msgstr " Cambio de etiquetas de freedb "
 
-#: src/translate.c:84
+#: glade/xcfa.glade:1302
 msgid ""
 "%a [ %a=\"Artist\" ]\n"
 "\n"
@@ -1602,7 +1511,7 @@
 "le ou les caracteres devant etre conserves doivent etre precedes par le "
 "caractere %"
 
-#: src/translate.c:85
+#: glade/xcfa.glade:1312
 msgid ""
 "%a - artiste %b - titre "
 "de l'album %c - numero de la piste\n"
@@ -1622,427 +1531,435 @@
 "%u - remplacement de caracteres: %u(AB=C) %u( =_) %Tl</"
 "b> - Tetsumaki lower"
 
-#: src/translate.c:86
-msgid " Arrangement des titres du CD "
+#: glade/xcfa.glade:1346
+msgid " Arrangement of CD titles"
 msgstr " Disposición de las pistas del CD "
 
-#: src/translate.c:87
-msgid "Creation d'un fichier unique au format: "
+#: glade/xcfa.glade:1382
+msgid "Creation of a single file format: "
 msgstr "Creación de un solo formato de archivo: "
 
-#: src/translate.c:88
-msgid " et dont le nom sera: "
-msgstr " y cuyo nombre se: "
+#: glade/xcfa.glade:1430
+msgid " and whose name will be: "
+msgstr " y cuyo nombre será:"
 
-#: src/translate.c:89
-msgid "Ecriture du fichier cue"
+#: glade/xcfa.glade:1461
+msgid "Writing the cue file"
 msgstr "Escribir el archivo cue"
 
-#: src/translate.c:90
-msgid " Au moins deux selections colonne Wav "
+#: glade/xcfa.glade:1484
+msgid " At least two selections column Wav "
 msgstr " Por lo menos dos selecciones de columna Wav "
 
-#: src/translate.c:91
+#: glade/xcfa.glade:1514
 msgid ""
-"Creation d'un fichier cue\n"
-"unique depuis une lecture\n"
-"du cd audio"
+"\n"
+"Creating a cue file from a single\n"
+"reading audio cd\n"
 msgstr ""
-"Creación de un archivo CUE\n"
-"a partir de una sola lectura\n"
-"cd de audio"
+"\n"
+"Creación de un archivo de ejemplo de un solo \n"
+"lectura audio cd \n"
 
-#: src/translate.c:92
-msgid "Creation fichier cue uniquement"
-msgstr "Cue de creación de archivos sólo"
+#: glade/xcfa.glade:1562
+msgid "File Creation cue only"
+msgstr "Sólo archivo Creación cue"
 
-#: src/translate.c:93
+#: glade/xcfa.glade:1597
 msgid " Creation Cue cd "
 msgstr " Creación Cue cd "
 
-#: src/translate.c:94
-msgid " Creation d'un fichier unique "
-msgstr " Creación de un único archivo "
+#: glade/xcfa.glade:1625
+msgid "  Creation of a single file"
+msgstr " La creación de un único archivo"
 
-#: src/translate.c:95
-msgid "Gestion des tags, titres et fichiers cue"
+#: glade/xcfa.glade:1638
+msgid "Management of tags, titles and cue files"
 msgstr "Etiquetas de dirección, títulos, y los archivos cue"
 
-#: src/translate.c:97
+#: glade/xcfa.glade:1688
+msgid " normalize "
+msgstr " Normaliser </b"
+
+#: glade/xcfa.glade:1749
 msgid "definit le serveur a contacter pour les recherches titre"
 msgstr ""
 "Define el servidor de ponerse en contacto con por el título de la "
 "investigación"
 
-#: src/translate.c:98
+#: glade/xcfa.glade:1788
 msgid "Parametres par defaut"
 msgstr "Ajustes por defecto"
 
-#: src/translate.c:100
-msgid "Choix parmis les differentes bases de donnees pour le CD."
-msgstr "Elección entre diferentes bases de datos para el CD."
-
-#: src/translate.c:101
+#: glade/xcfa.glade:1887
 msgid "DiscId"
 msgstr "DiscId"
 
-#: src/translate.c:103
+#: glade/xcfa.glade:1946
+msgid "Extract"
+msgstr "XCFA: Extracción de CD"
+
+#: glade/xcfa.glade:2053
 msgid " CD "
 msgstr " CD "
 
-#: src/translate.c:104 src/translate.c:133
-msgid " Importer "
+#: glade/xcfa.glade:2135 glade/xcfa.glade:3271
+msgid " Import "
 msgstr " Importación "
 
-#: src/translate.c:105
-msgid " Destination des conversions "
+#: glade/xcfa.glade:2190
+msgid " Destination conversions "
 msgstr " Destination des conversions "
 
-#: src/translate.c:106
-msgid " Nettoyer "
-msgstr " Limpio "
+#: glade/xcfa.glade:2266
+msgid " Clean up "
+msgstr " Creación Cue cd "
 
-#: src/translate.c:107 src/translate.c:114
+#: glade/xcfa.glade:2389
 msgid "Appliquer les modifications"
 msgstr "Aplicar los cambios"
 
-#: src/translate.c:108
-msgid " Normalise: "
+#: glade/xcfa.glade:2444
+msgid " Normalize: "
 msgstr " Normalise: "
 
-#: src/translate.c:109
-msgid " Choix niveau dBFS: "
-msgstr " Choix niveau dBFS: "
-
-#: src/translate.c:110 src/translate.c:132
-msgid " Fichiers "
-msgstr " Fichiers "
-
-#: src/translate.c:111
-msgid "Quantification"
-msgstr "Quantification"
+#: glade/xcfa.glade:2477
+msgid " Level selection dBFS: "
+msgstr " Level selection dBFS: "
 
-#: src/translate.c:112
-msgid "Voie"
-msgstr "Voie"
+#: glade/xcfa.glade:2615
+msgid "Apply changes"
+msgstr "aplicar cambios"
 
-#: src/translate.c:113
-msgid " Frequence - Hertz "
-msgstr " Frecuencia - Hertz "
-
-#: src/translate.c:115
+#: glade/xcfa.glade:2651
 msgid " Wav "
 msgstr " Wav "
 
-#: src/translate.c:116 src/translate.c:202
-msgid " Lame (fichier mp3): "
-msgstr " Lame (fichier mp3): "
-
-#: src/translate.c:117 src/translate.c:218
-msgid " Oggenc (fichier ogg): "
-msgstr " Oggenc (fichier ogg): "
-
-#: src/translate.c:118 src/translate.c:130
-msgid "Appliquer"
-msgstr "Aplicar"
+#: glade/xcfa.glade:2735
+msgid "Apply"
+msgstr "Apply"
 
-#: src/translate.c:119
-msgid "Effacer"
-msgstr "Borrar"
+#: glade/xcfa.glade:2789
+msgid "Delete"
+msgstr "Delete"
 
-#: src/translate.c:120
+#: glade/xcfa.glade:2826
 msgid " Mp3-Ogg "
 msgstr " Mp3-Ogg "
 
-#: src/translate.c:121
-msgid "Titre:"
-msgstr "Titre:"
+#: glade/xcfa.glade:2875
+msgid "Title:"
+msgstr "Title:"
 
-#: src/translate.c:122
+#: glade/xcfa.glade:2886
 msgid "Album:"
 msgstr "Album:"
 
-#: src/translate.c:123
-msgid "Artiste:"
+#: glade/xcfa.glade:2897
+msgid "Artist:"
 msgstr "Artiste:"
 
-#: src/translate.c:124
-msgid "Commentaire:"
+#: glade/xcfa.glade:2908
+msgid "Comment:"
 msgstr "Commentaire:"
 
-#: src/translate.c:125
-msgid " Annee:"
-msgstr " Annee:"
+#: glade/xcfa.glade:2919
+msgid " Year:"
+msgstr " Year:"
 
-#: src/translate.c:126
+#: glade/xcfa.glade:2930
 msgid " Genre:"
 msgstr " Genre:"
 
-#: src/translate.c:127
-msgid " Piste:"
-msgstr " Piste:"
+#: glade/xcfa.glade:2941
+msgid " Track:"
+msgstr " Pista:"
 
-#: src/translate.c:128
+#: glade/xcfa.glade:2952
 msgid " Modif.:"
 msgstr " Modif.:"
 
-#: src/translate.c:129
+#: glade/xcfa.glade:3078
 msgid "0"
 msgstr "0"
 
-#: src/translate.c:131 src/translate.c:315
+#: glade/xcfa.glade:3102
+msgid "Apply "
+msgstr "Aplicar"
+
+#: glade/xcfa.glade:3160 glade/xcfa.glade:10210
 msgid " Tags "
 msgstr " Tags "
 
-#: src/translate.c:135
+#: glade/xcfa.glade:3190
+msgid " Files "
+msgstr "All Files (*.*)"
+
+#: glade/xcfa.glade:3322
+msgid "   File Destination "
+msgstr " Destino de archivo "
+
+#: glade/xcfa.glade:3494
 msgid "Lecture de 5 secondes apres le marqueur de debut"
 msgstr "5 segundos después de la lectura el marcador de inicio"
 
-#: src/translate.c:136
+#: glade/xcfa.glade:3546
 msgid "Index de debut"
 msgstr "Inicio índice"
 
-#: src/translate.c:137 src/translate.c:144 src/translate.c:147
+#: glade/xcfa.glade:3547 glade/xcfa.glade:3813 glade/xcfa.glade:3874
 msgid "00h00m00s"
 msgstr "00h00m00s"
 
-#: src/translate.c:138
+#: glade/xcfa.glade:3600
 msgid "lecture"
 msgstr "lecture"
 
-#: src/translate.c:139
+#: glade/xcfa.glade:3653
 msgid "Pause"
 msgstr "Pause"
 
-#: src/translate.c:140
+#: glade/xcfa.glade:3712
 msgid "Index de lecture"
 msgstr "Índice de lectura"
 
-#: src/translate.c:141 src/translate.c:180
+#: glade/xcfa.glade:3713 glade/xcfa.glade:4767
 msgid "label"
 msgstr "label"
 
-#: src/translate.c:142
+#: glade/xcfa.glade:3760
 msgid "Lecture de 5 secondes avant le marqueur de fin"
 msgstr "La lectura de 5 segundos antes el marcador final"
 
-#: src/translate.c:143
+#: glade/xcfa.glade:3812
 msgid "Index de fin"
 msgstr "Índice de final"
 
-#: src/translate.c:145
+#: glade/xcfa.glade:3860
 msgid "Plage"
 msgstr "Plage"
 
-#: src/translate.c:146
+#: glade/xcfa.glade:3873
 msgid "Duree de la plage active"
 msgstr "Duración de la playa de activos"
 
-#: src/translate.c:148
+#: glade/xcfa.glade:3955
 msgid "Suprimer tous les marqueurs pour les remplacer par un marqueur unique"
 msgstr "Limpie todos los marcadores y sustituirlos por un único marcador"
 
-#: src/translate.c:149
+#: glade/xcfa.glade:4044
 msgid "Le fichier CUE sera enregistre vers 'Destination des fichiers'."
 msgstr "Archivos CUE se pueden guardar en archivo 'Destino'."
 
-#: src/translate.c:150
-msgid "Production fichier Cue"
+#: glade/xcfa.glade:4073
+msgid "Production Cue file"
 msgstr "Producción de ficheros de Cue"
 
-#: src/translate.c:151
+#: glade/xcfa.glade:4098
 msgid "Le resultat du Split sera dirige vers 'Destination des fichiers'."
 msgstr "El resultado de la división será encabezada 'Destino de archivo'."
 
-#: src/translate.c:152
+#: glade/xcfa.glade:4127
 msgid "Split"
 msgstr "Split"
 
-#: src/translate.c:153
+#: glade/xcfa.glade:4188
 msgid " Split "
 msgstr " Split "
 
-#: src/translate.c:154
+#: glade/xcfa.glade:4253
 msgid "Importation du titre du CD."
 msgstr "Importar el título del CD."
 
-#: src/translate.c:155
-msgid "Titre CD"
+#: glade/xcfa.glade:4276
+msgid "Title CD"
 msgstr "CD Título"
 
-#: src/translate.c:156
+#: glade/xcfa.glade:4296
 msgid "Choix d'une nouvelle police."
 msgstr "La elección de un nuevo tipo de letra."
 
-#: src/translate.c:157
+#: glade/xcfa.glade:4318
 msgid "Texte gras."
 msgstr "El texto en negrita."
 
-#: src/translate.c:158
+#: glade/xcfa.glade:4340
 msgid "Texte italique."
 msgstr "El texto en cursiva."
 
-#: src/translate.c:159
-msgid ""
-"Apres une lecture de CD et un ajout d'etiquette, ce menu permet la mise en "
-"forme des titres, auteurs ..."
-msgstr ""
-"Después de leer un CD y una etiqueta, este menú permite el formato de "
-"títulos, autores"
-
-#: src/translate.c:160
+#: glade/xcfa.glade:4375
 msgid "Ajouter du texte editable."
 msgstr "Añadir texto editable."
 
-#: src/translate.c:161
-msgid "Texte"
+#: glade/xcfa.glade:4430
+msgid "Text"
 msgstr "Texto"
 
-#: src/translate.c:162
+#: glade/xcfa.glade:4462
 msgid "Saisissez ici un critere de recherche d'images."
 msgstr "Escriba aquí una búsqueda de imágenes."
 
-#: src/translate.c:163
+#: glade/xcfa.glade:4484
 msgid "Importation des images depuis le Web."
 msgstr "Importación de imágenes desde la Web."
 
-#: src/translate.c:164
-msgid "Import images web"
+#: glade/xcfa.glade:4509
+msgid "Import web images "
 msgstr "Importación de imágenes web"
 
-#: src/translate.c:165
+#: glade/xcfa.glade:4578
 msgid "Supprimer l'image en selection"
 msgstr "Eliminar la selección de imágenes"
 
-#: src/translate.c:166
+#: glade/xcfa.glade:4600
 msgid "AJouter de nouvelles images."
 msgstr "Añadir nuevas imágenes."
 
-#: src/translate.c:167
+#: glade/xcfa.glade:4606
 msgid "Ouvre un fichier"
 msgstr "Abrir un archivo"
 
-#: src/translate.c:168
+#: glade/xcfa.glade:4623
 msgid "Enregistrer la page au format png."
 msgstr "Guardar página png."
 
-#: src/translate.c:169
+#: glade/xcfa.glade:4629
 msgid "Sauvegarde le fichier"
 msgstr "Guardar el archivo"
 
-#: src/translate.c:170
+#: glade/xcfa.glade:4646
 msgid "Diminution de l'echelle."
 msgstr "Reducción de la escala."
 
-#: src/translate.c:171
+#: glade/xcfa.glade:4652
 msgid "Reduit l'agrandissement"
 msgstr "Reducción de la expansión"
 
-#: src/translate.c:172
+#: glade/xcfa.glade:4669
 msgid "Echelle a 100%."
 msgstr "Escala de 100%."
 
-#: src/translate.c:173
+#: glade/xcfa.glade:4675
 msgid "Remet l'echelle a 100%"
 msgstr "Da la escala en 100%"
 
-#: src/translate.c:174
+#: glade/xcfa.glade:4692
 msgid "Augmentation de l'echelle."
 msgstr "Aumento de la escala."
 
-#: src/translate.c:175
+#: glade/xcfa.glade:4698
 msgid "Augmente l'agrandissement"
 msgstr "Creciente expansión"
 
-#: src/translate.c:176
+#: glade/xcfa.glade:4715
 msgid "Echelle compatible avec la taille de la fenetre."
 msgstr "Escala compatible con el tamaño de la ventana."
 
-#: src/translate.c:177
+#: glade/xcfa.glade:4721
 msgid "Adapte l'echelle a la taille de la fenetre"
 msgstr "Ajusta la escala para el tamaño de la ventana"
 
-#: src/translate.c:178
+#: glade/xcfa.glade:4738
 msgid "Emplacement de sauvegarde des fichiers."
 msgstr "Ubicación de los archivos de respaldo."
 
-#: src/translate.c:179
+#: glade/xcfa.glade:4752
 msgid "Nom (sans extention) du fichier a sauvegarder."
 msgstr "Nombre (sin extensión) del archivo se guarda."
 
-#: src/translate.c:181
+#: glade/xcfa.glade:4815
 msgid " Pochette "
 msgstr " Pochette "
 
-#: src/translate.c:182
+#: glade/xcfa.glade:4861
 msgid "Nice"
 msgstr "Nice"
 
-#: src/translate.c:183
-msgid " Priorite systeme "
+#: glade/xcfa.glade:4896
+msgid " Priority system "
 msgstr " Priorite systeme "
 
-#: src/translate.c:184
+#: glade/xcfa.glade:4935
 msgid ""
-"Indiquez ici le dossier sur votre systeme qui servira de lieu\n"
-"de stockage provisoire pendant les differentes conversions.\n"
+"\n"
+"Enter here the folder on your system that will serve as\n"
+"temporary storage for the different conversions.\n"
 msgstr ""
+"\n"
 "Intro por carpeta del sistema que servirá como\n"
 " El almacenamiento temporal de los diferentes conversiones.\n"
 
-#: src/translate.c:185
-msgid " Dossier provisoire des conversions "
+#: glade/xcfa.glade:4971
+msgid " Provisional file conversions "
 msgstr " Conversiones de archivo provisional "
 
-#: src/translate.c:186
+#: glade/xcfa.glade:5017
 msgid "button"
 msgstr "button"
 
-#: src/translate.c:187
-msgid " Jouer une musique en fin de tache "
-msgstr " Reproducción de música al final de la tarea "
+#: glade/xcfa.glade:5038
+msgid " Playing a job end music "
+msgstr " Reproducción de una música finales trabajo "
 
-#: src/translate.c:188
+#: glade/xcfa.glade:5058
 msgid " General "
 msgstr " General "
 
-#: src/translate.c:189
+#: glade/xcfa.glade:5100
 msgid "cdparanoia"
 msgstr "cdparanoia"
 
-#: src/translate.c:190
-msgid "cdda2wav / icedax"
-msgstr "cdda2wav / icedax"
-
-#: src/translate.c:191
+#: glade/xcfa.glade:5120
 msgid "cdparanoia mode expert"
 msgstr "cdparanoia mode expert"
 
-#: src/translate.c:192
+#: glade/xcfa.glade:5140
+msgid "cdparanoia mode expert multi passes"
+msgstr "expertos cdparanoia modo multi pase"
+
+#: glade/xcfa.glade:5168
+msgid "cdda2wav / icedax"
+msgstr "cdda2wav / icedax"
+
+#: glade/xcfa.glade:5194
 msgid " Extraction cd-audio avec: "
 msgstr " Extracción CD-Audio: </b"
 
-#: src/translate.c:193
+#: glade/xcfa.glade:5268
 msgid "HomePage"
 msgstr "HomePage"
 
-#: src/translate.c:194
+#: glade/xcfa.glade:5323
 msgid "ManPage "
 msgstr "Página de manual "
 
-#: src/translate.c:195
+#: glade/xcfa.glade:5352
 msgid " Web cdparanoia "
 msgstr " Web cdparanoia "
 
-#: src/translate.c:196
+#: glade/xcfa.glade:5414
 msgid ""
-"%a - artiste %b - titre "
+"Le fichier LogExpertMode.txt sera cree dans le dossier des "
+"extractions"
+msgstr ""
+"LogExpertMode.txt archivo se creará en la carpeta de extracciones</"
+"i>"
+
+#: glade/xcfa.glade:5431
+msgid "Generation of a report for: cdparanoia mode expert multi passes"
+msgstr ""
+"Generación de un informe para: el modo de cdparanoia expertos multi pase</"
+"b>"
+
+#: glade/xcfa.glade:5467
+msgid ""
+"%a - artist %b - titre "
 "de l'album %c - numero de la piste\n"
 "%d - titre de la chanson %e - "
-"annee %g - genre\n"
+"year %g - genre\n"
 "%na - no accent %Tl "
 "- Tetsumaki lower\n"
-"%u - remplacement de caracteres: %u(AB=C) %u( =_)"
+"%u - replacement characters: %u(AB=C) %u( =_)"
 msgstr ""
 "%a - artiste %b - titre "
 "de l'album %c - numero de la piste\n"
@@ -2052,394 +1969,388 @@
 "- Tetsumaki lower\n"
 "%u - sustitución de caracteres: %u(AB=C) %u( =_)"
 
-#: src/translate.c:197
+#: glade/xcfa.glade:5536
 msgid " Dossier de stockage "
 msgstr " Archivo de almacenamiento"
 
-#: src/translate.c:198
+#: glade/xcfa.glade:5567
 msgid " CD "
 msgstr " CD "
 
-#: src/translate.c:199
+#: glade/xcfa.glade:5615
 msgid "ABR / CBR / VBR / VBR-NEW"
 msgstr "ABR / CBR / VBR / VBR-NEW"
 
-#: src/translate.c:200
+#: glade/xcfa.glade:5660 glade/xcfa.glade:6295
 msgid "Debit"
 msgstr "Débito"
 
-#: src/translate.c:201
+#: glade/xcfa.glade:5705 glade/xcfa.glade:6317
 msgid "Mode"
 msgstr "Mode"
 
-#: src/translate.c:203 src/translate.c:219 src/translate.c:231
-#: src/translate.c:244 src/translate.c:261 src/translate.c:272
-#: src/translate.c:286 src/translate.c:300
+#: glade/xcfa.glade:5747
+msgid " Lame (fichier mp3): "
+msgstr " Lame (fichier mp3): "
+
+#: glade/xcfa.glade:5827 glade/xcfa.glade:6466 glade/xcfa.glade:6941
+#: glade/xcfa.glade:7469 glade/xcfa.glade:8200 glade/xcfa.glade:8659
+#: glade/xcfa.glade:9192 glade/xcfa.glade:9753
 msgid "Par defaut"
 msgstr "Defecto"
 
-#: src/translate.c:204
+#: glade/xcfa.glade:5848
 msgid " Options LAME "
 msgstr " Options LAME "
 
-#: src/translate.c:205 src/translate.c:233 src/translate.c:274
+#: glade/xcfa.glade:5909 glade/xcfa.glade:7023 glade/xcfa.glade:8741
 msgid "Site officiel"
 msgstr "Sitio web oficial"
 
-#: src/translate.c:206
+#: glade/xcfa.glade:5964
 msgid "Wiki mp3 "
 msgstr "Wiki mp3 "
 
-#: src/translate.c:207
+#: glade/xcfa.glade:6020
 msgid "Wiki "
 msgstr "Wiki "
 
-#: src/translate.c:208
+#: glade/xcfa.glade:6076
 msgid "ManPage "
 msgstr "Página de manual "
 
-#: src/translate.c:209
+#: glade/xcfa.glade:6105
 msgid " Web Lame "
 msgstr " Web Lame"
 
-#: src/translate.c:210 src/translate.c:224 src/translate.c:237
-#: src/translate.c:248 src/translate.c:266 src/translate.c:277
-#: src/translate.c:292
+#: glade/xcfa.glade:6181 glade/xcfa.glade:6709 glade/xcfa.glade:7238
+#: glade/xcfa.glade:7644 glade/xcfa.glade:8442 glade/xcfa.glade:8901
+#: glade/xcfa.glade:9491
 msgid "["
 msgstr "["
 
-#: src/translate.c:211 src/translate.c:225 src/translate.c:238
-#: src/translate.c:249 src/translate.c:267 src/translate.c:278
-#: src/translate.c:293
+#: glade/xcfa.glade:6194 glade/xcfa.glade:6722 glade/xcfa.glade:7251
+#: glade/xcfa.glade:7657 glade/xcfa.glade:8455 glade/xcfa.glade:8914
+#: glade/xcfa.glade:9504
 msgid "string option interne"
 msgstr "string option interne"
 
-#: src/translate.c:212 src/translate.c:226 src/translate.c:239
-#: src/translate.c:250 src/translate.c:268 src/translate.c:279
-#: src/translate.c:294
+#: glade/xcfa.glade:6209 glade/xcfa.glade:6737 glade/xcfa.glade:7266
+#: glade/xcfa.glade:7672 glade/xcfa.glade:8470 glade/xcfa.glade:8929
+#: glade/xcfa.glade:9519
 msgid "]"
 msgstr "]"
 
-#: src/translate.c:213
-msgid ""
-" Options experts, definies par l'utilisateur - lame (wav -> mp3) "
+#: glade/xcfa.glade:6234
+msgid " Experts options defined by the user- lame (wav -> mp3) "
 msgstr ""
 " Opciones de expertos, según lo definido por el usuario - lame (wav -> "
 "mp3) "
 
-#: src/translate.c:214
+#: glade/xcfa.glade:6254
 msgid " Mp3 "
 msgstr " Mp3 "
 
-#: src/translate.c:215
-msgid " Mode"
-msgstr " Mode"
-
-#: src/translate.c:216
-msgid " Mode flux (streaming)"
-msgstr " Mode flux (streaming)"
+#: glade/xcfa.glade:6306
+msgid "Mode flux (streaming)"
+msgstr "Mode flux (streaming)"
 
-#: src/translate.c:217
-msgid " Debit"
-msgstr " Débito"
+#: glade/xcfa.glade:6386
+msgid " Oggenc (fichier ogg): "
+msgstr " Oggenc (fichier ogg): "
 
-#: src/translate.c:220
+#: glade/xcfa.glade:6487
 msgid " Options OGGENC "
 msgstr " Options OGGENC "
 
-#: src/translate.c:221
+#: glade/xcfa.glade:6548
 msgid "Wiki "
 msgstr "Wiki "
 
-#: src/translate.c:222 src/translate.c:264 src/translate.c:290
-#: src/translate.c:304
+#: glade/xcfa.glade:6604 glade/xcfa.glade:8337 glade/xcfa.glade:9386
+#: glade/xcfa.glade:9947
 msgid "ManPage"
 msgstr "Página de manual"
 
-#: src/translate.c:223
+#: glade/xcfa.glade:6633
 msgid " Web Oggenc "
 msgstr " Web Oggenc "
 
-#: src/translate.c:227
-msgid ""
-" Options experts, definies par l'utilisateur - oggenc (wav -> ogg) "
+#: glade/xcfa.glade:6762
+msgid " Experts options defined by the user - oggenc (wav -> ogg) "
 msgstr ""
 " Opciones de expertos, según lo definido por el usuario - oggenc (wav -> "
 "ogg) "
 
-#: src/translate.c:228
+#: glade/xcfa.glade:6782
 msgid " Oggenc "
 msgstr " Oggenc "
 
-#: src/translate.c:229
+#: glade/xcfa.glade:6824
 msgid "Taux de compression"
 msgstr "Relación de compresión"
 
-#: src/translate.c:230
+#: glade/xcfa.glade:6861
 msgid " Flac (fichier flac): "
 msgstr " Flac (fichier flac): "
 
-#: src/translate.c:232
+#: glade/xcfa.glade:6962
 msgid " Options FLAC "
 msgstr " Options FLAC "
 
-#: src/translate.c:234 src/translate.c:275
+#: glade/xcfa.glade:7078 glade/xcfa.glade:8796
 msgid "Framasoft "
 msgstr "Framasoft "
 
-#: src/translate.c:235
+#: glade/xcfa.glade:7133
 msgid "ManPage "
 msgstr "Página de manual "
 
-#: src/translate.c:236
+#: glade/xcfa.glade:7162
 msgid " Web Flac "
 msgstr " Web Flac "
 
-#: src/translate.c:240
-msgid ""
-" Options experts, definies par l'utilisateur - flac (wav -> flac) "
+#: glade/xcfa.glade:7291
+msgid " Experts options defined by the user- flac (wav -> flac) "
 msgstr ""
 " Opciones de expertos, según lo definido por el usuario - flac (wav -> "
 "flac) "
 
-#: src/translate.c:241
+#: glade/xcfa.glade:7311
 msgid " Flac "
 msgstr " Flac "
 
-#: src/translate.c:242
+#: glade/xcfa.glade:7353
 msgid " Qualite"
 msgstr " Qalidad"
 
-#: src/translate.c:243
+#: glade/xcfa.glade:7389
 msgid " Mac (fichier ape): "
 msgstr " Mac (fichier ape): "
 
-#: src/translate.c:245
+#: glade/xcfa.glade:7490
 msgid " Options MAC "
 msgstr " Options MAC "
 
-#: src/translate.c:246
+#: glade/xcfa.glade:7546
 msgid "Wiki"
 msgstr "Wiki"
 
-#: src/translate.c:247
+#: glade/xcfa.glade:7568
 msgid " Web Mac "
 msgstr " Web Mac "
 
-#: src/translate.c:251
-msgid " Options experts, definies par l'utilisateur - mac (wav -> ape) "
+#: glade/xcfa.glade:7697
+msgid " Experts options defined by the user - mac (wav -> ape) "
 msgstr ""
 " Opciones de expertos, según lo definido por el usuario - mac (wav -> "
 "ape) "
 
-#: src/translate.c:252
+#: glade/xcfa.glade:7717
 msgid " Mac "
 msgstr " Mac "
 
-#: src/translate.c:253
+#: glade/xcfa.glade:7765
 msgid "Compression"
 msgstr "Compresión"
 
-#: src/translate.c:254
+#: glade/xcfa.glade:7817
 msgid "Son"
 msgstr "Son"
 
-#: src/translate.c:255
+#: glade/xcfa.glade:7869
 msgid "Mode hybride"
 msgstr "Mode hybride"
 
-#: src/translate.c:256
+#: glade/xcfa.glade:7921
 msgid "Fichier de correction"
 msgstr "Archivo de corrección"
 
-#: src/translate.c:257
+#: glade/xcfa.glade:7973
 msgid "Compression maximum"
 msgstr "Compresión máxima"
 
-#: src/translate.c:258
+#: glade/xcfa.glade:8025
 msgid "Signature MD5"
 msgstr "MD5 firma"
 
-#: src/translate.c:259
+#: glade/xcfa.glade:8077
 msgid "Extra encode processing"
 msgstr "Extra encode processing"
 
-#: src/translate.c:260
+#: glade/xcfa.glade:8120
 msgid " WavPack (fichier wv): "
 msgstr " WavPack (fichier wv): "
 
-#: src/translate.c:262
+#: glade/xcfa.glade:8221
 msgid " Options WAVPACK "
 msgstr " Options WAVPACK "
 
-#: src/translate.c:263
+#: glade/xcfa.glade:8282
 msgid "Wiki "
 msgstr "Wiki "
 
-#: src/translate.c:265
+#: glade/xcfa.glade:8366
 msgid " Web Wavpack "
 msgstr " Web Wavpack"
 
-#: src/translate.c:269
-msgid ""
-" Options experts, definies par l'utilisateur - wavpack (wav -> wv) "
+#: glade/xcfa.glade:8495
+msgid " Experts options defined by the user - wavpack (wav -> wv) "
 msgstr ""
 " Opciones de expertos, según lo definido por el usuario - wavpack (wav -> "
 "wv) "
 
-#: src/translate.c:270
+#: glade/xcfa.glade:8515
 msgid " Wavpack "
 msgstr " Wavpack "
 
-#: src/translate.c:271
+#: glade/xcfa.glade:8579
 msgid " MusePack (fichier mpc): "
 msgstr " MusePack (fichier mpc): "
 
-#: src/translate.c:273
+#: glade/xcfa.glade:8680
 msgid " Options MUSEPACK "
 msgstr " Options MUSEPACK "
 
-#: src/translate.c:276
+#: glade/xcfa.glade:8825
 msgid " Web Musepack "
 msgstr " Web Musepack "
 
-#: src/translate.c:280
-msgid ""
-" Options experts, definies par l'utilisateur - musepack (wav -> mpc) "
+#: glade/xcfa.glade:8954
+msgid " Experts options defined by the user- musepack (wav -> mpc) "
 msgstr ""
 " Opciones de expertos, según lo definido por el usuario - musepack (wav -"
 "> mpc) "
 
-#: src/translate.c:281
+#: glade/xcfa.glade:8974
 msgid " Musepack "
 msgstr "Musepack "
 
-#: src/translate.c:282
-msgid " Qualite VBR / Debit ABR"
-msgstr " Calidad VBR / ABR débito"
+#: glade/xcfa.glade:9016
+msgid "Conteneur"
+msgstr "Conteneur"
 
-#: src/translate.c:283
-msgid " VBR / ABR"
-msgstr " VBR / ABR"
+#: glade/xcfa.glade:9027
+msgid "VBR / ABR"
+msgstr "VBR / ABR"
 
-#: src/translate.c:284
-msgid " Conteneur"
-msgstr " Conteneur"
+#: glade/xcfa.glade:9038
+msgid "Qualite VBR / Debit ABR"
+msgstr "Calidad VBR / ABR débito"
 
-#: src/translate.c:285
+#: glade/xcfa.glade:9112
 msgid " Faac (fichier .m4a): "
 msgstr " Faac (fichier .m4a): "
 
-#: src/translate.c:287
+#: glade/xcfa.glade:9213
 msgid " Options FAAC "
 msgstr " Options FAAC "
 
-#: src/translate.c:288 src/translate.c:302
+#: glade/xcfa.glade:9274 glade/xcfa.glade:9835
 msgid "Site officiel "
 msgstr "Sitio web oficial "
 
-#: src/translate.c:289 src/translate.c:303
+#: glade/xcfa.glade:9330 glade/xcfa.glade:9891
 msgid "Web Info "
 msgstr "Web Info "
 
-#: src/translate.c:291
+#: glade/xcfa.glade:9415
 msgid " Web Faac "
 msgstr " Web Faac "
 
-#: src/translate.c:295
-msgid ""
-" Options experts, definies par l'utilisateur - faac (wav -> m4a) "
+#: glade/xcfa.glade:9544
+msgid " Experts options defined by the user - faac (wav -> m4a) "
 msgstr ""
 " Opciones de expertos, según lo definido por el usuario - faac (wav -> "
 "m4a) "
 
-#: src/translate.c:296
+#: glade/xcfa.glade:9564
 msgid " Faac "
 msgstr " Faac "
 
-#: src/translate.c:297
-msgid " Stereo: Qualite en kbit/s"
-msgstr " Stereo: Qualite en kbit/s"
+#: glade/xcfa.glade:9606
+msgid "Mono: Qualite en kbit/s"
+msgstr "Mono: Qualite en kbit/s"
 
-#: src/translate.c:298
-msgid " Mono: Qualite en kbit/s"
-msgstr " Mono: Qualite en kbit/s"
+#: glade/xcfa.glade:9617
+msgid "Stereo: Qualite en kbit/s"
+msgstr "Stereo: Qualite en kbit/s"
 
-#: src/translate.c:299
+#: glade/xcfa.glade:9673
 msgid " AacplusEnc (fichier .aac): "
 msgstr " AacplusEnc (fichier .aac): "
 
-#: src/translate.c:301
+#: glade/xcfa.glade:9774
 msgid " Options AacPlusEnc "
 msgstr " Opciones AacPlusEnc"
 
-#: src/translate.c:305
+#: glade/xcfa.glade:9976
 msgid " Web AacPlusEnc "
 msgstr " Web AacPlusEnc "
 
-#: src/translate.c:306
+#: glade/xcfa.glade:10021
 msgid " AacplusEnc "
 msgstr " AacplusEnc"
 
-#: src/translate.c:307
+#: glade/xcfa.glade:10051
 msgid "Artiste"
 msgstr "Artista"
 
-#: src/translate.c:308 src/translate.c:335
+#: glade/xcfa.glade:10070 glade/xcfa_win_treeview.glade:95
 msgid "Titre"
 msgstr "Título"
 
-#: src/translate.c:309
+#: glade/xcfa.glade:10089
 msgid "Album"
 msgstr "Album"
 
-#: src/translate.c:310
+#: glade/xcfa.glade:10108
 msgid "Numero"
 msgstr "Número"
 
-#: src/translate.c:311
+#: glade/xcfa.glade:10127
 msgid "Genre"
 msgstr "Genre"
 
-#: src/translate.c:312
+#: glade/xcfa.glade:10146
 msgid "Annee"
 msgstr "Año"
 
-#: src/translate.c:313
+#: glade/xcfa.glade:10165
 msgid "Commentaire"
 msgstr "Comentario"
 
-#: src/translate.c:314
+#: glade/xcfa.glade:10190
 msgid " Exportation de "
 msgstr " Exportación "
 
-#: src/translate.c:316
+#: glade/xcfa.glade:10226
 msgid " Preferences "
 msgstr " preferencias "
 
-#: src/translate.c:317
+#: glade/xcfa.glade:10289
 msgid "SCAN"
 msgstr "SCAN"
 
-#: src/translate.c:318
+#: glade/xcfa.glade:10303
 msgid " Installation "
 msgstr " Instalación "
 
-#: src/translate.c:319
-msgid " Votre systeme utilise ... "
+#: glade/xcfa.glade:10338
+msgid " Your system use ... "
 msgstr " El sistema utiliza ... "
 
-#: src/translate.c:320
+#: glade/xcfa.glade:10375
 msgid ""
 "\n"
-"Pour installer les programmes externes requis,\n"
-"veuillez utiliser l'installateur de votre distribution Gnu/Linux.\n"
+"To install the required external programs\n"
+"Please use the installer to your distribution Gnu / Linux.\n"
 msgstr ""
 "\n"
 "Para instalar los programas externos necesarios,\n"
 "Por favor, utilice el instalador en su distribución GNU / Linux.\n"
 
-#: src/translate.c:321
+#: glade/xcfa.glade:10393
 msgid ""
 "Le programme XCFA_INSTALL_ALL ecrit en Perl vous sera utile en ligne de "
 "commande pour une installation des programmes complementaire."
@@ -2447,183 +2358,69 @@
 "XCFA_INSTALL_ALL programa escrito en Perl será útil en una línea de comandos "
 "para instalar programas adicionales."
 
-#: src/translate.c:322
+#: glade/xcfa.glade:10419
 msgid " Informations "
 msgstr " información "
 
-#: src/translate.c:323
-msgid " Application externes "
-msgstr " Aplicación externa "
+#: glade/xcfa.glade:10443
+msgid " External application "
+msgstr "XCFA: Extracción de CD"
 
-#: src/translate.c:324 src/translate.c:326
+#: glade/xcfa.glade:10514 glade/xcfa.glade:10618
 msgid "parametres:"
 msgstr "parámetros:"
 
-#: src/translate.c:325
+#: glade/xcfa.glade:10527
+msgid ""
+"\n"
+" konqueror : newTab\n"
+" iceweasel : -new-window -new-tab \n"
+msgstr ""
+"\n"
+" konqueror : newTab\n"
+" iceweasel : -new-window -new-tab \n"
+
+#: glade/xcfa.glade:10548
 msgid "Navigateur"
 msgstr "Navegadore"
 
-#: src/translate.c:327
+#: glade/xcfa.glade:10648
 msgid "Lecteurs audio"
 msgstr "Reproductores de Audio"
 
-#: src/translate.c:328
-msgid " Navigateurs / Lecteurs audio "
-msgstr " Navegadores / Reproductores de Audio "
+#: glade/xcfa.glade:10669
+msgid "  Browsers / Audio Players "
+msgstr "Navegadores / Reproductores de Audio"
 
-#: src/translate.c:329
+#: glade/xcfa.glade:10692
 msgid " Applications externes "
 msgstr " Las aplicaciones externas "
 
-#: src/translate.c:330
-msgid "Scan en cours ..."
-msgstr "Análisis en curso ..."
-
-#: src/translate.c:331
-msgid "Scan du support en cours ..."
-msgstr "Escanear el apoyo actual ..."
-
-#: src/translate.c:332
-msgid "Detail extraction mode expert"
-msgstr "Recuperación de detalle el modo experto"
-
-#: src/translate.c:333
-msgid "Modification des champs"
-msgstr "Campos variables"
-
-#: src/translate.c:334
-msgid ""
-"\n"
-"Modification des champs\n"
-msgstr ""
-"\n"
-"Modification des champs\n"
-
-#: src/translate.c:342 src/translate.c:361 src/translate.c:382
-#: src/translate.c:394 src/translate.c:405 src/translate.c:413
-msgid " Visibilite "
-msgstr " visibilidad "
-
-#: src/translate.c:343 src/translate.c:362 src/translate.c:383
-#: src/translate.c:395 src/translate.c:406 src/translate.c:414
-msgid "Nom a gauche"
-msgstr "Nombre de la izquierda"
-
-#: src/translate.c:344 src/translate.c:363 src/translate.c:384
-#: src/translate.c:396 src/translate.c:407 src/translate.c:415
-msgid "Nom au centre"
-msgstr "Nombre del centro"
-
-#: src/translate.c:345 src/translate.c:364 src/translate.c:385
-#: src/translate.c:397 src/translate.c:408 src/translate.c:416
-msgid "Nom a droite"
-msgstr "Nombre a la derecha"
-
-#: src/translate.c:346
-msgid "DVD"
-msgstr "DVD"
-
-#: src/translate.c:351 src/translate.c:372
-msgid "Wavpack"
-msgstr "Wavpack"
-
-#: src/translate.c:355 src/translate.c:376
-msgid "Musepack"
-msgstr "Musepack"
-
-#: src/translate.c:365
-msgid "CD"
-msgstr "CD"
-
-#: src/translate.c:380
-msgid "Replaygain"
-msgstr "Replaygain"
-
-#: src/translate.c:386
-msgid "CONVERSIONS"
-msgstr "CONVERSIONES"
-
-#: src/translate.c:387
-msgid "Hertz"
-msgstr "Hertz"
-
-#: src/translate.c:388
-msgid "New Hertz"
-msgstr "New Hertz"
-
-#: src/translate.c:389
-msgid "Voie"
-msgstr "Voie"
-
-#: src/translate.c:390
-msgid "New Voie"
-msgstr "New Voie"
-
-#: src/translate.c:391
-msgid "Bits"
-msgstr "Bits"
-
-#: src/translate.c:392
-msgid "New Bits"
-msgstr "New Bits"
-
-#: src/translate.c:398
-msgid "WAV"
-msgstr "WAV"
-
-#: src/translate.c:401
-msgid "New Bitrate"
-msgstr "New Bitrate"
-
-#: src/translate.c:402
-msgid "Size"
-msgstr "Size"
-
-#: src/translate.c:409
-msgid "MP3-OGG"
-msgstr "MP3-OGG"
-
-#: src/translate.c:417
-msgid "TAGS"
-msgstr "TAGS"
-
-#: src/translate.c:418
-msgid "Selection globale"
-msgstr "Selection globale"
-
-#: src/translate.c:419
-msgid "Deselection globale"
-msgstr "Deselection globale"
-
-#: src/translate.c:420
-msgid "Retour"
-msgstr "Volver"
-
-#: src/translate.c:421
+#: glade/xcfa_win_about.glade:7
 msgid "About X Convert File Audio"
 msgstr "About X Convert File Audio"
 
-#: src/translate.c:422
+#: glade/xcfa_win_about.glade:103
 msgid "Author"
 msgstr "Author"
 
-#: src/translate.c:423
+#: glade/xcfa_win_about.glade:139
 msgid "Licence"
 msgstr "Licence"
 
-#: src/translate.c:424
+#: glade/xcfa_win_about.glade:163
 msgid " Informations "
 msgstr " Información "
 
-#: src/translate.c:425
+#: glade/xcfa_win_about.glade:198
 msgid " Machine "
 msgstr " Máquina "
 
-#: src/translate.c:426
+#: glade/xcfa_win_about.glade:333
 msgid "Ingenieurs du son\n"
 msgstr "Los ingenieros de sonido\n"
 
-#: src/translate.c:427
+#: glade/xcfa_win_about.glade:350
 msgid ""
 "\n"
 "Graphisme\n"
@@ -2631,7 +2428,7 @@
 "\n"
 "Gráficos\n"
 
-#: src/translate.c:428
+#: glade/xcfa_win_about.glade:370
 msgid ""
 "Traduction Anglaise\n"
 "\n"
@@ -2641,7 +2438,7 @@
 "\n"
 "\n"
 
-#: src/translate.c:429
+#: glade/xcfa_win_about.glade:391
 msgid ""
 "\n"
 "Traduction Allemande"
@@ -2649,7 +2446,7 @@
 "\n"
 "Traduction Allemande"
 
-#: src/translate.c:430
+#: glade/xcfa_win_about.glade:628
 msgid ""
 "\n"
 "Codeur Xcfa"
@@ -2657,7 +2454,7 @@
 "\n"
 "Codeur Xcfa"
 
-#: src/translate.c:431
+#: glade/xcfa_win_about.glade:665
 msgid ""
 "\n"
 "ElementSpeak pour Xcfa "
@@ -2665,7 +2462,7 @@
 "\n"
 "ElementSpeak pour Xcfa "
 
-#: src/translate.c:432
+#: glade/xcfa_win_about.glade:702
 msgid ""
 "\n"
 "Codeur pages Web"
@@ -2673,7 +2470,7 @@
 "\n"
 "Codeur páginas web"
 
-#: src/translate.c:433
+#: glade/xcfa_win_about.glade:739
 msgid ""
 "\n"
 "Traduction Italienne"
@@ -2681,7 +2478,7 @@
 "\n"
 "Traduction Italienne"
 
-#: src/translate.c:434
+#: glade/xcfa_win_about.glade:800
 msgid ""
 "\n"
 "\n"
@@ -2691,51 +2488,43 @@
 "\n"
 "Páginas de un visiter\n"
 
-#: src/translate.c:435
+#: glade/xcfa_win_about.glade:1123
 msgid "Linux On The Root"
 msgstr "Linux On The Root"
 
-#: src/translate.c:436
+#: glade/xcfa_win_about.glade:1180
 msgid "Frugalware"
 msgstr "Frugalware"
 
-#: src/translate.c:437
+#: glade/xcfa_win_about.glade:1237
 msgid "Road2Mayotte"
 msgstr "Road2Mayotte"
 
-#: src/translate.c:438
+#: glade/xcfa_win_about.glade:1294
 msgid "La Linuxerie"
 msgstr "La Linuxerie"
 
-#: src/translate.c:439
-msgid "Audioptimisation by Dzef"
-msgstr "Audioptimisation by Dzef"
-
-#: src/translate.c:440
+#: glade/xcfa_win_about.glade:1351
 msgid "Tuxfamily"
 msgstr "Tuxfamily"
 
-#: src/translate.c:441
+#: glade/xcfa_win_about.glade:1408
 msgid "Framasoft"
 msgstr "Framasoft"
 
-#: src/translate.c:442
+#: glade/xcfa_win_about.glade:1465
 msgid "Ekd (EnKoDeur-Mixeur)"
 msgstr "Ekd (EnKoDeur-Mixeur)"
 
-#: src/translate.c:443
-msgid "Bishop's page"
-msgstr "Bishop's page"
+#: glade/xcfa_win_about.glade:1544
+msgid "Debian Multimedia"
+msgstr "Debian Multimedia"
 
-#: src/translate.c:444
+#: glade/xcfa_win_about.glade:1598
 msgid "Je suis libre"
 msgstr "Je suis libre"
 
-#: src/translate.c:445
-msgid "Debian Multimedia"
-msgstr "Debian Multimedia"
-
-#: src/translate.c:446
+#: glade/xcfa_win_about.glade:1705
 msgid ""
 "\n"
 "Forum\n"
@@ -2743,19 +2532,15 @@
 "\n"
 "Forum\n"
 
-#: src/translate.c:447
-msgid "XCFA Vorstellung "
-msgstr "XCFA idea"
+#: glade/xcfa_win_about.glade:1825
+msgid "Forum Xcfa"
+msgstr "Forum Xcfa"
 
-#: src/translate.c:448
+#: glade/xcfa_win_about.glade:1879
 msgid "XCFA LinuxForen.de"
 msgstr "XCFA LinuxForen.de"
 
-#: src/translate.c:449
-msgid "Forum Xcfa"
-msgstr "Forum Xcfa"
-
-#: src/translate.c:450
+#: glade/xcfa_win_about.glade:1929
 msgid ""
 "\n"
 "Documentation\n"
@@ -2763,102 +2548,208 @@
 "\n"
 "documentación\n"
 
-#: src/translate.c:451
+#: glade/xcfa_win_about.glade:2164
 msgid "Wiki Xcfa par Shankarius"
 msgstr "Wiki Xcfa por Shankarius"
 
-#: src/translate.c:452
+#: glade/xcfa_win_about.glade:2219
 msgid "Doc Xcfa par Patachon"
 msgstr "Doc Xcfa por Patachon"
 
-#: src/translate.c:453
+#: glade/xcfa_win_about.glade:2276
 msgid "Ogg Vorbis explique par Shankarius"
 msgstr "Ogg Vorbis explicó Shankarius"
 
-#: src/translate.c:454
+#: glade/xcfa_win_about.glade:2333
 msgid "La normalisation expliquee par Dzef"
 msgstr "Explica por la normalización Dzef"
 
-#: src/translate.c:455
+#: glade/xcfa_win_about.glade:2390
 msgid "Xcfa sur Linux On The Root"
 msgstr "Xcfa sur Linux On The Root"
 
-#: src/translate.c:456
+#: glade/xcfa_win_about.glade:2433
 msgid " Contributions "
 msgstr " Contribuciones "
 
-#: src/translate.c:457
+#: glade/xcfa_win_about.glade:2461
 msgid " License "
 msgstr " licencia "
 
-#: src/translate.c:458
+#: glade/xcfa_win_about.glade:2482
 msgid "OK"
 msgstr "OK"
 
-#: src/web.c:147 src/web.c:207
-msgid "PAS de navigateur present"
-msgstr "NO navegador actual"
+#: glade/xcfa_win_scan.glade:9
+msgid "Scan en cours ..."
+msgstr "Análisis en curso ..."
+
+#: glade/xcfa_win_scan.glade:77
+msgid "Scan du support en cours ..."
+msgstr "Escanear el apoyo actual ..."
 
-#: src/web.c:148
-msgid "L'acces au web est impossible car aucun navigateur"
-msgstr " Acceso a la Web es imposible porque no hay ningún navegador"
+#: glade/xcfa_win_scan.glade:128
+msgid "Detail extraction mode expert"
+msgstr "Recuperación de detalle el modo experto"
 
-#: src/web.c:150
-msgid "n'est present dans votre configuration."
-msgstr "está presente en su configuración."
+#: glade/xcfa_win_treeview.glade:7
+msgid "Modification des champs"
+msgstr "Campos variables"
 
-#: src/web.c:152
-msgid "Veuillez installez un navigateur."
-msgstr "Por favor, instale un navegador."
+#: glade/xcfa_win_treeview.glade:41
+msgid ""
+"\n"
+"Modification des champs\n"
+msgstr ""
+"\n"
+"Modification des champs\n"
 
-#: src/web.c:161
-msgid "Vous devez ouvrir l'acces internet"
-msgstr "Debe abrir el acceso a Internet"
+#: glade/xcfa_win_treeview.glade:129
+msgid "Temps"
+msgstr "Temps"
 
-#: src/web.c:209
-msgid " L'acces au web est impossible car aucun navigateur"
-msgstr " Acceso a la Web es imposible porque no hay ningún navegador"
+#: glade/xcfa_win_treeview.glade:163
+msgid "Choix"
+msgstr "Choix"
 
-#: src/web.c:211
-msgid " n'est present dans votre configuration."
-msgstr " está presente en su configuración."
+#: glade/xcfa_win_treeview.glade:197 glade/xcfa_win_treeview.glade:577
+#: glade/xcfa_win_treeview.glade:995 glade/xcfa_win_treeview.glade:1260
+#: glade/xcfa_win_treeview.glade:1508 glade/xcfa_win_treeview.glade:1706
+msgid "Nom"
+msgstr "Nom"
 
-#: src/web.c:213
-msgid " Veuillez installez un navigateur."
-msgstr " Por favor, instale un navegador."
+#: glade/xcfa_win_treeview.glade:220 glade/xcfa_win_treeview.glade:600
+#: glade/xcfa_win_treeview.glade:1018 glade/xcfa_win_treeview.glade:1283
+#: glade/xcfa_win_treeview.glade:1531 glade/xcfa_win_treeview.glade:1732
+msgid " Visibilite "
+msgstr " visibilidad "
 
-#: src/web.c:222
-msgid "L'application est absente."
-msgstr "La aplicación no se encuentra."
+#: glade/xcfa_win_treeview.glade:250 glade/xcfa_win_treeview.glade:630
+#: glade/xcfa_win_treeview.glade:1048 glade/xcfa_win_treeview.glade:1313
+#: glade/xcfa_win_treeview.glade:1562 glade/xcfa_win_treeview.glade:1763
+msgid "Nom a gauche"
+msgstr "Nombre de la izquierda"
 
-#: src/web.c:223
-msgid "Veuillez installer : "
-msgstr "Por favor, instale : "
+#: glade/xcfa_win_treeview.glade:267 glade/xcfa_win_treeview.glade:647
+#: glade/xcfa_win_treeview.glade:1065 glade/xcfa_win_treeview.glade:1330
+#: glade/xcfa_win_treeview.glade:1579 glade/xcfa_win_treeview.glade:1780
+msgid "Nom au centre"
+msgstr "Nombre del centro"
 
-#: src/win_about.c:138
-msgid " Xcfa sur le web"
-msgstr " Xcfa web"
+#: glade/xcfa_win_treeview.glade:286 glade/xcfa_win_treeview.glade:666
+#: glade/xcfa_win_treeview.glade:1084 glade/xcfa_win_treeview.glade:1349
+#: glade/xcfa_win_treeview.glade:1598 glade/xcfa_win_treeview.glade:1799
+msgid "Nom a droite"
+msgstr "Nombre a la derecha"
 
-#: src/win_about.c:188
-msgid ""
-"\n"
-"Au tout debut:\n"
-"\n"
-"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
-"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
-"... ;-)\n"
-"\n"
-""
-msgstr ""
-"\n"
-"En el comienzo:\n"
-"\n"
-"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
-"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
-"... ;-)\n"
-"\n"
-""
+#: glade/xcfa_win_treeview.glade:326
+msgid "DVD"
+msgstr "DVD"
 
-#: src/win_scan.c:166
-msgid "Waiting ..."
-msgstr "Espera ..."
+#: glade/xcfa_win_treeview.glade:373 glade/xcfa_win_treeview.glade:791
+msgid "Wav"
+msgstr "Wav"
+
+#: glade/xcfa_win_treeview.glade:390 glade/xcfa_win_treeview.glade:808
+msgid "Flac"
+msgstr "Flac"
+
+#: glade/xcfa_win_treeview.glade:407 glade/xcfa_win_treeview.glade:825
+msgid "Ape"
+msgstr "Ape"
+
+#: glade/xcfa_win_treeview.glade:424 glade/xcfa_win_treeview.glade:842
+msgid "Wavpack"
+msgstr "Wavpack"
+
+#: glade/xcfa_win_treeview.glade:441 glade/xcfa_win_treeview.glade:859
+msgid "Ogg"
+msgstr "Ogg"
+
+#: glade/xcfa_win_treeview.glade:458 glade/xcfa_win_treeview.glade:876
+msgid "M4a"
+msgstr "M4a"
+
+#: glade/xcfa_win_treeview.glade:475 glade/xcfa_win_treeview.glade:893
+msgid "Aac"
+msgstr "Aac"
+
+#: glade/xcfa_win_treeview.glade:492 glade/xcfa_win_treeview.glade:910
+msgid "Musepack"
+msgstr "Musepack"
+
+#: glade/xcfa_win_treeview.glade:509 glade/xcfa_win_treeview.glade:927
+msgid "Mp3"
+msgstr "Mp3"
+
+#: glade/xcfa_win_treeview.glade:526
+msgid "Num"
+msgstr "Num"
+
+#: glade/xcfa_win_treeview.glade:709
+msgid "CD"
+msgstr "CD"
+
+#: glade/xcfa_win_treeview.glade:978
+msgid "Replaygain"
+msgstr "Replaygain"
+
+#: glade/xcfa_win_treeview.glade:1127
+msgid "CONVERSIONS"
+msgstr "CONVERSIONES"
+
+#: glade/xcfa_win_treeview.glade:1158
+msgid "Hertz"
+msgstr "Hertz"
+
+#: glade/xcfa_win_treeview.glade:1175
+msgid "New Hertz"
+msgstr "New Hertz"
+
+#: glade/xcfa_win_treeview.glade:1192
+msgid "Voie"
+msgstr "Voie"
+
+#: glade/xcfa_win_treeview.glade:1209
+msgid "New Voie"
+msgstr "New Voie"
+
+#: glade/xcfa_win_treeview.glade:1226
+msgid "Bits"
+msgstr "Bits"
+
+#: glade/xcfa_win_treeview.glade:1243
+msgid "New Bits"
+msgstr "New Bits"
+
+#: glade/xcfa_win_treeview.glade:1392
+msgid "WAV"
+msgstr "WAV"
+
+#: glade/xcfa_win_treeview.glade:1440
+msgid "Bitrate"
+msgstr "Bitrate"
+
+#: glade/xcfa_win_treeview.glade:1457
+msgid "New Bitrate"
+msgstr "New Bitrate"
+
+#: glade/xcfa_win_treeview.glade:1641
+msgid "MP3-OGG"
+msgstr "MP3-OGG"
+
+#: glade/xcfa_win_treeview.glade:1842
+msgid "TAGS"
+msgstr "TAGS"
+
+#: glade/xcfa_win_treeview.glade:1894
+msgid "Selection globale"
+msgstr "Selection globale"
+
+#: glade/xcfa_win_treeview.glade:1948
+msgid "Deselection globale"
+msgstr "Deselection globale"
+
+#: glade/xcfa_win_treeview.glade:2009
+msgid "Retour"
+msgstr "Volver"

xcfa-4.2.8.tar.gz/po/fr.gmo -> xcfa-5.0.2.tar.gz/po/fr.gmo Changed

xcfa-4.2.8.tar.gz/po/fr.po -> xcfa-5.0.2.tar.gz/po/fr.po Changed

@@ -5,912 +5,846 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xcfa 4.2.8\n"
+"Project-Id-Version: xcfa 5.0.2\n"
 "Report-Msgid-Bugs-To: xcfa@tuxfamily.org\n"
-"POT-Creation-Date: 2012-02-03 13:22+0100\n"
-"PO-Revision-Date: 2010-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-05-16 14:03+0200\n"
+"PO-Revision-Date: 2015-02-06 15:44+0100\n"
 "Last-Translator: BULIN Claude xcfa@tuxfamily.org\n"
 "Language-Team: French\n"
-"Language: \n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.7.3\n"
 
-#: src/cd_audio.c:815 src/dvd.c:684 src/dvd.c:1327
-msgid "MPLAYER deja en action"
+#: src/cd_audio.c:814 src/dvd.c:686 src/dvd.c:1345
+msgid "MPLAYER already in action"
 msgstr "MPLAYER déjà en action"
 
-#: src/cd_audio.c:816 src/dvd.c:685 src/dvd.c:1328
-msgid "MPLAYER est deja utilise !!"
+#: src/cd_audio.c:815 src/dvd.c:687 src/dvd.c:1346
+msgid "MPLAYER is already in use !!"
 msgstr "MPLAYER est déjà utilisé !!"
 
-#: src/cd_audio.c:1227 src/cd_audio.c:1233 src/dvd.c:871 src/file.c:2830
-msgid "(Click Droit = Menu) / En attente de selection."
-msgstr "(Click Droit = Menu) / En attente de sélection."
+#: src/cd_audio.c:1227 src/cd_audio.c:1233 src/file.c:2837
+msgid "(Right click = Menu) / Waiting for selection."
+msgstr "(Click Droit = Menu) / En sélection."
 
-#: src/cd_audio.c:1230 src/file.c:2827
-msgid "Le programme externe d'extraction est absent."
-msgstr "Le programme externe d'extraction est absent."
+#: src/cd_audio.c:1230
+msgid "The external ripping program is missing."
+msgstr "Le programme d'extraction est absent."
 
-#: src/cd_audio.c:1236 src/file.c:2833
-msgid "(Click Droit = Menu) / En attente de selection. Le fichier existe."
-msgstr "(Click Droit = Menu) / En attente de sélection. Le fichier existe."
+#: src/cd_audio.c:1236
+msgid "(Right click = Menu) / Waiting for Selection. File exists.."
+msgstr "(Click Droit = Menu) / En sélection. Le fichier existe."
 
-#: src/cd_audio.c:1239 src/file.c:2836
-msgid "(Click Droit = Menu) / En selection."
+#: src/cd_audio.c:1239
+msgid "(Right click = Menu) / Selected files."
 msgstr "(Click Droit = Menu) / En sélection."
 
-#: src/cd_audio.c:1242 src/file.c:2842
-msgid "(Click Droit = Menu) / Selection avec options expert."
+#: src/cd_audio.c:1242 src/file.c:2849
+msgid "(Right click = Menu) / Selection - expert mode."
 msgstr "(Click Droit = Menu) / Sélection avec options expert."
 
-#: src/cd_audio.c:1245 src/file.c:2839
-msgid "(Click Droit = Menu) / En selection. Le fichier existe."
+#: src/cd_audio.c:1245 src/file.c:2846
+msgid "(Right click = Menu) / Selected files. File exists."
 msgstr "(Click Droit = Menu) / En sélection. Le fichier existe."
 
-#: src/cd_audio.c:1248 src/file.c:2845
-msgid ""
-"(Click Droit = Menu) / Selection avec options expert. Le fichier existe."
+#: src/cd_audio.c:1248 src/file.c:2852
+msgid "(Right click = Menu) / Selection - expert mode. File exists."
 msgstr ""
 "(Click Droit = Menu) / Sélection avec options expert. Le fichier existe."
 
 #: src/cd_audio.c:1257
 msgid ""
-"(Click Droit = Menu) / Possibilite d'ajustement INDIVIDUEL ou COLLECTIF "
-"maximal du volume"
+"(Right click = Menu) / Possibilities for individual adaptation or maximum "
+"collection volume"
 msgstr ""
-"(Click Droit = Menu) / Possibilité d'ajustement INDIVIDUEL ou COLLECTIF "
-"maximal du volume"
+"(Click Droit = Menu) / Possibilité d'adaptation individuelle ou le volume "
+"sera maximal"
 
 #: src/cd_audio.c:1262
-msgid "(Click Droit = Menu) / Ajustement INDIVIDUEL maximal du volume"
+msgid "(Right click = Menu) / INDIVIDUAL maximum volume adjustment"
 msgstr "(Click Droit = Menu) / Ajustement INDIVIDUEL maximal du volume"
 
 #: src/cd_audio.c:1265
-msgid "(Click Droit = Menu) / Ajustement COLLECTIF maximal du volume"
+msgid "(Right click = Menu) / COLLECTIVE maximum volume adjustment"
 msgstr "(Click Droit = Menu) / Ajustement COLLECTIF maximal du volume"
 
-#: src/cd_audio.c:1505 src/dvd.c:1103 src/file.c:3139 src/translate.c:336
-#: src/translate.c:347 src/translate.c:366
-msgid "Play"
-msgstr "Play"
-
-#: src/cd_audio.c:1546 src/file.c:3204 src/translate.c:348 src/translate.c:369
-msgid "Wav"
-msgstr "Wav"
-
-#: src/cd_audio.c:1567 src/file.c:3223 src/translate.c:349 src/translate.c:370
-msgid "Flac"
-msgstr "Flac"
-
-#: src/cd_audio.c:1587 src/file.c:3242 src/translate.c:350 src/translate.c:371
-msgid "Ape"
-msgstr "Ape"
-
-#: src/cd_audio.c:1607 src/file.c:3261
-msgid "WavP"
-msgstr "WavP"
-
-#: src/cd_audio.c:1627 src/file.c:3280 src/translate.c:352 src/translate.c:373
-msgid "Ogg"
-msgstr "Ogg"
-
-#: src/cd_audio.c:1648 src/file.c:3299 src/translate.c:353 src/translate.c:374
-msgid "M4a"
-msgstr "M4a"
-
-#: src/cd_audio.c:1669 src/file.c:3318 src/translate.c:354 src/translate.c:375
-msgid "Aac"
-msgstr "Aac"
-
-#: src/cd_audio.c:1689 src/file.c:3337
-msgid "Mpc"
-msgstr "Mpc"
-
-#: src/cd_audio.c:1709 src/file.c:3356 src/translate.c:356 src/translate.c:377
-msgid "Mp3"
-msgstr "Mp3"
-
-#: src/cd_audio.c:1730 src/translate.c:357
-msgid "Num"
-msgstr "Num"
-
-#: src/cd_audio.c:1745 src/translate.c:358 src/translate.c:378
-#: src/translate.c:403 src/translate.c:411
-msgid "Time"
-msgstr "Time"
-
-#: src/cd_audio.c:1760 src/dvd.c:1171 src/file.c:3392 src/translate.c:340
-#: src/translate.c:359 src/translate.c:379
+#: src/cd_audio.c:1764 src/dvd.c:1187 src/file.c:3403
+#: glade/xcfa_win_treeview.glade:180 glade/xcfa_win_treeview.glade:560
+#: glade/xcfa_win_treeview.glade:961
 msgid "Normalise"
 msgstr "Normalise"
 
-#: src/cd_audio.c:1785 src/dvd.c:1191 src/file.c:3434 src/file_mp3ogg.c:1287
-#: src/file_tags.c:1209 src/file_wav.c:952 src/prg_init.c:614
-#: src/translate.c:341 src/translate.c:360 src/translate.c:381
-#: src/translate.c:393 src/translate.c:404 src/translate.c:412
-msgid "Nom"
+#: src/cd_audio.c:1789 src/dvd.c:1207 src/file.c:3445 src/file_mp3ogg.c:964
+#: src/file_tags.c:1253 src/file_wav.c:830 src/prg_init.c:609
+msgid "Name"
 msgstr "Nom"
 
-#: src/cd_audio.c:2507
-msgid " Parametrage CDDB: [ Nom du serveur ]"
+#: src/cd_audio.c:2517
+msgid " Setting up CDDB: [ Server name ]"
 msgstr " Paramétrage CDDB: [ Nom du serveur ]"
 
-#: src/cd_audio.c:2516
-msgid " Parametrage PROXY: [ serveur ] [ port ]"
+#: src/cd_audio.c:2526
+msgid " Proxy settings: [ server ] [ port ] "
 msgstr " Paramétrage PROXY: [ serveur ] [ port ]"
 
-#: src/cd_audio.c:2526 src/translate.c:99
-msgid " Serveur "
+#: src/cd_audio.c:2536 glade/xcfa.glade:1842
+msgid " Server "
 msgstr " Serveur "
 
-#: src/cd_audio_extract.c:661
+#: src/cd_audio_extract.c:673
 #, c-format
-msgid ""
-"[Erreur du segment numero: %d]\n"
-"%d) Lecture PASS 1/2\n"
+msgid "[Error on segment #%d] %d) Playing PASS 1/2\n"
 msgstr ""
 "[Erreur du segment numéro: %d]\n"
 "%d) Lecture PASS 1/2\n"
 
-#: src/cd_audio_extract.c:668
+#: src/cd_audio_extract.c:680
 #, c-format
 msgid ""
-"--> Deja %d fois 2 lectures du segment %d!\n"
+"--> Segment %d already read two %d times!\n"
 " Abandon :/\n"
 msgstr ""
 "--> Déjà %d fois 2 lectures du segment %d!\n"
 " Abandon :/\n"
 
-#: src/cd_audio_extract.c:688
+#: src/cd_audio_extract.c:700
 #, c-format
-msgid "%d) Lecture PASS 2/2\n"
+msgid "%d) Read PASS 2/2\n"
 msgstr "%d) Lecture PASS 2/2\n"
 
-#: src/cd_audio_extract.c:769
+#: src/cd_audio_extract.c:780
 #, c-format
 msgid ""
 "\n"
-"[Piste: %d]\n"
+"[Track: %d]\n"
 msgstr ""
 "\n"
 "[Piste: %d]\n"
 
-#: src/cd_audio_extract.c:773
-msgid "Extraction mode expert PASS 1/2\n"
+#: src/cd_audio_extract.c:784
+msgid "Ripping expert mode PASS 1/2\n"
 msgstr "Extraction mode expert PASS 1/2\n"
 
-#: src/cd_audio_extract.c:784
-msgid "Extraction mode expert PASS 2/2\n"
+#: src/cd_audio_extract.c:795
+msgid "Ripping expert mode PASS 2/2\n"
 msgstr "Extraction mode expert PASS 2/2\n"
 
-#: src/cd_audio_extract.c:792
-msgid "Controle du contenu des fichiers extraits\n"
+#: src/cd_audio_extract.c:803
+msgid "Control the content of the extracted files\n"
 msgstr "Côntrole du contenu des fichiers extraits\n"
 
-#: src/cd_audio_extract.c:1678 src/cd_audio_extract.c:1680
+#: src/cd_audio_extract.c:1710 src/cd_audio_extract.c:1712
 msgid "XCFA: Extraction CD"
 msgstr "XCFA: Extraction CD"
 
-#: src/cd_audio_extract.c:1678 src/dvd_extract.c:412 src/file_action.c:190
-#: src/file_mp3ogg_conv.c:300 src/file_wav_conv.c:349
+#: src/cd_audio_extract.c:1710 src/dvd_extract.c:412 src/file_action.c:183
+#: src/file_mp3ogg_conv.c:329 src/file_wav_conv.c:343
 msgid "Ok"
 msgstr "Ok"
 
-#: src/cd_audio_extract.c:1680 src/dvd_extract.c:414 src/file_action.c:192
-#: src/file_mp3ogg_conv.c:302 src/file_wav_conv.c:351
-msgid "Arret par l'utilisateur"
+#: src/cd_audio_extract.c:1712 src/dvd_extract.c:414 src/file_action.c:185
+#: src/file_mp3ogg_conv.c:331 src/file_wav_conv.c:345
+msgid "Stop by user"
 msgstr "Arrêt par l'utilisateur"
 
-#: src/cd_audio_extract.c:1938
-msgid "Nom de fichier unique absent"
-msgstr "Nom de fichier unique absent"
+#: src/cd_audio_extract.c:1983
+msgid "File name not found"
+msgstr "Nom de fichier absent"
 
-#: src/cd_audio_extract.c:1939
-msgid "Veuillez saisir un nom pour le fichier unique"
-msgstr "Veuillez saisir un nom pour le fichier unique"
+#: src/cd_audio_extract.c:1984
+msgid "Please enter a file name"
+msgstr "Veuillez saisir un nom de fichier"
 
-#: src/cd_audio_toc.c:160
+#: src/cd_audio_toc.c:156
 msgid "cdda2wav and icedax NOT FOUND"
-msgstr "cdda2wav and icedax NOT FOUND"
+msgstr "cdda2wav and icedax absent"
 
-#: src/cd_audio_toc.c:161
+#: src/cd_audio_toc.c:157
 msgid "Please, install packages [ icedax, cdda2wav ]"
-msgstr "Please, install packages [ icedax, cdda2wav ]"
+msgstr "Veuillez installer les paquets [ icedax, cdda2wav ]"
 
-#: src/cd_audio_toc.c:166
+#: src/cd_audio_toc.c:163
 msgid "icedax NOT FOUND"
-msgstr "icedax NOT FOUND"
+msgstr "icedax absent"
 
-#: src/cd_audio_toc.c:167
+#: src/cd_audio_toc.c:164
 msgid "Please, install package [ icedax ]"
-msgstr "Please, install package [ icedax ]"
+msgstr "Veuillez installer le paquet [ icedax ]"
 
-#: src/cd_audio_toc.c:172
+#: src/cd_audio_toc.c:170
 msgid "cdda2wav NOT FOUND"
-msgstr "cdda2wav NOT FOUND"
+msgstr "cdda2wav absent"
 
-#: src/cd_audio_toc.c:173
+#: src/cd_audio_toc.c:171
 msgid "Please, install package [ cdda2wav ]"
-msgstr "Please, install package [ cdda2wav ]"
+msgstr "Veuillez installer le paquet [ cdda2wav ]"
 
-#: src/cd_audio_toc.c:181
+#: src/cd_audio_toc.c:180
 msgid "cdparanoia NOT FOUND"
-msgstr "cdparanoia NOT FOUND"
+msgstr "cdparanoia absent"
 
-#: src/cd_audio_toc.c:182
+#: src/cd_audio_toc.c:181
 msgid "Please, install package [ cdparanoia ]"
-msgstr "Please, install package [ cdparanoia ]"
+msgstr "Veuillez installer le paquet [ cdparanoia ]"
 
 #: src/cd_audio_toc.c:188
 msgid "cd-discid NOT FOUND"
-msgstr "cd-discid NOT FOUND"
+msgstr "cd-discid absent"
 
 #: src/cd_audio_toc.c:189
 msgid "Please, install packages [ cd-discid ]"
-msgstr "Please, install packages [ cd-discid ]"
+msgstr "Veuillez installer le paquet [ cd-discid ]"
 
-#: src/cd_audio_toc.c:202
-msgid "ERREUR datas proxy"
+#: src/cd_audio_toc.c:203
+msgid "ERROR datas proxy"
 msgstr "ERREUR datas proxy"
 
-#: src/cd_audio_toc.c:203
-msgid "Veuillez renseigner les champs du proxy"
-msgstr "Veuillez renseigner les champs du proxy"
+#: src/cd_audio_toc.c:204
+msgid "Please complete all fields proxy"
+msgstr "Veuillez compléter les champs du proxy"
 
-#: src/cd_curl.c:718 src/web.c:160
-msgid "La liaison internet est absente"
-msgstr "La liaison internet est absente"
+#: src/cd_curl.c:734 src/web.c:187
+msgid "A web connection is missing"
+msgstr "La connexion internet est absente"
 
-#: src/cd_curl.c:1122
+#: src/cd_curl.c:1204
 msgid "Couldn't find CD"
-msgstr "Couldn't find CD"
+msgstr "CD absent"
 
-#: src/cd_curl.c:1185
+#: src/cd_curl.c:1267
 msgid "No Audio CD"
-msgstr "No Audio CD"
+msgstr "CD absent"
 
-#: src/dvd.c:863
+#: src/dvd.c:877
 msgid ""
-"(Click Droit = Menu) / PEAK-ALBUM: Amplification maximale du volume pour un "
-"groupe de fichiers en respectant les ecarts de niveau entre chacun d'eux."
+"(Right click = Menu) / Maximum volume amplification of a group of files "
+"keeping the level difference between each of them."
 msgstr ""
-"(Click Droit = Menu) / PEAK-ALBUM: Amplification maximale du volume pour un "
-"groupe de fichiers en respectant les écarts de niveau entre chacun d'eux."
+"(Click Droit = Menu) / Amplification de volume maximale d'un groupe de "
+"fichiers de maintien de la différence de niveau entre chacun d'eux."
 
-#: src/dvd.c:866
-msgid ""
-"(Click Droit = Menu) / PEAK: Amplification maximale du volume pour chaque de "
-"fichier."
-msgstr ""
-"(Click Droit = Menu) / PEAK: Amplification maximale du volume pour chaque de "
-"fichier."
+#: src/dvd.c:882 src/file.c:2882
+msgid "PEAK: Maximum volume amplification of each file."
+msgstr "PEAK: L'amplification du volume maximum de chaque fichier."
+
+#: src/dvd.c:887
+msgid "(Right click = Menu) / ReplayGain: Waiting for selection."
+msgstr "(Click Droit = Menu) / ReplayGain: En attente de sélection."
 
-#: src/dvd.c:904 src/dvd.c:924
-msgid "En attente de selection. Un click activera la conversion vers 2 canaux."
+#: src/dvd.c:920 src/dvd.c:940
+msgid ""
+"Waiting for selection. A click will activate the conversion to 2 channels."
 msgstr ""
 "En attente de sélection. Un click activera la conversion vers 2 canaux."
 
-#: src/dvd.c:916
-msgid "Conversion vers 2 canaux."
+#: src/dvd.c:932
+msgid "Conversion to 2 channels."
 msgstr "Conversion vers 2 canaux."
 
-#: src/dvd.c:928
+#: src/dvd.c:944
 #, c-format
-msgid "Conversion vers %s canaux."
+msgid "Conversion to %s channels."
 msgstr "Conversion vers %s canaux."
 
-#: src/dvd.c:933
+#: src/dvd.c:949
 #, c-format
 msgid ""
-"Conversion vers 2 canaux. Un second click activera la conversion vers %s "
-"canaux."
+"Conversion to 2 channels. A second click will activate the conversion to %s "
+"channels."
 msgstr ""
 "Conversion vers 2 canaux. Un second click activera la conversion vers %s "
 "canaux."
 
-#: src/dvd.c:948
-msgid "Musique en ecoute."
-msgstr "Musique en écoute."
+#: src/dvd.c:964
+msgid "Playing music."
+msgstr "Lecture."
 
-#: src/dvd.c:951
-msgid "Musique en attente."
-msgstr "Musique en attente."
+#: src/dvd.c:967
+msgid "Music paused."
+msgstr "Pause."
 
-#: src/dvd.c:966
+#: src/dvd.c:982
 #, c-format
 msgid "Total selection%s: %d, 2ch: %d"
 msgstr "Total sélection%s: %d, 2ch: %d"
 
-#: src/dvd.c:967
+#: src/dvd.c:983
 msgid "s"
 msgstr "s"
 
-#: src/dvd.c:973
-msgid "Ce fichier ne peut etre extrait !"
-msgstr "Ce fichier ne peut être extrait !"
+#: src/dvd.c:989
+msgid "This file can not be ripped !"
+msgstr "Ce fichier ne peut pas être rippé !"
 
-#: src/dvd.c:1091
-msgid "Titres"
+#: src/dvd.c:1107
+msgid "Titles"
 msgstr "Titres"
 
-#: src/dvd.c:1115 src/file.c:3375 src/file_mp3ogg.c:1272 src/file_tags.c:1193
-#: src/translate.c:337
-msgid "Temps"
+#: src/dvd.c:1119 glade/xcfa_win_treeview.glade:112
+#: glade/xcfa_win_treeview.glade:356 glade/xcfa_win_treeview.glade:740
+msgid "Play"
+msgstr "Play"
+
+#: src/dvd.c:1131 src/file.c:3386 src/file_mp3ogg.c:949 src/file_tags.c:1237
+#: glade/xcfa_win_treeview.glade:543 glade/xcfa_win_treeview.glade:944
+#: glade/xcfa_win_treeview.glade:1491 glade/xcfa_win_treeview.glade:1689
+msgid "Time"
 msgstr "Temps"
 
-#: src/dvd.c:1127 src/translate.c:338
+#: src/dvd.c:1143 glade/xcfa_win_treeview.glade:146
 msgid "Format"
 msgstr "Format"
 
-#: src/dvd.c:1139 src/translate.c:339
-msgid "Choix"
+#: src/dvd.c:1155
+msgid "Choice"
 msgstr "Choix"
 
-#: src/dvd.c:1253
-msgid "Fichier structure DVD"
+#: src/dvd.c:1267
+msgid "DVD file structure"
 msgstr "Fichier structure DVD"
 
-#: src/dvd.c:1303
-msgid "Le DVD est absent du lecteur."
-msgstr "Le DVD est absent du lecteur."
+#: src/dvd.c:1320
+msgid "The DVD player is absent."
+msgstr "Player dvd absent"
 
-#: src/dvd.c:1338
-msgid "Scan ..."
-msgstr "Scan ..."
-
-#: src/dvd.c:1387
-msgid "lsdvd est absent !"
+#: src/dvd.c:1410
+msgid "lsdvd is missing !"
 msgstr "lsdvd est absent !"
 
-#: src/dvd.c:1388
-msgid "Il faut installer le programme: lsdvd"
+#: src/dvd.c:1411
+msgid "You must install the program: lsdvd"
 msgstr "Il faut installer le programme: lsdvd"
 
 #: src/dvd_extract.c:412 src/dvd_extract.c:414
-msgid "XCFA: Extraction DVD"
-msgstr "XCFA: Extraction DVD"
+msgid "XCFA: DVD rip"
+msgstr "XCFA: DVD ri"
 
-#: src/dvd_read.c:267
+#: src/dvd_read.c:226
 #, c-format
-msgid "Titre [%02d ** ]"
+msgid "Title [%02d ** ]"
 msgstr "Titre [%02d ** ]"
 
-#: src/dvd_read.c:270
+#: src/dvd_read.c:227
 #, c-format
-msgid "Titre [%02d]"
+msgid "Title [%02d]"
 msgstr "Titre [%02d]"
 
-#: src/dvd_read.c:313
-#, c-format
-msgid "Fichier_complet_%02d_%s"
-msgstr "Fichier_complet_%02d_%s"
-
-#: src/dvd_read.c:357
+#: src/dvd_read.c:252
 #, c-format
-msgid "Chapitre: [%02d]"
+msgid "Chapter: [%02d]"
 msgstr "Chapitre: [%02d]"
 
-#: src/dvd_read.c:402
-#, c-format
-msgid "Titre_%02d_Chapitre_%02d_audio_%02d_%s"
-msgstr "Titre_%02d_Chapitre_%02d_audio_%02d_%s"
-
-#: src/file_action.c:190 src/file_action.c:192
-msgid "XCFA: Traitement fichiers"
-msgstr "XCFA: Traitement fichiers"
+#: src/file_action.c:183 src/file_action.c:185
+msgid "XCFA: Processing files"
+msgstr "XCFA: Traitement en cours"
 
-#: src/file_analyze.c:624
+#: src/file_analyze.c:731
 msgid "Package checkmp3 (mp3check) NOT FOUND !"
-msgstr "Package checkmp3 (mp3check) NOT FOUND !"
+msgstr "Paquets checkmp3 (mp3check) absents !"
 
-#: src/file_analyze.c:625
+#: src/file_analyze.c:732
 msgid ""
-"Veuillez installer checkmp3 ou mp3check pour\n"
-"la prise en compte des fichiers mp3"
+"Please install or checkmp3 mp3check for\n"
+"consideration of mp3 files"
 msgstr ""
 "Veuillez installer checkmp3 ou mp3check pour\n"
 "la prise en compte des fichiers mp3"
 
-#: src/file.c:332
+#: src/file.c:327
 #, c-format
-msgid "Total fichiers: %d, Selections: %d"
+msgid "Total files: %d, Selections: %d"
 msgstr "Total fichiers: %d, Sélections: %d"
 
-#: src/file.c:445
-msgid "CAPACITE DOSSIER TEMPORAIRE TROP FAIBLE"
-msgstr "CAPACITE DOSSIER TEMPORAIRE TROP FAIBLE"
+#: src/file.c:441
+msgid "TEMPORARY CAPACITY TOO LOW"
+msgstr "CAPACITE TEMPORAIRE TROP FAIBLE"
 
-#: src/file.c:446
-msgid "Pas assez de place dans le dossier temporaire"
-msgstr "Pas assez de place dans le dossier temporaire."
+#: src/file.c:442 src/file.c:2875
+msgid "WARNING: Not enough space available in the temp folder."
+msgstr "WARNING: Pas assez d'espace dans le dossier temporaire."
 
-#: src/file.c:452
-msgid "Veuillez deselectionner des PeakGroup."
+#: src/file.c:448
+msgid "Please deselect PeakGroup."
 msgstr "Veuillez déselectionner des PeakGroup."
 
-#: src/file.c:1439
-msgid "Conversion(s) vers la source"
+#: src/file.c:1431
+msgid "Conversion(s) to source"
 msgstr "Conversion(s) vers la source"
 
-#: src/file.c:1440
-msgid "Choix d'une nouvelle destination"
-msgstr "Choix d'une nouvelle destination"
+#: src/file.c:1432
+msgid "Select a new destination"
+msgstr "Sélectionnez une nouvelle destination"
 
-#: src/file.c:1510
+#: src/file.c:1501
 msgid "Select type: --"
 msgstr "Select type: --"
 
-#: src/file.c:1595
+#: src/file.c:1584
 msgid "Peak/album"
 msgstr "Peak/album"
 
-#: src/file.c:1596
+#: src/file.c:1585
 msgid "Peak"
 msgstr "Peak"
 
-#: src/file.c:1597
+#: src/file.c:1586
 msgid "Mix (scan)Rms/album"
 msgstr "Mix (scan)Rms/album"
 
-#: src/file.c:1598
+#: src/file.c:1587
 msgid "Fix (scan)Rms"
 msgstr "Fix (scan)Rms"
 
-#: src/file.c:2854
+#: src/file.c:2834
+msgid "The external ripping program is missing"
+msgstr "Le programme d'extraction est absent"
+
+#: src/file.c:2840
+msgid "(Right click = Menu) / Waiting for Selection. File exists."
+msgstr "(Click Droit = Menu) / En sélection. Le fichier existe."
+
+#: src/file.c:2843
+msgid "(Right click = Menu) / Selected files"
+msgstr "(Click Droit = Menu) / En sélection."
+
+#: src/file.c:2861
 #, c-format
-msgid "MAX FICHIERS ATTEINT = %d"
+msgid "MAX FILES REACHED = %d"
 msgstr "MAX FICHIERS ATTEINT = %d"
 
-#: src/file.c:2864
-msgid "Normalise: En attente de selection."
+#: src/file.c:2871
+msgid "Normalise: Waiting for selection."
 msgstr "Normalise: En attente de sélection."
 
-#: src/file.c:2868
-msgid "ATTENTION: Pas assez de place dans le dossier temporaire."
-msgstr "ATTENTION: Pas assez de place dans le dossier temporaire."
-
-#: src/file.c:2871
+#: src/file.c:2878
 msgid ""
-"PEAK-ALBUM: Amplification maximale du volume pour un groupe de fichiers en "
-"respectant les ecarts de niveau entre chacun d'eux."
+"PEAK-ALBUM: Maximum volume amplification for a group of files according to "
+"the deviations in level between them"
 msgstr ""
-"PEAK-ALBUM: Amplification maximale du volume pour un groupe de fichiers en "
-"respectant les écarts de niveau entre chacun d'eux."
-
-#: src/file.c:2875
-msgid "PEAK: Amplification maximale du volume pour chaque de fichier."
-msgstr "PEAK: Amplification maximale du volume pour chaque de fichier."
+"PEAK-ALBUM: Amplification de volume maximum pour un groupe de fichiers en "
+"fonction des écarts de niveau entre eux"
 
-#: src/file.c:2878
+#: src/file.c:2885
 msgid ""
-"RMS-ALBUM: Ajustement du volume moyen pour un groupe de fichiers en "
-"respectant les ecarts de niveau moyen entre chacun d'eux."
+"RMS-ALBUM: Adjusting the average volume for a group of files according to "
+"the average level of deviation between them."
 msgstr ""
-"RMS-ALBUM: Ajustement du volume moyen pour un groupe de fichiers en "
-"respectant les écarts de niveau moyen entre chacun d'eux."
+"RMS-ALBUM: Réglage du volume moyen d'un groupe de fichiers en fonction du "
+"niveau moyen de déviation entre eux."
 
-#: src/file.c:2881
-msgid "RMS: Ajustement du volume moyen de chaque de fichier."
-msgstr "RMS: Ajustement du volume moyen de chaque de fichier."
+#: src/file.c:2888
+msgid "RMS: Average volume amplification of each file."
+msgstr "RMS: Amplification du volume moyen de chaque fichier."
 
-#: src/file.c:2895
-msgid "(Click Droit = Menu) / ReplayGain: En attente de selection."
+#: src/file.c:2902
+msgid "(Right Click = Menu) / ReplayGain: Waiting for selection."
 msgstr "(Click Droit = Menu) / ReplayGain: En attente de sélection."
 
-#: src/file.c:2898
-msgid "(Click Droit = Menu) / Mode piste."
+#: src/file.c:2905
+msgid "(Right Click = Menu) / Track mode."
 msgstr "(Click Droit = Menu) / Mode piste"
 
-#: src/file.c:2901
-msgid "(Click Droit = Menu) / Mode album."
+#: src/file.c:2908
+msgid "(Right Click = Menu) / Album mode."
 msgstr "(Click Droit = Menu) / Mode album."
 
-#: src/file.c:2904
-msgid "(Click Droit = Menu) / Mode effacer."
-msgstr "(Click Droit = Menu) / Mode effacer."
+#: src/file.c:2911
+msgid "(Right Click = Menu) / Erase mode."
+msgstr "(Click Droit = Menu) / En sélection."
 
-#: src/file.c:3016
+#: src/file.c:3026
 msgid ""
-"(Click Droit = Menu) / Cliquez ici pour envoyer ce fichier apres traitement "
-"a la corbeille"
-msgstr ""
-"(Click Droit = Menu) / Cliquez ici pour envoyer ce fichier après traitement "
-"à la corbeille"
+"(Click Droit = Menu) / Click here to send the processed file to the trash"
+msgstr "(Click Droit = Menu) / Choix du codage en nombre de bits"
 
-#: src/file.c:3019
+#: src/file.c:3029
 msgid ""
-"(Click Droit = Menu) / Ce fichier sera dirige apres traitement vers la "
-"corbeille"
+"(Right Click = Menu) / This file will be sent to the trash after processing"
 msgstr ""
-"(Click Droit = Menu) / Ce fichier sera dirigé apres traitement vers la "
-"corbeille"
+"(Click Droit = Menu) / Ce fichier sera envoyé à la poubelle après traitement"
 
-#: src/file.c:3152 src/file_trash.c:367 src/translate.c:367
+#: src/file.c:3163 src/file_trash.c:208 glade/xcfa_win_treeview.glade:757
 msgid "Trash"
-msgstr "Trash"
+msgstr "Poubelle"
 
-#: src/file.c:3172 src/file_mp3ogg.c:1212 src/file_tags.c:1178
-#: src/translate.c:368 src/translate.c:399 src/translate.c:410
+#: src/file.c:3183 src/file_mp3ogg.c:889 src/file_tags.c:1222
+#: glade/xcfa_win_treeview.glade:774 glade/xcfa_win_treeview.glade:1423
+#: glade/xcfa_win_treeview.glade:1672
 msgid "Type"
 msgstr "Type"
 
-#: src/file.c:3411
-msgid "ReplayGain"
-msgstr "ReplayGain"
-
-#: src/file_mp3ogg.c:771
-msgid "128 -defaut"
-msgstr "128 -défaut"
-
-#: src/file_mp3ogg.c:787
-msgid "V0 -meilleure qualite"
-msgstr "V0 -meilleure qualité"
-
-#: src/file_mp3ogg.c:791 src/file_mp3ogg.c:811
-msgid "V4 -defaut"
-msgstr "V4 -défaut"
-
-#: src/file_mp3ogg.c:796
-msgid "V9 -moins bonne qualite"
-msgstr "V9 -moins bonne qualité"
-
-#: src/file_mp3ogg.c:849
-msgid "Defaut"
-msgstr "Défaut"
-
-#: src/file_mp3ogg.c:884
-msgid "Qualite -1 -Moins bonne qualite"
-msgstr "Qualité -1 -Moins bonne qualité"
-
-#: src/file_mp3ogg.c:885 src/options_oggenc.c:149
-msgid "Qualite 0"
-msgstr "Qualité 0"
-
-#: src/file_mp3ogg.c:886 src/options_oggenc.c:150
-msgid "Qualite 1"
-msgstr "Qualité 1"
-
-#: src/file_mp3ogg.c:887 src/options_oggenc.c:151
-msgid "Qualite 2"
-msgstr "Qualité 2"
-
-#: src/file_mp3ogg.c:888
-msgid "Qualite 3 -Defaut"
-msgstr "Qualité 3 -Defaut"
-
-#: src/file_mp3ogg.c:889 src/options_oggenc.c:153
-msgid "Qualite 4"
-msgstr "Qualité 4"
-
-#: src/file_mp3ogg.c:890 src/options_oggenc.c:154
-msgid "Qualite 5"
-msgstr "Qualité 5"
-
-#: src/file_mp3ogg.c:891 src/options_oggenc.c:155
-msgid "Qualite 6"
-msgstr "Qualité 6"
-
-#: src/file_mp3ogg.c:892 src/options_oggenc.c:156
-msgid "Qualite 7"
-msgstr "Qualité 7"
+#: src/file_conv.c:1187
+msgid "Error since MPLAYER !"
+msgstr "Erreur depuis MPLAYER !"
 
-#: src/file_mp3ogg.c:893 src/options_oggenc.c:157
-msgid "Qualite 8"
-msgstr "Qualité 8"
+#: src/file_conv.c:1188 src/file_conv.c:1200 src/file_mp3ogg_conv.c:337
+#: src/file_mp3ogg_conv.c:349
+msgid "You can enable XCFA command line with: "
+msgstr "Vous pouvez activer XCFA en ligne de commande avec:"
 
-#: src/file_mp3ogg.c:894 src/options_oggenc.c:158
-msgid "Qualite 9"
-msgstr "Qualité 9"
+#: src/file_conv.c:1190 src/file_conv.c:1202 src/file_mp3ogg_conv.c:339
+#: src/file_mp3ogg_conv.c:351
+msgid "$ xcfa -verbose"
+msgstr "$ xcfa -verbose"
 
-#: src/file_mp3ogg.c:895
-msgid "Qualite 10 -Meilleure qualite"
-msgstr "Qualité 10 -Meilleure qualité"
+#: src/file_conv.c:1192 src/file_mp3ogg_conv.c:341
+msgid "to see the type of error returned by mplayer."
+msgstr "pour consulter le type d'erreur renvoyé par mplayer."
 
-#: src/file_mp3ogg.c:926 src/options_oggenc.c:189 src/options_wavpack.c:186
-#: src/options_wavpack.c:209 src/options_wavpack.c:232
-msgid "Oui"
-msgstr "Oui"
+#: src/file_conv.c:1199
+msgid "Error since SOX !"
+msgstr "Erreur depuis SOX !"
 
-#: src/file_mp3ogg.c:927 src/options_oggenc.c:190 src/options_wavpack.c:153
-#: src/options_wavpack.c:185 src/options_wavpack.c:208
-#: src/options_wavpack.c:231 src/options_wavpack.c:252
-msgid "Non"
-msgstr "Non"
+#: src/file_conv.c:1204 src/file_mp3ogg_conv.c:353
+msgid "to see the type of error returned by sox."
+msgstr "pour consulter le type d'erreur renvoyé par sox."
 
-#: src/file_mp3ogg.c:949 src/options_oggenc.c:211
-msgid "Mono force"
-msgstr "Mono forcé"
+#: src/file_mp3ogg.c:670
+msgid "Right click: access popup"
+msgstr "Click droit: accès popup"
 
-#: src/file_mp3ogg.c:950 src/options_oggenc.c:212
-msgid "Stereo"
-msgstr "Stéréo"
+#: src/file_mp3ogg.c:921
+msgid "New bitrate"
+msgstr "Nouveau Bitrate"
 
-#: src/file_mp3ogg.c:1228 src/translate.c:400
-msgid "Bitrate"
-msgstr "Bitrate"
+#: src/file_mp3ogg.c:935 glade/xcfa_win_treeview.glade:1474
+msgid "Size"
+msgstr "Taille"
 
-#: src/file_mp3ogg.c:1244
-msgid "Nouveau bitrate"
-msgstr "Nouveau bitrate"
+#: src/file_mp3ogg_conv.c:329 src/file_mp3ogg_conv.c:331
+msgid "XCFA: Bitrate change"
+msgstr "XCFA: Traitement fichiers"
 
-#: src/file_mp3ogg.c:1258
-msgid "Taille"
-msgstr "Taille"
+#: src/file_mp3ogg_conv.c:336
+msgid "Error from MPLAYER !"
+msgstr "Erreur depuis MPLAYER !"
 
-#: src/file_mp3ogg_conv.c:300 src/file_mp3ogg_conv.c:302
-msgid "XCFA: Modification bitrate"
-msgstr "XCFA: Modification bitrate"
+#: src/file_mp3ogg_conv.c:348
+msgid "Error from SOX !"
+msgstr "Erreur depuis SOX !"
 
-#: src/file_mp3ogg_conv.c:379
+#: src/file_mp3ogg_conv.c:432
 #, c-format
-msgid " ATTENTION: Il faut installer %s%s%s"
+msgid " WARNING : you need to install %s%s%s"
 msgstr " ATTENTION: Il faut installer %s%s%s"
 
-#: src/file_mp3ogg_conv.c:387
+#: src/file_mp3ogg_conv.c:440
 #, c-format
-msgid " ATTENTION: Il faut installer %s%s"
+msgid " WARNING : you need to install %s%s"
 msgstr " ATTENTION: Il faut installer %s%s"
 
-#: src/file_mp3ogg_conv.c:394
+#: src/file_mp3ogg_conv.c:447
 #, c-format
-msgid " ATTENTION: Il faut installer %s"
+msgid " WARNING : you need to install %s"
 msgstr " ATTENTION: Il faut installer %s"
 
-#: src/file_mp3ogg_conv.c:400
+#: src/file_mp3ogg_conv.c:454
 msgid "Package NOT FOUND !"
-msgstr "Package NOT FOUND !"
+msgstr "Paquet absent !"
 
-#: src/fileselect.c:116
-msgid "Choix d'un dossier de destination"
+#: src/fileselect.c:105
+msgid "Choosing a destination folder"
 msgstr "Choix d'un dossier de destination"
 
-#: src/fileselect.c:117
-msgid "Choix d'un fichier CUE WAV FLAC OGG MP3 APE WMA"
+#: src/fileselect.c:106
+msgid "Choosing a file CUE WAV FLAC OGG MP3 APE WMA"
 msgstr "Choix de fichiers CUE WAV FLAC OGG MP3 APE WMA"
 
-#: src/fileselect.c:118
-msgid "Choix d'un fichier musical"
+#: src/fileselect.c:107
+msgid "Choosing a file musical"
 msgstr "Choix d'un fichier musical"
 
-#: src/fileselect.c:119
-msgid "Choix d'un fichier"
-msgstr "Choix d'un fichier"
+#: src/fileselect.c:108 src/fileselect.c:109
+msgid "Choosing a file"
+msgstr "Choisir un fichier"
 
-#: src/fileselect.c:120
-msgid "Choix de fichiers"
-msgstr "Choix de fichiers"
+#: src/fileselect.c:110
+msgid "Choosing a WAV file"
+msgstr "Choisir un fichier WAV"
 
-#: src/fileselect.c:121
-msgid "Choix de fichiers WAV"
-msgstr "Choix de fichiers WAV"
+#: src/fileselect.c:111
+msgid "Choosing a MP3 OGG file"
+msgstr "Choisir un fichier MP3 OGG"
 
-#: src/fileselect.c:122
-msgid "Choix de fichiers MP3/OGG"
-msgstr "Choix de fichiers MP3/OGG"
-
-#: src/fileselect.c:123
-msgid "Choix de fichiers FLAC MPC OGG MP3"
+#: src/fileselect.c:112
+msgid "Choosing a FLAC MPC OGG MP3 file"
 msgstr "Choix de fichiers FLAC MPC OGG MP3"
 
-#: src/fileselect.c:124
-msgid "Importer des images pour la pochette"
-msgstr "Importer des images pour la pochette"
+#: src/fileselect.c:113
+msgid "Import pictures for the cover"
+msgstr "Importer des images pour la couverture"
+
+#: src/fileselect.c:114
+msgid "Choosing an Image Storage path"
+msgstr "Choisir un chemin stockage de l'image"
 
-#: src/fileselect.c:125
-msgid "Choix d'un chemin de stockage des images"
-msgstr "Choix d'un chemin de stockage des images"
+#: src/fileselect.c:115
+msgid "Choosing a place for backup"
+msgstr "Choisir un lieu pour la sauvegarde"
 
-#: src/fileselect.c:126
-msgid "Choix d'un lieu de sauvegarde"
-msgstr "Choix d'un lieu de sauvegarde"
+#: src/fileselect.c:396 src/fileselect.c:415 src/fileselect.c:703
+msgid "Cancel"
+msgstr "Abandon"
 
-#: src/fileselect.c:475 src/fileselect.c:591 src/fileselect.c:599
-#: src/fileselect.c:622
+#: src/fileselect.c:398 src/fileselect.c:417 src/fileselect.c:705
+msgid "Open"
+msgstr "Ouvrir"
+
+#: src/fileselect.c:494 src/fileselect.c:617 src/fileselect.c:627
+#: src/fileselect.c:650
 msgid "All Files (*.*)"
 msgstr "All Files (*.*)"
 
-#: src/file_trash.c:368
+#: src/file_trash.c:211
 msgid "Trash files ..."
 msgstr "Trash files ..."
 
-#: src/file_wav.c:629
-msgid "(Click Droit = Menu) / Choix de la frequence"
+#: src/file_wav.c:485
+msgid "(Right Click = Menu) / Select frequency"
 msgstr "(Click Droit = Menu) / Normalise: En attente de sélection."
 
-#: src/file_wav.c:632
-msgid "(Click Droit = Menu) / Choix du nombre de pistes (voies)"
-msgstr "(Click Droit = Menu) / Choix du nombre de pistes (voies)"
+#: src/file_wav.c:488
+msgid "(Right Click = Menu) / Select number of tracks (channels)"
+msgstr "(Click Droit = Menu) / Sélection du nombre de pistes"
 
-#: src/file_wav.c:635
-msgid "(Click Droit = Menu) / Choix du codage en nombre de bits"
-msgstr "(Click Droit = Menu) / Choix du codage en nombre de bits"
+#: src/file_wav.c:491
+msgid "(Right Click = Menu) / Encoding selection in number of bits"
+msgstr "(Click Droit = Menu) / En sélection. Le fichier existe."
 
-#: src/file_wav.c:861
-msgid "Frequence"
+#: src/file_wav.c:739
+msgid "Frequency"
 msgstr "Fréquence"
 
-#: src/file_wav.c:877
-msgid "FREQUENCE"
+#: src/file_wav.c:755
+msgid "FREQUENCY"
 msgstr "FREQUENCE"
 
-#: src/file_wav.c:891
-msgid "Piste"
+#: src/file_wav.c:769
+msgid "Track"
 msgstr "Piste"
 
-#: src/file_wav.c:907
-msgid "PISTE"
+#: src/file_wav.c:785
+msgid "TRACK"
 msgstr "PISTE"
 
-#: src/file_wav.c:921
+#: src/file_wav.c:799
 msgid "Quantification"
 msgstr "Quantification"
 
-#: src/file_wav.c:937
+#: src/file_wav.c:815
 msgid "QUANTIFICATION"
 msgstr "QUANTIFICATION"
 
-#: src/file_wav_conv.c:265
+#: src/file_wav_conv.c:261
 #, c-format
-msgid "%s Copie fichier: %d%%"
+msgid "%s Copy file: %d%%"
 msgstr "%s Copie fichier: %d%%"
 
-#: src/file_wav_conv.c:275
+#: src/file_wav_conv.c:271
 #, c-format
-msgid "%s Restitution fichier: %d%%"
+msgid "%s Return file: %d%%"
 msgstr "%s Restitution fichier: %d%%"
 
-#: src/file_wav_conv.c:285
+#: src/file_wav_conv.c:281
 #, c-format
-msgid "%s Traitement Sox: %d%%"
+msgid "%s Use Sox: %d%%"
 msgstr "%s Traitement Sox: %d%%"
 
-#: src/file_wav_conv.c:302
+#: src/file_wav_conv.c:298
 #, c-format
-msgid "%s Traitement Mplayer: %d%%"
+msgid "%s Use Mplayer: %d%%"
 msgstr "%s Traitement Mplayer: %d%%"
 
-#: src/file_wav_conv.c:349 src/file_wav_conv.c:351
+#: src/file_wav_conv.c:343 src/file_wav_conv.c:345
 msgid "XCFA: Conversions WAV TO WAV"
 msgstr "XCFA: Conversions WAV TO WAV"
 
-#: src/main.c:372
-msgid "= Adressage memoire invalide\n"
-msgstr "= Adressage mémoire invalide\n"
-
-#: src/main.c:375
-msgid "= Vous avez probablement trouve un bug dans XCFA\n"
-msgstr "= Vous avez probablement trouvé un bug dans XCFA\n"
-
-#: src/main.c:676
-msgid "MODE ADMINISTRATEUR"
+#: src/main.c:644
+msgid "ADMINISTRATOR MODE"
 msgstr "MODE ADMINISTRATEUR"
 
-#: src/main.c:678
-msgid " Vous ne devriez pas utiliser "
+#: src/main.c:646
+msgid " You should not use "
 msgstr " Vous ne devriez pas utiliser "
 
-#: src/main.c:680
-msgid " XCFA sous ROOT !"
+#: src/main.c:648
+msgid " XCFA under ROOT !"
 msgstr " XCFA sous ROOT !"
 
-#: src/options.c:175
-msgid "ERREUR: Lieu de stockage non autorise !"
-msgstr "ERREUR: Lieu de stockage non autorisé !"
+#: src/options.c:169
+msgid "ERROR : storage location not permitted !"
+msgstr "ERREUR: lieu de stockage non autorisé !"
 
-#: src/options.c:176
-msgid "Veuillez recommencer."
+#: src/options.c:170
+msgid "Please start again."
 msgstr "Veuillez recommencer."
 
-#: src/options_cd.c:120
-msgid "Pour evaluer les templates, vous devez activer une lecture de cdaudio"
-msgstr "Pour évaluer les templates, vous devez activer une lecture de cdaudio"
+#: src/options_cd.c:122
+msgid "To assess the templates, you must enable a reading cdaudio"
+msgstr "Pour évaluer les modèles, vous devez activer une lecture du cd audio"
 
-#: src/options_faac.c:101
+#: src/options_faac.c:94
 msgid "Transport Stream (ADTS) - Extension .aac"
 msgstr "Transport Stream (ADTS) - Extension .aac"
 
-#: src/options_faac.c:102
+#: src/options_faac.c:95
 msgid "MPEG-4 File Format (MP4) - Extension .m4a"
 msgstr "MPEG-4 File Format (MP4) - Extension .m4a"
 
-#: src/options_flac.c:72
-msgid "0 (Rapide)"
+#: src/options_flac.c:65
+msgid "0 (Fast)"
 msgstr "0 (Rapide)"
 
-#: src/options_flac.c:80
-msgid "8 (Lent)"
+#: src/options_flac.c:73
+msgid "8 (Low)"
 msgstr "8 (Lent)"
 
-#: src/options_mp3.c:298
-msgid "V0 (meilleure qualite)"
+#: src/options_mp3.c:276
+msgid "V0 (Best quality)"
 msgstr "V0 (meilleure qualité)"
 
-#: src/options_mp3.c:307
-msgid "V9 (moins bonne qualite)"
+#: src/options_mp3.c:285
+msgid "V9 (Poor quality)"
 msgstr "V9 (moins bonne qualité)"
 
-#: src/options_musepack.c:75
+#: src/options_musepack.c:68
 msgid "telephone: lowest quality : 32 .. 48 kbit/s"
 msgstr "telephone: lowest quality : 32 .. 48 kbit/s"
 
-#: src/options_musepack.c:76
+#: src/options_musepack.c:69
 msgid "thumb : low quality/internet : 58 .. 86 kbit/s"
 msgstr "thumb : low quality/internet : 58 .. 86 kbit/s"
 
-#: src/options_musepack.c:77
+#: src/options_musepack.c:70
 msgid "radio : medium (MP3) quality : 112 .. 152 kbit/s"
 msgstr "radio : medium (MP3) quality : 112 .. 152 kbit/s"
 
-#: src/options_musepack.c:78
+#: src/options_musepack.c:71
 msgid "standard : high quality (dflt) : 142 .. 184 kbit/s"
 msgstr "standard : high quality (dflt) : 142 .. 184 kbit/s"
 
-#: src/options_musepack.c:79
+#: src/options_musepack.c:72
 msgid "xtreme : extreme high quality : 168 .. 212 kbit/s"
 msgstr "xtreme : extreme high quality : 168 .. 212 kbit/s"
 
-#: src/options_musepack.c:80
+#: src/options_musepack.c:73
 msgid "insane : extreme high quality : 232 .. 268 kbit/s"
 msgstr "insane : extreme high quality : 232 .. 268 kbit/s"
 
-#: src/options_musepack.c:81
+#: src/options_musepack.c:74
 msgid "braindead : extreme high quality : 232 .. 278 kbit/s"
 msgstr "braindead : extreme high quality : 232 .. 278 kbit/s"
 
-#: src/options_oggenc.c:148
-msgid "Qualite -1 (Moins bonne qualite)"
+#: src/options_oggenc.c:137
+msgid "Quality -1 (Poor quality)"
+msgstr "Qualité -1 (Moins bonne qualité)"
+
+#: src/options_oggenc.c:138 src/popup.c:1294
+msgid "Quality 0"
+msgstr "Qualité 0"
+
+#: src/options_oggenc.c:139 src/popup.c:1294
+msgid "Quality 1"
 msgstr "Qualité -1 (Moins bonne qualité)"
 
-#: src/options_oggenc.c:152
-msgid "Qualite 3"
+#: src/options_oggenc.c:140 src/popup.c:1294
+msgid "Quality 2"
+msgstr "Qualité 2"
+
+#: src/options_oggenc.c:141
+msgid "Quality 3"
 msgstr "Qualité 3"
 
-#: src/options_oggenc.c:159
-msgid "Qualite 10 (Meilleure qualite)"
+#: src/options_oggenc.c:142 src/popup.c:1295
+msgid "Quality 4"
+msgstr "Qualité 4"
+
+#: src/options_oggenc.c:143 src/popup.c:1295
+msgid "Quality 5"
+msgstr "Qualité 5"
+
+#: src/options_oggenc.c:144 src/popup.c:1295
+msgid "Quality 6"
+msgstr "Qualité 6"
+
+#: src/options_oggenc.c:145 src/popup.c:1295
+msgid "Quality 7"
+msgstr "Qualité 7"
+
+#: src/options_oggenc.c:146 src/popup.c:1296
+msgid "Quality 8"
+msgstr "Qualité 8"
+
+#: src/options_oggenc.c:147 src/popup.c:1296
+msgid "Quality 9"
+msgstr "Qualité 9"
+
+#: src/options_oggenc.c:148
+msgid "Quality 10 (Best quality)"
 msgstr "Qualité 10 (Meilleure qualité)"
 
-#: src/options_wavpack.c:105
-msgid "Mode normal"
-msgstr "Mode normal"
+#: src/options_oggenc.c:176 src/options_wavpack.c:173
+#: src/options_wavpack.c:194 src/options_wavpack.c:215 src/popup.c:1298
+msgid "Yes"
+msgstr "Oui"
+
+#: src/options_oggenc.c:177 src/options_wavpack.c:142
+#: src/options_wavpack.c:172 src/options_wavpack.c:193
+#: src/options_wavpack.c:214 src/options_wavpack.c:233 src/popup.c:1298
+msgid "No"
+msgstr "Non"
+
+#: src/options_oggenc.c:196
+msgid "Force mono"
+msgstr "Force mono"
+
+#: src/options_oggenc.c:197
+msgid "Stereo"
+msgstr "Stéréo"
+
+#: src/options_wavpack.c:98
+msgid "Standard"
+msgstr "Standard"
 
-#: src/options_wavpack.c:106
-msgid "Mode rapide de compression"
-msgstr "Mode rapide de compression"
+#: src/options_wavpack.c:99
+msgid "Fast (Faster encode and decode)"
+msgstr "Fast (Faster encode and decode)"
 
-#: src/options_wavpack.c:107
-msgid "Bonne qualite de compression"
-msgstr "Bonne qualité de compression"
+#: src/options_wavpack.c:100
+msgid "High quality (Better compression ratio)"
+msgstr "Haute qualité (Bonne qualité de compression)"
 
-#: src/options_wavpack.c:108
-msgid "Meilleure qualite de compression"
-msgstr "Meilleure qualité de compression"
+#: src/options_wavpack.c:101
+msgid "Very high quality (Best compression but slowest)"
+msgstr "Very high quality (Best compression but slowest)"
 
-#: src/options_wavpack.c:134
+#: src/options_wavpack.c:125
 msgid "stereo left/right"
 msgstr "stereo left/right"
 
-#: src/options_wavpack.c:135
+#: src/options_wavpack.c:126
 msgid "stereo mid/side"
 msgstr "stereo mid/side"
 
-#: src/options_wavpack.c:253
+#: src/options_wavpack.c:234
 msgid "1 (fast / rapide)"
 msgstr "1 (fast / rapide)"
 
-#: src/options_wavpack.c:258
+#: src/options_wavpack.c:239
 msgid "6 (very slow / tres lent)"
 msgstr "6 (very slow / tres lent)"
 
-#: src/play_file.c:112
-msgid "PAS de lecteur audio present"
-msgstr "PAS de lecteur audio présent"
+#: src/play_file.c:107
+msgid "NO audio player present"
+msgstr "Pas de lecteur audio présent"
 
-#: src/play_file.c:113
-msgid "Veuillez installez un lecteur audio."
-msgstr "Veuillez installez un lecteur audio."
+#: src/play_file.c:108
+msgid "Please install an audio player."
+msgstr "Please, install package [ cdparanoia ]"
 
-#: src/poche_dir.c:436
+#: src/poche_dir.c:433
 msgid ""
 "Utilisez le glisser / deplacer - Effacer une image avec Ctrl + "
 "Click"
@@ -919,659 +853,634 @@
 "Click"
 
 #: src/poche_save.c:117
-msgid "Nom de fichier absent !!"
+msgid "File name not found !!"
 msgstr "Nom de fichier absent !!"
 
-#: src/poche_save.c:118 src/poche_web.c:361 src/poche_web.c:382
-msgid "Pour resoudre ce probleme:"
+#: src/poche_save.c:118 src/poche_web.c:323 src/poche_web.c:345
+msgid "To solve this problem :"
 msgstr "Pour résoudre ce problème:"
 
 #: src/poche_save.c:121
-msgid "Saisissez un nom de fichier sans extention"
-msgstr "Saisissez un nom de fichier sans extention"
-
-#: src/poche_save.c:132
-msgid "Sauvegarde aux formats PDF et PostScript"
-msgstr "Sauvegarde aux formats PDF et PostScript"
-
-#: src/poche_save.c:157
-msgid "Sauvegarde au format PNG"
-msgstr "Sauvegarde au format PNG"
+msgid "Enter a file name without extension"
+msgstr "Saisir un nom de fichier sans extention"
 
-#: src/poche_web.c:360
-msgid "Aucun fichier trouve !"
-msgstr "Aucun fichier trouvé !"
+#: src/poche_save.c:131
+msgid "Saving to PDF"
+msgstr "Sauvegarde vers PDF"
 
-#: src/poche_web.c:364
-msgid "Modifiez la chaine de recherche et"
-msgstr "Modifiez la chaine de recherche et"
+#: src/poche_web.c:322
+msgid "No file found !"
+msgstr "Fichier absent !"
 
-#: src/poche_web.c:366 src/poche_web.c:387
-msgid "recommencez."
-msgstr "recommencez."
+#: src/poche_web.c:326 src/poche_web.c:348
+msgid "Modify the search parameters and"
+msgstr "Modifier les paramètres de recherche et"
 
-#: src/poche_web.c:381
-msgid "Critere de recherche absent !!"
-msgstr "Critère de recherche absent !!"
+#: src/poche_web.c:328 src/poche_web.c:350
+msgid "start again."
+msgstr "recommencer."
 
-#: src/poche_web.c:385
-msgid "Saisissez une chaine de recherche et"
-msgstr "Saisissez une chaine de recherche et"
+#: src/poche_web.c:344
+msgid "Search criteria away !!"
+msgstr "Critère de recherche !!"
 
-#: src/poche_web.c:394
-msgid "[Recherche des fichiers images]"
-msgstr "[Recherche des fichiers images]"
+#: src/poche_web.c:362
+msgid "[Search images files]"
+msgstr "[Rechercher dans les fichiers images]"
 
-#: src/popup.c:87 src/popup.c:106
+#: src/popup.c:81 src/popup.c:100
 msgid " Deselection globale"
 msgstr " Désélection globale"
 
-#: src/popup.c:88 src/popup.c:107 src/popup.c:168
+#: src/popup.c:82 src/popup.c:101 src/popup.c:162
 msgid " Deselection verticale"
 msgstr " Désélection verticale"
 
-#: src/popup.c:89 src/popup.c:108
+#: src/popup.c:83 src/popup.c:102
 msgid " Deselection horizontale"
 msgstr " Désélection horizontale"
 
-#: src/popup.c:90 src/popup.c:93 src/popup.c:109 src/popup.c:112
-#: src/popup.c:126 src/popup.c:139 src/popup.c:153
+#: src/popup.c:84 src/popup.c:87 src/popup.c:103 src/popup.c:106
+#: src/popup.c:120 src/popup.c:133 src/popup.c:147
 msgid " ---"
 msgstr " ---"
 
-#: src/popup.c:91 src/popup.c:110
+#: src/popup.c:85 src/popup.c:104
 msgid " Selection verticale"
 msgstr " Sélection verticale"
 
-#: src/popup.c:92 src/popup.c:111
+#: src/popup.c:86 src/popup.c:105
 msgid " Selection Expert verticale"
 msgstr " Sélection Expert verticale"
 
-#: src/popup.c:94 src/popup.c:113
+#: src/popup.c:88 src/popup.c:107
 msgid " Selection horizontale"
 msgstr " Sélection horizontale"
 
-#: src/popup.c:95 src/popup.c:114
+#: src/popup.c:89 src/popup.c:108
 msgid " Selection Expert horizontale "
 msgstr " Sélection Expert horizontale "
 
-#: src/popup.c:125 src/popup.c:138
+#: src/popup.c:119 src/popup.c:132
 msgid " Deselection verticale "
 msgstr " Désélection verticale "
 
-#: src/popup.c:127 src/popup.c:140
+#: src/popup.c:121 src/popup.c:134
 msgid " Selection verticale "
 msgstr " Sélection verticale "
 
-#: src/popup.c:151
+#: src/popup.c:145
 msgid "---SELECTION VERTICALE-----"
 msgstr "---SELECTION VERTICALE-----"
 
-#: src/popup.c:152
+#: src/popup.c:146
 msgid " Deselection verticale "
 msgstr " Désélection verticale "
 
-#: src/popup.c:154
+#: src/popup.c:148
 msgid " Selection PISTE "
 msgstr " Sélection PISTE "
 
-#: src/popup.c:155
+#: src/popup.c:149
 msgid " Selection ALBUM "
 msgstr " Sélection ALBUM "
 
-#: src/popup.c:156
+#: src/popup.c:150
 msgid " Selection NETTOYER "
 msgstr " Sélection NETTOYER "
 
-#: src/popup.c:167
+#: src/popup.c:161
 msgid "---MENU TRASH--------------"
 msgstr "---MENU TRASH-------------"
 
-#: src/popup.c:169
+#: src/popup.c:163
 msgid " Selection verticale "
 msgstr " Sélection verticale "
 
-#: src/popup.c:544 src/popup.c:752 src/popup.c:968
-msgid "Cellule"
-msgstr "Cellule"
-
-#: src/popup.c:551 src/popup.c:577
-msgid "1 piste"
-msgstr "1 piste"
-
-#: src/popup.c:554 src/popup.c:580
-msgid "2 pistes"
-msgstr "2 pistes"
-
-#: src/popup.c:557 src/popup.c:583
-msgid "4 pistes"
-msgstr "4 pistes"
-
-#: src/popup.c:560 src/popup.c:586
-msgid "6 pistes"
-msgstr "6 pistes"
-
-#: src/popup.c:566 src/popup.c:592 src/popup.c:786 src/popup.c:824
-#: src/popup.c:993 src/popup.c:1023
-msgid "Valeur d'origine"
-msgstr "Valeur d'origine"
-
-#: src/popup.c:570 src/popup.c:790 src/popup.c:997
-msgid "Colonne"
-msgstr "Colonne"
+#: src/popup.c:504 src/popup.c:619 src/popup.c:715
+msgid "Original value"
+msgstr "Valeur originale"
 
-#: src/popup.c:759 src/popup.c:797
-msgid " 8000 Hertz"
-msgstr " 8000 Hertz "
-
-#: src/popup.c:762 src/popup.c:800
-msgid "22000 Hertz"
-msgstr "22000 Hertz"
-
-#: src/popup.c:765 src/popup.c:803
-msgid "32000 Hertz"
-msgstr "32000 Hertz"
-
-#: src/popup.c:768 src/popup.c:806
-msgid "44056 Hertz"
-msgstr "44056 Hertz"
-
-#: src/popup.c:771 src/popup.c:809
-msgid "44100 Hertz"
-msgstr "44100 Hertz"
-
-#: src/popup.c:774 src/popup.c:812
-msgid "48000 Hertz"
-msgstr "48000 Hertz"
-
-#: src/popup.c:777 src/popup.c:815
-msgid "88200 Hertz"
-msgstr "88200 Hertz"
-
-#: src/popup.c:780 src/popup.c:818
-msgid "96000 Hertz"
-msgstr "96000 Hertz"
-
-#: src/popup.c:975 src/popup.c:1004
-msgid " 8 bits"
-msgstr " 8 bits"
-
-#: src/popup.c:978 src/popup.c:1008
-msgid "16 bits"
-msgstr "16 bits"
-
-#: src/popup.c:981 src/popup.c:1011
-msgid "24 bits"
-msgstr "24 bits"
-
-#: src/popup.c:984 src/popup.c:1014
-msgid "32 bits"
-msgstr "32 bits"
-
-#: src/popup.c:987 src/popup.c:1017
-msgid "64 bits"
-msgstr "64 bits"
-
-#: src/popup.c:1089
-msgid "Selecteur suivant"
+#: src/popup.c:765
+msgid "Next selector"
 msgstr "Sélecteur suivant"
 
-#: src/popup.c:1093
-msgid "Selecteur precedant"
-msgstr "Sélecteur precedant"
+#: src/popup.c:769
+msgid "Previous selector"
+msgstr "Sélecteur précedant"
 
-#: src/popup.c:1101
-msgid "Supprimer la plage active"
+#: src/popup.c:777
+msgid "Delete the active range"
 msgstr "Supprimer la plage active"
 
-#: src/popup.c:1173
-msgid "Retourner horizontalement"
-msgstr "Retourner horizontalement"
+#: src/popup.c:850
+msgid "Flip Horizontal"
+msgstr "Retournement horizontale"
 
-#: src/popup.c:1177
-msgid "Retourner verticalement"
-msgstr "Retourner verticalement"
+#: src/popup.c:854
+msgid "Flip Vertical"
+msgstr "Retournement Vertical"
 
-#: src/popup.c:1185
-msgid "Image au premier plan"
-msgstr "Image au premier plan"
+#: src/popup.c:862
+msgid "Foreground image"
+msgstr "Image de premier plan"
 
-#: src/popup.c:1189
-msgid "Image au dessus"
+#: src/popup.c:866
+msgid "Image above"
 msgstr "Image au dessus"
 
-#: src/popup.c:1193
-msgid "Image en dessous"
+#: src/popup.c:870
+msgid "Image below"
 msgstr "Image en dessous"
 
-#: src/popup.c:1197
-msgid "Image au dernier plan"
-msgstr "Image au dernier plan"
+#: src/popup.c:874
+msgid "Image to the background"
+msgstr "Image pour l'arrière-plan"
 
-#: src/popup.c:1205
-msgid "Effacer l'image"
+#: src/popup.c:882
+msgid "Clear image"
 msgstr "Effacer l'image"
 
-#: src/popup.c:1242
-msgid "Supprimer l'image de la liste"
-msgstr "Supprimer l'image de la liste"
+#: src/popup.c:920
+msgid "Remove image from the list"
+msgstr "Supprimer l'image"
 
-#: src/popup_systray.c:127
-msgid " Cacher Xcfa "
-msgstr " Cacher Xcfa "
+#: src/popup.c:1111
+msgid "V0 [ best quality ]"
+msgstr "V0 (meilleure qualité)"
 
-#: src/popup_systray.c:130
-msgid " Montrer Xcfa "
-msgstr " Montrer Xcfa "
+#: src/popup.c:1111 src/popup.c:1114
+msgid "V4 [ default ]"
+msgstr "V4 [ défaut ]"
 
-#: src/popup_systray.c:150
-msgid " Quitter Xcfa "
-msgstr " Quitter Xcfa "
+#: src/popup.c:1111
+msgid "V9 [ Lower quality ]"
+msgstr "V9 (moins bonne qualité)"
 
-#: src/popup_systray.c:201
-msgid ""
-"XCFA\n"
-"Programme pour convertir les fichiers audio."
-msgstr ""
-"XCFA\n"
-"Programme pour convertir les fichiers audio."
+#: src/popup.c:1294
+msgid "Quality -1 [ Lower quality ]"
+msgstr "Qualité -1 (Moins bonne qualité)"
+
+#: src/popup.c:1295
+msgid "Quality 3 [ Defaut ]"
+msgstr "Qualité 3 [ Défaut ]"
+
+#: src/popup.c:1296
+msgid "Quality 10 [ Best Quality ]"
+msgstr "Qualité 10 (Meilleure qualité)"
 
-#: src/prg_init.c:90
+#: src/prg_init.c:85
 msgid " Decode ATSC A/52 audio streams"
 msgstr " Décode ATSC A/52 audio streams"
 
-#: src/prg_init.c:101
+#: src/prg_init.c:96
 msgid " AAC+ encoder"
 msgstr " AAC+ encoder"
 
-#: src/prg_init.c:112 src/prg_init.c:178
+#: src/prg_init.c:107 src/prg_init.c:173
 msgid " Extracteur cd audio"
 msgstr " Extracteur cd audio"
 
-#: src/prg_init.c:123
+#: src/prg_init.c:118
 msgid " Read CD and get CDDB discid information"
 msgstr " Read CD and get CDDB discid information"
 
-#: src/prg_init.c:134
+#: src/prg_init.c:129
 msgid " Cherche des renseignements sur les formats mp3"
 msgstr " Cherche des renseignements sur les formats mp3"
 
-#: src/prg_init.c:145
+#: src/prg_init.c:140
 msgid " Audio Codeur freeware"
 msgstr " Audio Codeur freeware"
 
-#: src/prg_init.c:156
+#: src/prg_init.c:151
 msgid " MPEG-4 AAC decodeur"
 msgstr " MPEG-4 AAC decodeur"
 
-#: src/prg_init.c:167
+#: src/prg_init.c:162
 msgid " Conversion wav : flac"
 msgstr " Conversion wav : flac"
 
-#: src/prg_init.c:189
+#: src/prg_init.c:184
 msgid " Conversion wav : mp3"
 msgstr " Conversion wav : mp3"
 
-#: src/prg_init.c:200
+#: src/prg_init.c:195
 msgid " Cherche les informations d'un dvd"
 msgstr " Cherche les informations d'un dvd"
 
-#: src/prg_init.c:212
+#: src/prg_init.c:207
 msgid " Monkey's Audio Console Front End : APE"
 msgstr " Monkey's Audio Console Front End : APE"
 
-#: src/prg_init.c:224 src/prg_init.c:235
+#: src/prg_init.c:219 src/prg_init.c:230
 msgid " MusePack commandline utilities"
 msgstr " MusePack commandline utilities"
 
-#: src/prg_init.c:246
+#: src/prg_init.c:241
 msgid " Lecteur et extracteur"
 msgstr " Lecteur et extracteur"
 
-#: src/prg_init.c:257
+#: src/prg_init.c:252
 msgid " Normaliseur de fichier mp3"
 msgstr " Normaliseur de fichier mp3"
 
-#: src/prg_init.c:268
+#: src/prg_init.c:263
 msgid " Normaliseur de fichier wav"
 msgstr " Normaliseur de fichier wav"
 
-#: src/prg_init.c:279
+#: src/prg_init.c:274
 msgid " A program to send desktop notifications"
 msgstr " A program to send desktop notifications"
 
-#: src/prg_init.c:290
+#: src/prg_init.c:285
 msgid " Forte compression au format wave"
 msgstr " Forte compression au format wave"
 
-#: src/prg_init.c:301
+#: src/prg_init.c:296
 msgid " Decoupage de fichiers sans decodage"
 msgstr " Découpage de fichiers sans décodage"
 
-#: src/prg_init.c:312
+#: src/prg_init.c:307
 msgid " Transformation universelle de fichiers son"
 msgstr " Transformation universelle de fichiers son"
 
-#: src/prg_init.c:323
+#: src/prg_init.c:318
 msgid " Conversion wav : ogg"
 msgstr " Conversion wav : ogg"
 
-#: src/prg_init.c:334
+#: src/prg_init.c:329
 msgid " Normaliseur de fichier ogg"
 msgstr " Normaliseur de fichier ogg"
 
-#: src/prg_init.c:345
+#: src/prg_init.c:340
 msgid " WAVPACK Hybrid Lossless Audio Compressor"
 msgstr " WAVPACK Hybrid Lossless Audio Compressor"
 
-#: src/prg_init.c:362
-msgid " ... les paquets: deb "
+#: src/prg_init.c:357
+msgid " ... Packets: deb "
 msgstr " ... les paquets: deb "
 
-#: src/prg_init.c:368
-msgid " ... les paquets: tgz "
+#: src/prg_init.c:363
+msgid " ... Packets: tgz "
 msgstr " ... les paquets: tgz "
 
-#: src/prg_init.c:374
-msgid " ... les paquets: fpm "
+#: src/prg_init.c:369
+msgid " ... Packets: fpm "
 msgstr " ... les paquets: fpm "
 
-#: src/prg_init.c:380
-msgid " ... les paquets: rpm "
+#: src/prg_init.c:375
+msgid " ... Packets: rpm "
 msgstr " ... les paquets: rpm "
 
-#: src/prg_init.c:386
-msgid " ... les paquets: pkg.tar.xz "
+#: src/prg_init.c:381
+msgid " ... Packets: pkg.tar.xz "
 msgstr " ... les paquets: pkg.tar.xz "
 
-#: src/prg_init.c:392
-msgid " ... les paquets: ? "
+#: src/prg_init.c:387
+msgid " ... Packets: ? "
 msgstr " ... les paquets: ? "
 
-#: src/prg_init.c:628
+#: src/prg_init.c:623
 msgid "Status"
 msgstr "Status"
 
-#: src/prg_init.c:642
-msgid "Paquet"
-msgstr "Paquet"
+#: src/prg_init.c:637
+msgid "Packets"
+msgstr "Paquets"
 
-#: src/prg_init.c:657
+#: src/prg_init.c:652
 msgid "Action"
 msgstr "Action"
 
-#: src/scan.c:260
-msgid "PACKAGE dvd+rw-tools ABSENT"
+#: src/scan.c:259
+msgid "PACKAGE dvd+rw-tools is missing"
 msgstr "PACKAGE dvd+rw-tools ABSENT"
 
-#: src/scan.c:261
-msgid "Le package 'dvd+rw-tools' est absent"
-msgstr "Le package 'dvd+rw-tools' est absent"
+#: src/scan.c:260
+msgid "The package 'imagemagick' is missing"
+msgstr "Le paquet 'imagemagick' es tabsent"
 
-#: src/scan.c:263
-msgid "de votre systeme !"
+#: src/scan.c:262
+msgid "on your system !"
 msgstr "de votre système !"
 
-#: src/scan.c:265
-msgid "Veuillez l'installer car j'ai besoin de"
-msgstr "Veuillez l'installer car j'ai besoin de"
+#: src/scan.c:264 src/split.c:438
+msgid "Please install it and resume"
+msgstr "Veuillez l'installer et recommencer"
 
-#: src/scan.c:267
-msgid "'dvd+rw-mediainfo' pour identifier le(s)"
+#: src/scan.c:266
+msgid "'Dvd + rw-mediainfo' to identify the"
 msgstr "'dvd+rw-mediainfo' pour identifier le(s"
 
-#: src/scan.c:269
-msgid "lecteur(s) de cd / dvd."
+#: src/scan.c:268
+msgid "reader of cd / dvd."
 msgstr "lecteur(s) de cd / dvd."
 
-#: src/split.c:284
+#: src/split.c:297
 msgid ""
-"Menu: Click droit / Ajout plage: Click bouton centre / Zoom: Ctrl+Scroll"
+"Menu: right click / Adding track: Click the center button / Zoom: Ctrl"
+"+Scroll"
 msgstr ""
 "Menu: Click droit / Ajout plage: Click bouton centre / Zoom: Ctrl"
 "+Scroll"
 
-#: src/split.c:287
-msgid "Ajout plage: Click bouton centre / Zoom: Ctrl+Scroll"
+#: src/split.c:300
+msgid "Adding track: Click the center button / Zoom: Ctrl+Scroll"
 msgstr "Ajout plage: Click bouton centre / Zoom: Ctrl+Scroll"
 
-#: src/split.c:291
-msgid ""
-"Pret pour l'import d'un fichier CUE, WAV, FLAC, OGG, MP3, APE, WMA"
+#: src/split.c:304
+msgid "Ready for imports and a CUE file, WAV, FLAC, OGG, MP3, APE, WMA"
 msgstr ""
 "Prêt pour l'import d'un fichier CUE, WAV, FLAC, OGG, MP3, APE, WMA"
 
-#: src/split.c:360 src/split.c:387
-msgid "Ce fichier appartient a XCFA"
-msgstr "Ce fichier appartient a XCFA"
+#: src/split.c:378 src/split.c:407
+msgid "This file belongs XCFA"
+msgstr "Ce fichier appartient à XCFA"
 
-#: src/split.c:361 src/split.c:388
-msgid "Selectionnez un autre fichier."
+#: src/split.c:379 src/split.c:408
+msgid "Select another file."
 msgstr "Selectionnez un autre fichier."
 
-#: src/split.c:368
-msgid "Fichier vide"
+#: src/split.c:387
+msgid "Empty file"
 msgstr "Fichier vide"
 
-#: src/split.c:369
-msgid "Le fichier ne contient aucune donnee !!!"
-msgstr "Le fichier ne contient aucune donnée !!!"
+#: src/split.c:388
+msgid "The file contains no data !!!"
+msgstr "Ce fichier ne contient aucune donnée"
 
-#: src/split.c:412
-msgid "Sox et Mplayer absents"
+#: src/split.c:433
+msgid "Sox and Mplayer not found"
 msgstr "Sox et Mplayer absents"
 
-#: src/split.c:413
-msgid "Sox et Mplayer sont absents de votre"
-msgstr "Sox et Mplayer sont absents de votre"
+#: src/split.c:434
+msgid "Sox et Mplayer are not found"
+msgstr "Sox et Mplayer absents"
 
-#: src/split.c:415
-msgid "configuration."
+#: src/split.c:436
+msgid "in your configuration."
 msgstr "configuration."
 
-#: src/split.c:417
-msgid "Veuillez les installer pour pouvoir continuer."
-msgstr "Veuillez les installer pour pouvoir continuer."
-
-#: src/split.c:467
-msgid "Erreur de choix de fichier"
-msgstr "Erreur de choix de fichier"
+#: src/split.c:492
+msgid "Error file select"
+msgstr "Erreur de lecture !"
 
-#: src/split.c:468
-msgid "Veuillez selectionner un fichier de type WAV FLAC MP3 OGG APE"
-msgstr "Veuillez sélectionner un fichier de type WAV FLAC MP3 OGG APE"
+#: src/split.c:493
+msgid "Please select a file type of MP3 WAV OGG FLAC APE"
+msgstr "Veuillez sélectionner un fichier de type MP3 WAV OGG FLAC APE"
 
-#: src/split.c:504 src/split.c:577
-msgid "Mauvais type de fichier"
+#: src/split.c:531 src/split.c:603
+msgid "Wrong type of file"
 msgstr "Mauvais type de fichier"
 
-#: src/split.c:505 src/split.c:578
+#: src/split.c:532 src/split.c:604
 msgid ""
-"Les types de fichiers acceptes\n"
-"sont: WAV FLAC MP3 OGG APE WMA CUE"
+"File types accepted\n"
+"sare: WAV FLAC MP3 OGG APE WMA CUE"
 msgstr ""
 "Les types de fichiers acceptés sont\n"
 "WAV FLAC MP3 OGG APE WMA CUE"
 
-#: src/split_conv.c:312 src/split_conv.c:328
-msgid "Erreur SOX"
-msgstr "Erreur SOX"
+#: src/split_conv.c:316 src/split_conv.c:333
+msgid "SOX Error"
+msgstr "Erreur depuis SOX !"
 
-#: src/split_conv.c:313 src/split_conv.c:329
-msgid "Le programme SOX de votre distribution"
+#: src/split_conv.c:317 src/split_conv.c:334
+msgid "The SOX program on your distribution"
 msgstr "Le programme SOX de votre distribution"
 
-#: src/split_conv.c:315 src/split_conv.c:331
-msgid "a generer une erreur pendant la conversion."
+#: src/split_conv.c:319 src/split_conv.c:336
+msgid "has generated an error during conversion."
 msgstr "a générer une erreur pendant la conversion."
 
-#: src/split_cue.c:121
-msgid "Erreur de lecture !"
-msgstr "Erreur de lecture !"
+#: src/split_cue.c:116
+msgid "Misreading !"
+msgstr "Erreur de lecture"
 
-#: src/split_cue.c:181 src/split_cue.c:190 src/split_cue.c:199
-msgid "Erreur"
+#: src/split_cue.c:177 src/split_cue.c:187 src/split_cue.c:196
+msgid "Error"
 msgstr "Erreur"
 
-#: src/split_cue.c:182
-msgid "Aucun fichier de musique associe au cue-file !"
-msgstr "Aucun fichier de musique associé au cue-file !"
+#: src/split_cue.c:178
+msgid "No music file associated with the cue-file"
+msgstr "Aucune musique associé avec ce fichier cue"
 
-#: src/split_cue.c:191
-msgid "Pas de fichier WAV dans le cue-file !"
-msgstr "Pas de fichier WAV dans le cue-file !"
+#: src/split_cue.c:188
+msgid "No WAV file in the cue-file"
+msgstr "Pas de fichier WAV dans ce fichier cue"
 
-#: src/split_cue.c:200
-msgid "Aucun fichier de musique associe dans le dossier"
-msgstr "Aucun fichier de musique associé dans le dossier"
+#: src/split_cue.c:197
+msgid "No music file in the folder associated"
+msgstr "Aucun fichier de musique dans le dossier associé"
 
-#: src/split_cue.c:202
-msgid "du cue-file"
+#: src/split_cue.c:199
+msgid "of cue-file"
 msgstr "du cue-file"
 
-#: src/split_cue.c:288
-msgid "Erreur de donnees dans le fichier CUE"
-msgstr "Erreur de données dans le fichier CUE"
+#: src/split_cue.c:293
+msgid "Data errors in the CUE file"
+msgstr "Erreurs de données dans le fichier CUE"
 
-#: src/split_cue.c:289
-msgid "La solution est d'importer le fichier de"
+#: src/split_cue.c:294
+msgid "The solution is to import the file"
 msgstr "La solution est d'importer le fichier de"
 
-#: src/split_cue.c:291
-msgid "musique qui sera reconnu et pre-decoupe"
-msgstr "musique qui sera reconnu et pré-découpé"
+#: src/split_cue.c:296
+msgid "music that will be recognized and pre-cutting"
+msgstr "musique qui va être reconnu et de pré-découpée"
 
-#: src/split_cue.c:293
-msgid "dans le module Split."
-msgstr "dans le module Split."
+#: src/split_cue.c:298
+msgid "in the split module."
+msgstr "dans le module split."
 
-#: src/split_cue.c:295
-msgid "Il ne restera qu'a ajuster les plages pour"
-msgstr "Il ne restera qu'à ajuster les plages pour"
+#: src/split_cue.c:300
+msgid "We will just adjust to the beaches"
+msgstr "Adaptation des plages"
 
-#: src/split_cue.c:297
-msgid "generer un nouveau cue-file ou des decoupes"
+#: src/split_cue.c:302
+msgid "generate a new cue-file or cuts"
 msgstr "générer un nouveau cue-file ou des découpes"
 
-#: src/split_cue.c:299
-msgid "correspondant aux plages."
+#: src/split_cue.c:304
+msgid "corresponding to the beaches."
 msgstr "correspondant aux plages."
 
-#: src/split_selector.c:141
-msgid "Suppression pendant la lecture impossible"
-msgstr "Suppression pendant la lecture impossible"
+#: src/split_selector.c:136
+msgid "Deleting not during playback"
+msgstr "Pas de suppression pendant la lecture"
 
-#: src/split_selector.c:234 src/split_selector.c:240 src/split_selector.c:294
-#: src/split_selector.c:300 src/split_selector.c:357 src/split_selector.c:364
-#: src/split_selector.c:434 src/split_selector.c:440
-msgid "Temps inferieur a 5 secondes entre marqueur et curseur !"
+#: src/split_selector.c:231 src/split_selector.c:237 src/split_selector.c:291
+#: src/split_selector.c:297 src/split_selector.c:354 src/split_selector.c:361
+#: src/split_selector.c:431 src/split_selector.c:437
+msgid "Time of less than 5 seconds between marker and cursor !"
 msgstr "Temps inférieur à 5 secondes entre marqueur et curseur !"
 
-#: src/translate.c:55
-msgid "Fichier"
-msgstr "Fichier"
+#: src/web.c:173 src/web.c:221
+msgid "No web browser"
+msgstr "Pas de navigateur web"
+
+#: src/web.c:174 src/web.c:222
+msgid "No Web access: no web browser"
+msgstr "Pas d'accès Web: pas de navigateur web"
 
-#: src/translate.c:56
-msgid "Quitter"
+#: src/web.c:176 src/web.c:224
+msgid "found in your system."
+msgstr "trouvées dans votre système."
+
+#: src/web.c:178 src/web.c:226
+msgid "Please install a web browser."
+msgstr "Veuillez installer un navigateur"
+
+#: src/web.c:188
+msgid "You need to enable web access"
+msgstr "Vous avez besoin d'une connexion internet"
+
+#: src/web.c:236
+msgid "Application is missing."
+msgstr "L'application est absente."
+
+#: src/web.c:237
+msgid "Please install : "
+msgstr "Veuillez installer : "
+
+#: src/win_about.c:124
+msgid " Xcfa on the web"
+msgstr " Xcfa sur le web"
+
+#: src/win_about.c:174
+msgid ""
+"\n"
+"Au tout debut:\n"
+"\n"
+"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
+"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
+"... ;-)\n"
+"\n"
+""
+msgstr ""
+"\n"
+"Au tout début:\n"
+"\n"
+"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
+"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
+"... ;-)\n"
+"\n"
+""
+
+#: src/win_scan.c:170
+msgid "Waiting ..."
+msgstr "Veuillez patienter ..."
+
+#: glade/xcfa.glade:66 glade/xcfa.glade:2533
+msgid "File"
+msgstr "Fichiers"
+
+#: glade/xcfa.glade:75
+msgid "Quit"
 msgstr "Quitter"
 
-#: src/translate.c:57
-msgid "Outils"
+#: glade/xcfa.glade:89
+msgid "Tools"
 msgstr "Outils"
 
-#: src/translate.c:58
-msgid "Visibilite des champs"
+#: glade/xcfa.glade:99
+msgid "Visibility fields"
 msgstr "Visibilite des champs"
 
-#: src/translate.c:59
-msgid "Aide"
+#: glade/xcfa.glade:112
+msgid "Help"
 msgstr "Aide"
 
-#: src/translate.c:60
-msgid "A propos"
+#: glade/xcfa.glade:121
+msgid "About"
 msgstr "A propos"
 
-#: src/translate.c:61 src/translate.c:71
-msgid "Lecture"
-msgstr "Lecture"
+#: glade/xcfa.glade:224
+msgid "Read"
+msgstr "Lecture "
 
-#: src/translate.c:62
-msgid " Choix du peripherique / Lecture du DVD "
+#: glade/xcfa.glade:252
+msgid " Choosing the peripheral / DVD playback "
 msgstr " Choix du périphérique / Lecture du DVD "
 
-#: src/translate.c:63 src/translate.c:73 src/translate.c:134
-msgid " Destination des fichiers "
-msgstr " Destination des fichiers "
+#: glade/xcfa.glade:303 glade/xcfa.glade:921
+msgid " File Destination "
+msgstr " Fichier de destination "
 
-#: src/translate.c:64 src/translate.c:74
+#: glade/xcfa.glade:359 glade/xcfa.glade:1009
 msgid " Eject "
 msgstr " Eject "
 
-#: src/translate.c:65 src/translate.c:96
-msgid " Normaliser "
+#: glade/xcfa.glade:434
+msgid " Normalize "
 msgstr " Normaliser "
 
-#: src/translate.c:66
-msgid "Deplier"
+#: glade/xcfa.glade:494
+msgid "Unfold"
 msgstr "Déplier"
 
-#: src/translate.c:67
-msgid "Replier"
+#: glade/xcfa.glade:548
+msgid "Fold"
 msgstr "Replier"
 
-#: src/translate.c:68
+#: glade/xcfa.glade:649
 msgid " Vers 2CH: Sub / Ambiance "
 msgstr " Vers 2CH: Sub / Ambiance "
 
-#: src/translate.c:69 src/translate.c:102
-msgid "Extraire"
-msgstr "Extraire"
+#: glade/xcfa.glade:705
+msgid "Extraction"
+msgstr "Extraction"
 
-#: src/translate.c:70
+#: glade/xcfa.glade:756
 msgid " DVD "
 msgstr " DVD "
 
-#: src/translate.c:72
-msgid " Choix du peripherique / Lecture du CD "
+#: glade/xcfa.glade:842
+msgid "Lecture"
+msgstr "Lecture"
+
+#: glade/xcfa.glade:870
+msgid " Choosing the peripheral / CD playback "
 msgstr " Choix du périphérique / Lecture du CD "
 
-#: src/translate.c:75
-msgid "Titre:"
+#: glade/xcfa.glade:1065
+msgid "Title:"
 msgstr "Titre:"
 
-#: src/translate.c:76
+#: glade/xcfa.glade:1077
 msgid "Album:"
 msgstr "Album:"
 
-#: src/translate.c:77
-msgid "Artiste:"
+#: glade/xcfa.glade:1089
+msgid "Artist:"
 msgstr "Artiste:"
 
-#: src/translate.c:78
-msgid " Annee:"
+#: glade/xcfa.glade:1101
+msgid "Comment:"
+msgstr "Commentaire:"
+
+#: glade/xcfa.glade:1113
+msgid " Year:"
 msgstr " Année:"
 
-#: src/translate.c:79
+#: glade/xcfa.glade:1125
 msgid " Genre:"
 msgstr " Genre:"
 
-#: src/translate.c:80
-msgid " Piste:"
-msgstr " Piste:"
+#: glade/xcfa.glade:1137
+msgid " Track:"
+msgstr "Piste:"
 
-#: src/translate.c:81
+#: glade/xcfa.glade:1149
 msgid " *.m3u et xspf: "
 msgstr " *.m3u et xspf: "
 
-#: src/translate.c:82
-msgid "Commentaire:"
-msgstr "Commentaire:"
-
-#: src/translate.c:83
-msgid " Modification des tags Freedb "
-msgstr " Modification des tags Freedb "
+#: glade/xcfa.glade:1287
+msgid "Editing tags Freedb"
+msgstr "Modification des tags Freedb"
 
-#: src/translate.c:84
+#: glade/xcfa.glade:1302
 msgid ""
 "%a [ %a=\"Artist\" ]\n"
 "\n"
@@ -1597,7 +1506,7 @@
 "le ou les caractères devant être conservés doivent être précédés par le "
 "caractère %"
 
-#: src/translate.c:85
+#: glade/xcfa.glade:1312
 msgid ""
 "%a - artiste %b - titre "
 "de l'album %c - numero de la piste\n"
@@ -1617,425 +1526,432 @@
 "%u - remplacement de caractères: %u(AB=C) %u( =_) %Tl</"
 "b> - Tetsumaki lower"
 
-#: src/translate.c:86
-msgid " Arrangement des titres du CD "
+#: glade/xcfa.glade:1346
+msgid " Arrangement of CD titles"
 msgstr " Arrangement des titres du CD "
 
-#: src/translate.c:87
-msgid "Creation d'un fichier unique au format: "
+#: glade/xcfa.glade:1382
+msgid "Creation of a single file format: "
 msgstr "Création d'un fichier unique au format: "
 
-#: src/translate.c:88
-msgid " et dont le nom sera: "
-msgstr " et dont le nom sera: "
+#: glade/xcfa.glade:1430
+msgid " and whose name will be: "
+msgstr " et dont le nom sera:"
 
-#: src/translate.c:89
-msgid "Ecriture du fichier cue"
+#: glade/xcfa.glade:1461
+msgid "Writing the cue file"
 msgstr "Ecriture du fichier cue"
 
-#: src/translate.c:90
-msgid " Au moins deux selections colonne Wav "
+#: glade/xcfa.glade:1484
+msgid " At least two selections column Wav "
 msgstr " Au moins deux sélections colonne Wav "
 
-#: src/translate.c:91
+#: glade/xcfa.glade:1514
 msgid ""
-"Creation d'un fichier cue\n"
-"unique depuis une lecture\n"
-"du cd audio"
+"\n"
+"Creating a cue file from a single\n"
+"reading audio cd\n"
 msgstr ""
-"Création d'un fichier cue\n"
-"unique depuis une lecture\n"
-"du cd audio"
+"\n"
+"Création d'un fichier cue depuis\n"
+"la lecture du CD Audio\n"
 
-#: src/translate.c:92
-msgid "Creation fichier cue uniquement"
-msgstr "Création fichier cue uniquement"
+#: glade/xcfa.glade:1562
+msgid "File Creation cue only"
+msgstr "Création de fichier cue"
 
-#: src/translate.c:93
+#: glade/xcfa.glade:1597
 msgid " Creation Cue cd "
 msgstr " Création Cue cd "
 
-#: src/translate.c:94
-msgid " Creation d'un fichier unique "
-msgstr " Création d'un fichier unique "
+#: glade/xcfa.glade:1625
+msgid "  Creation of a single file"
+msgstr " Création d'un fichier unique"
 
-#: src/translate.c:95
-msgid "Gestion des tags, titres et fichiers cue"
+#: glade/xcfa.glade:1638
+msgid "Management of tags, titles and cue files"
 msgstr "Gestion des tags, titres et fichiers cue"
 
-#: src/translate.c:97
+#: glade/xcfa.glade:1688
+msgid " normalize "
+msgstr " Normaliser "
+
+#: glade/xcfa.glade:1749
 msgid "definit le serveur a contacter pour les recherches titre"
 msgstr "Définit le serveur à contacter pour les recherches titre"
 
-#: src/translate.c:98
+#: glade/xcfa.glade:1788
 msgid "Parametres par defaut"
 msgstr "Paramètres par défaut"
 
-#: src/translate.c:100
-msgid "Choix parmis les differentes bases de donnees pour le CD."
-msgstr "Choix parmis les différentes bases de données pour le CD."
-
-#: src/translate.c:101
+#: glade/xcfa.glade:1887
 msgid "DiscId"
 msgstr "DiscId"
 
-#: src/translate.c:103
+#: glade/xcfa.glade:1946
+msgid "Extract"
+msgstr "Extraction"
+
+#: glade/xcfa.glade:2053
 msgid " CD "
 msgstr " CD "
 
-#: src/translate.c:104 src/translate.c:133
-msgid " Importer "
+#: glade/xcfa.glade:2135 glade/xcfa.glade:3271
+msgid " Import "
 msgstr " Importer "
 
-#: src/translate.c:105
-msgid " Destination des conversions "
+#: glade/xcfa.glade:2190
+msgid " Destination conversions "
 msgstr " Destination des conversions "
 
-#: src/translate.c:106
-msgid " Nettoyer "
-msgstr " Nettoyer "
+#: glade/xcfa.glade:2266
+msgid " Clean up "
+msgstr " Effacer "
 
-#: src/translate.c:107 src/translate.c:114
+#: glade/xcfa.glade:2389
 msgid "Appliquer les modifications"
 msgstr "Appliquer les modifications"
 
-#: src/translate.c:108
-msgid " Normalise: "
+#: glade/xcfa.glade:2444
+msgid " Normalize: "
 msgstr " Normalise: "
 
-#: src/translate.c:109
-msgid " Choix niveau dBFS: "
-msgstr " Choix niveau dBFS: "
-
-#: src/translate.c:110 src/translate.c:132
-msgid " Fichiers "
-msgstr " Fichiers "
-
-#: src/translate.c:111
-msgid "Quantification"
-msgstr "Quantification"
+#: glade/xcfa.glade:2477
+msgid " Level selection dBFS: "
+msgstr " Sélection de niveau dBFS: "
 
-#: src/translate.c:112
-msgid "Voie"
-msgstr "Voie"
-
-#: src/translate.c:113
-msgid " Frequence - Hertz "
-msgstr " Fréquence - Hertz "
+#: glade/xcfa.glade:2615
+msgid "Apply changes"
+msgstr "Appliquer les modifications"
 
-#: src/translate.c:115
+#: glade/xcfa.glade:2651
 msgid " Wav "
 msgstr " Wav "
 
-#: src/translate.c:116 src/translate.c:202
-msgid " Lame (fichier mp3): "
-msgstr " Lame (fichier mp3): "
-
-#: src/translate.c:117 src/translate.c:218
-msgid " Oggenc (fichier ogg): "
-msgstr " Oggenc (fichier ogg): "
-
-#: src/translate.c:118 src/translate.c:130
-msgid "Appliquer"
+#: glade/xcfa.glade:2735
+msgid "Apply"
 msgstr "Appliquer"
 
-#: src/translate.c:119
-msgid "Effacer"
-msgstr "Effacer"
+#: glade/xcfa.glade:2789
+msgid "Delete"
+msgstr "Suppression"
 
-#: src/translate.c:120
+#: glade/xcfa.glade:2826
 msgid " Mp3-Ogg "
 msgstr " Mp3-Ogg "
 
-#: src/translate.c:121
-msgid "Titre:"
-msgstr "Titre:"
+#: glade/xcfa.glade:2875
+msgid "Title:"
+msgstr "Titre"
 
-#: src/translate.c:122
+#: glade/xcfa.glade:2886
 msgid "Album:"
 msgstr "Album:"
 
-#: src/translate.c:123
-msgid "Artiste:"
+#: glade/xcfa.glade:2897
+msgid "Artist:"
 msgstr "Artiste:"
 
-#: src/translate.c:124
-msgid "Commentaire:"
+#: glade/xcfa.glade:2908
+msgid "Comment:"
 msgstr "Commentaire:"
 
-#: src/translate.c:125
-msgid " Annee:"
+#: glade/xcfa.glade:2919
+msgid " Year:"
 msgstr " Année:"
 
-#: src/translate.c:126
+#: glade/xcfa.glade:2930
 msgid " Genre:"
 msgstr " Genre"
 
-#: src/translate.c:127
-msgid " Piste:"
-msgstr " Piste:"
+#: glade/xcfa.glade:2941
+msgid " Track:"
+msgstr "Piste"
 
-#: src/translate.c:128
+#: glade/xcfa.glade:2952
 msgid " Modif.:"
 msgstr " Modif.:"
 
-#: src/translate.c:129
+#: glade/xcfa.glade:3078
 msgid "0"
 msgstr "0"
 
-#: src/translate.c:131 src/translate.c:315
+#: glade/xcfa.glade:3102
+msgid "Apply "
+msgstr "Appliquer "
+
+#: glade/xcfa.glade:3160 glade/xcfa.glade:10210
 msgid " Tags "
 msgstr " Tags "
 
-#: src/translate.c:135
-msgid "Lecture de 5 secondes apres le marqueur de debut"
-msgstr "Lecture de 5 secondes après le marqueur de début"
+#: glade/xcfa.glade:3190
+msgid " Files "
+msgstr " Fichiers "
 
-#: src/translate.c:136
+#: glade/xcfa.glade:3322
+msgid "   File Destination "
+msgstr " Destination des fichiers "
+
+#: glade/xcfa.glade:3494
+msgid "Lecture de 5 secondes apres le marqueur de debut"
+msgstr "Lecture de 5 secondes après le marqueur de début"
+
+#: glade/xcfa.glade:3546
 msgid "Index de debut"
 msgstr "Index de début"
 
-#: src/translate.c:137 src/translate.c:144 src/translate.c:147
+#: glade/xcfa.glade:3547 glade/xcfa.glade:3813 glade/xcfa.glade:3874
 msgid "00h00m00s"
 msgstr "00h00m00s"
 
-#: src/translate.c:138
+#: glade/xcfa.glade:3600
 msgid "lecture"
 msgstr "lecture"
 
-#: src/translate.c:139
+#: glade/xcfa.glade:3653
 msgid "Pause"
 msgstr "Pause"
 
-#: src/translate.c:140
+#: glade/xcfa.glade:3712
 msgid "Index de lecture"
 msgstr "Index de lecture"
 
-#: src/translate.c:141 src/translate.c:180
+#: glade/xcfa.glade:3713 glade/xcfa.glade:4767
 msgid "label"
 msgstr "label"
 
-#: src/translate.c:142
+#: glade/xcfa.glade:3760
 msgid "Lecture de 5 secondes avant le marqueur de fin"
 msgstr "Lecture de 5 secondes avant le marqueur de fin"
 
-#: src/translate.c:143
+#: glade/xcfa.glade:3812
 msgid "Index de fin"
 msgstr "Index de fin"
 
-#: src/translate.c:145
+#: glade/xcfa.glade:3860
 msgid "Plage"
 msgstr "Plage"
 
-#: src/translate.c:146
+#: glade/xcfa.glade:3873
 msgid "Duree de la plage active"
 msgstr "Durée de la plage active"
 
-#: src/translate.c:148
+#: glade/xcfa.glade:3955
 msgid "Suprimer tous les marqueurs pour les remplacer par un marqueur unique"
 msgstr "Suprimer tous les marqueurs pour les remplacer par un marqueur unique"
 
-#: src/translate.c:149
+#: glade/xcfa.glade:4044
 msgid "Le fichier CUE sera enregistre vers 'Destination des fichiers'."
 msgstr "Le fichier CUE sera enregistré vers 'Destination des fichiers'."
 
-#: src/translate.c:150
-msgid "Production fichier Cue"
+#: glade/xcfa.glade:4073
+msgid "Production Cue file"
 msgstr "Production fichier Cue"
 
-#: src/translate.c:151
+#: glade/xcfa.glade:4098
 msgid "Le resultat du Split sera dirige vers 'Destination des fichiers'."
 msgstr "Le résultat du Split sera dirigé vers 'Destination des fichiers'."
 
-#: src/translate.c:152
+#: glade/xcfa.glade:4127
 msgid "Split"
 msgstr "Split"
 
-#: src/translate.c:153
+#: glade/xcfa.glade:4188
 msgid " Split "
 msgstr " Split "
 
-#: src/translate.c:154
+#: glade/xcfa.glade:4253
 msgid "Importation du titre du CD."
 msgstr "Importation du titre du CD."
 
-#: src/translate.c:155
-msgid "Titre CD"
+#: glade/xcfa.glade:4276
+msgid "Title CD"
 msgstr "Titre CD"
 
-#: src/translate.c:156
+#: glade/xcfa.glade:4296
 msgid "Choix d'une nouvelle police."
 msgstr "Choix d'une nouvelle police."
 
-#: src/translate.c:157
+#: glade/xcfa.glade:4318
 msgid "Texte gras."
 msgstr "Texte gras."
 
-#: src/translate.c:158
+#: glade/xcfa.glade:4340
 msgid "Texte italique."
 msgstr "Texte italique."
 
-#: src/translate.c:159
-msgid ""
-"Apres une lecture de CD et un ajout d'etiquette, ce menu permet la mise en "
-"forme des titres, auteurs ..."
-msgstr ""
-"Après une lecture de CD et un ajout d'étiquette, ce menu permet la mise en "
-"forme des titres, auteurs ..."
-
-#: src/translate.c:160
+#: glade/xcfa.glade:4375
 msgid "Ajouter du texte editable."
 msgstr "Ajouter du texte éditable."
 
-#: src/translate.c:161
-msgid "Texte"
+#: glade/xcfa.glade:4430
+msgid "Text"
 msgstr "Texte"
 
-#: src/translate.c:162
+#: glade/xcfa.glade:4462
 msgid "Saisissez ici un critere de recherche d'images."
 msgstr "Saisissez ici un critère de recherche d'images."
 
-#: src/translate.c:163
+#: glade/xcfa.glade:4484
 msgid "Importation des images depuis le Web."
 msgstr "Importation des images depuis le Web."
 
-#: src/translate.c:164
-msgid "Import images web"
+#: glade/xcfa.glade:4509
+msgid "Import web images "
 msgstr "Import images web"
 
-#: src/translate.c:165
+#: glade/xcfa.glade:4578
 msgid "Supprimer l'image en selection"
 msgstr "Supprimer l'image en sélection"
 
-#: src/translate.c:166
+#: glade/xcfa.glade:4600
 msgid "AJouter de nouvelles images."
 msgstr "Ajouter de nouvelles images."
 
-#: src/translate.c:167
+#: glade/xcfa.glade:4606
 msgid "Ouvre un fichier"
 msgstr "Ouvre un fichier"
 
-#: src/translate.c:168
+#: glade/xcfa.glade:4623
 msgid "Enregistrer la page au format png."
 msgstr "Enregistrer la page au format png."
 
-#: src/translate.c:169
+#: glade/xcfa.glade:4629
 msgid "Sauvegarde le fichier"
 msgstr "Sauvegarde le fichier"
 
-#: src/translate.c:170
+#: glade/xcfa.glade:4646
 msgid "Diminution de l'echelle."
 msgstr "Diminution de l'échelle."
 
-#: src/translate.c:171
+#: glade/xcfa.glade:4652
 msgid "Reduit l'agrandissement"
 msgstr "Reduit l'agrandissement"
 
-#: src/translate.c:172
+#: glade/xcfa.glade:4669
 msgid "Echelle a 100%."
 msgstr "Echelle à 100%."
 
-#: src/translate.c:173
+#: glade/xcfa.glade:4675
 msgid "Remet l'echelle a 100%"
 msgstr "Remet l'echelle à 100%"
 
-#: src/translate.c:174
+#: glade/xcfa.glade:4692
 msgid "Augmentation de l'echelle."
 msgstr "Augmentation de l'échelle."
 
-#: src/translate.c:175
+#: glade/xcfa.glade:4698
 msgid "Augmente l'agrandissement"
 msgstr "Augmente l'agrandissement"
 
-#: src/translate.c:176
+#: glade/xcfa.glade:4715
 msgid "Echelle compatible avec la taille de la fenetre."
 msgstr "Echelle compatible avec la taille de la fenêtre."
 
-#: src/translate.c:177
+#: glade/xcfa.glade:4721
 msgid "Adapte l'echelle a la taille de la fenetre"
 msgstr "Adapte l'échelle a la taille de la fenêtre"
 
-#: src/translate.c:178
+#: glade/xcfa.glade:4738
 msgid "Emplacement de sauvegarde des fichiers."
 msgstr "Emplacement de sauvegarde des fichiers."
 
-#: src/translate.c:179
+#: glade/xcfa.glade:4752
 msgid "Nom (sans extention) du fichier a sauvegarder."
 msgstr "Nom (sans extention) du fichier à sauvegarder."
 
-#: src/translate.c:181
+#: glade/xcfa.glade:4815
 msgid " Pochette "
 msgstr " Pochette "
 
-#: src/translate.c:182
+#: glade/xcfa.glade:4861
 msgid "Nice"
 msgstr "Nice"
 
-#: src/translate.c:183
-msgid " Priorite systeme "
+#: glade/xcfa.glade:4896
+msgid " Priority system "
 msgstr " Priorité système "
 
-#: src/translate.c:184
+#: glade/xcfa.glade:4935
 msgid ""
-"Indiquez ici le dossier sur votre systeme qui servira de lieu\n"
-"de stockage provisoire pendant les differentes conversions.\n"
+"\n"
+"Enter here the folder on your system that will serve as\n"
+"temporary storage for the different conversions.\n"
 msgstr ""
+"\n"
 "Indiquez ici le dossier sur votre système qui servira de lieu\n"
 "de stockage provisoire pendant les différentes conversions.\n"
 
-#: src/translate.c:185
-msgid " Dossier provisoire des conversions "
+#: glade/xcfa.glade:4971
+msgid " Provisional file conversions "
 msgstr " Dossier provisoire des conversions "
 
-#: src/translate.c:186
+#: glade/xcfa.glade:5017
 msgid "button"
 msgstr "button"
 
-#: src/translate.c:187
-msgid " Jouer une musique en fin de tache "
-msgstr " Jouer une musique en fin de tâche "
+#: glade/xcfa.glade:5038
+msgid " Playing a job end music "
+msgstr " Jouer une musique de fin de tâche "
 
-#: src/translate.c:188
+#: glade/xcfa.glade:5058
 msgid " General "
 msgstr " Genéral "
 
-#: src/translate.c:189
+#: glade/xcfa.glade:5100
 msgid "cdparanoia"
 msgstr "cdparanoia"
 
-#: src/translate.c:190
-msgid "cdda2wav / icedax"
-msgstr "cdda2wav / icedax"
-
-#: src/translate.c:191
+#: glade/xcfa.glade:5120
 msgid "cdparanoia mode expert"
 msgstr "cdparanoia mode expert"
 
-#: src/translate.c:192
+#: glade/xcfa.glade:5140
+msgid "cdparanoia mode expert multi passes"
+msgstr "cdparanoia mode expert multi passes"
+
+#: glade/xcfa.glade:5168
+msgid "cdda2wav / icedax"
+msgstr "cdda2wav / icedax"
+
+#: glade/xcfa.glade:5194
 msgid " Extraction cd-audio avec: "
 msgstr " Extraction cd-audio avec: "
 
-#: src/translate.c:193
+#: glade/xcfa.glade:5268
 msgid "HomePage"
 msgstr "HomePage"
 
-#: src/translate.c:194
+#: glade/xcfa.glade:5323
 msgid "ManPage "
 msgstr "ManPage "
 
-#: src/translate.c:195
+#: glade/xcfa.glade:5352
 msgid " Web cdparanoia "
 msgstr " Web cdparanoia "
 
-#: src/translate.c:196
+#: glade/xcfa.glade:5414
 msgid ""
-"%a - artiste %b - titre "
+"Le fichier LogExpertMode.txt sera cree dans le dossier des "
+"extractions"
+msgstr ""
+"Le fichier LogExpertMode.txt sera créé dans le dossier des "
+"extractions"
+
+#: glade/xcfa.glade:5431
+msgid "Generation of a report for: cdparanoia mode expert multi passes"
+msgstr ""
+"Génération d'un rapport pour: cdparanoia mode expert multi passes"
+
+#: glade/xcfa.glade:5467
+msgid ""
+"%a - artist %b - titre "
 "de l'album %c - numero de la piste\n"
 "%d - titre de la chanson %e - "
-"annee %g - genre\n"
+"year %g - genre\n"
 "%na - no accent %Tl "
 "- Tetsumaki lower\n"
-"%u - remplacement de caracteres: %u(AB=C) %u( =_)"
+"%u - replacement characters: %u(AB=C) %u( =_)"
 msgstr ""
 "%a - artiste %b - titre "
 "de l'album %c - numéro de la piste\n"
@@ -2045,387 +1961,381 @@
 "- Tetsumaki lower\n"
 "%u - remplacement de caractères: %u(AB=C) %u( =_)"
 
-#: src/translate.c:197
+#: glade/xcfa.glade:5536
 msgid " Dossier de stockage "
 msgstr " Dossier de stockage "
 
-#: src/translate.c:198
+#: glade/xcfa.glade:5567
 msgid " CD "
 msgstr " CD "
 
-#: src/translate.c:199
+#: glade/xcfa.glade:5615
 msgid "ABR / CBR / VBR / VBR-NEW"
 msgstr "ABR / CBR / VBR / VBR-NEW"
 
-#: src/translate.c:200
+#: glade/xcfa.glade:5660 glade/xcfa.glade:6295
 msgid "Debit"
 msgstr "Débit"
 
-#: src/translate.c:201
+#: glade/xcfa.glade:5705 glade/xcfa.glade:6317
 msgid "Mode"
 msgstr "Mode"
 
-#: src/translate.c:203 src/translate.c:219 src/translate.c:231
-#: src/translate.c:244 src/translate.c:261 src/translate.c:272
-#: src/translate.c:286 src/translate.c:300
+#: glade/xcfa.glade:5747
+msgid " Lame (fichier mp3): "
+msgstr " Lame (fichier mp3): "
+
+#: glade/xcfa.glade:5827 glade/xcfa.glade:6466 glade/xcfa.glade:6941
+#: glade/xcfa.glade:7469 glade/xcfa.glade:8200 glade/xcfa.glade:8659
+#: glade/xcfa.glade:9192 glade/xcfa.glade:9753
 msgid "Par defaut"
 msgstr "Par défaut"
 
-#: src/translate.c:204
+#: glade/xcfa.glade:5848
 msgid " Options LAME "
 msgstr " Options LAME "
 
-#: src/translate.c:205 src/translate.c:233 src/translate.c:274
+#: glade/xcfa.glade:5909 glade/xcfa.glade:7023 glade/xcfa.glade:8741
 msgid "Site officiel"
 msgstr "Site officiel"
 
-#: src/translate.c:206
+#: glade/xcfa.glade:5964
 msgid "Wiki mp3 "
 msgstr "Wiki mp3 "
 
-#: src/translate.c:207
+#: glade/xcfa.glade:6020
 msgid "Wiki "
 msgstr "Wiki "
 
-#: src/translate.c:208
+#: glade/xcfa.glade:6076
 msgid "ManPage "
 msgstr "ManPage "
 
-#: src/translate.c:209
+#: glade/xcfa.glade:6105
 msgid " Web Lame "
 msgstr " Web Lame "
 
-#: src/translate.c:210 src/translate.c:224 src/translate.c:237
-#: src/translate.c:248 src/translate.c:266 src/translate.c:277
-#: src/translate.c:292
+#: glade/xcfa.glade:6181 glade/xcfa.glade:6709 glade/xcfa.glade:7238
+#: glade/xcfa.glade:7644 glade/xcfa.glade:8442 glade/xcfa.glade:8901
+#: glade/xcfa.glade:9491
 msgid "["
 msgstr "["
 
-#: src/translate.c:211 src/translate.c:225 src/translate.c:238
-#: src/translate.c:249 src/translate.c:267 src/translate.c:278
-#: src/translate.c:293
+#: glade/xcfa.glade:6194 glade/xcfa.glade:6722 glade/xcfa.glade:7251
+#: glade/xcfa.glade:7657 glade/xcfa.glade:8455 glade/xcfa.glade:8914
+#: glade/xcfa.glade:9504
 msgid "string option interne"
 msgstr "string option interne"
 
-#: src/translate.c:212 src/translate.c:226 src/translate.c:239
-#: src/translate.c:250 src/translate.c:268 src/translate.c:279
-#: src/translate.c:294
+#: glade/xcfa.glade:6209 glade/xcfa.glade:6737 glade/xcfa.glade:7266
+#: glade/xcfa.glade:7672 glade/xcfa.glade:8470 glade/xcfa.glade:8929
+#: glade/xcfa.glade:9519
 msgid "]"
 msgstr "]"
 
-#: src/translate.c:213
-msgid ""
-" Options experts, definies par l'utilisateur - lame (wav -> mp3) "
+#: glade/xcfa.glade:6234
+msgid " Experts options defined by the user- lame (wav -> mp3) "
 msgstr ""
 " Options experts, définies par l'utilisateur - lame (wav -> mp3) "
 
-#: src/translate.c:214
+#: glade/xcfa.glade:6254
 msgid " Mp3 "
 msgstr " Mp3 "
 
-#: src/translate.c:215
-msgid " Mode"
-msgstr " Mode"
+#: glade/xcfa.glade:6306
+msgid "Mode flux (streaming)"
+msgstr "Mode flux (streaming)"
 
-#: src/translate.c:216
-msgid " Mode flux (streaming)"
-msgstr " Mode flux (streaming)"
-
-#: src/translate.c:217
-msgid " Debit"
-msgstr " Débit"
+#: glade/xcfa.glade:6386
+msgid " Oggenc (fichier ogg): "
+msgstr " Oggenc (fichier ogg): "
 
-#: src/translate.c:220
+#: glade/xcfa.glade:6487
 msgid " Options OGGENC "
 msgstr " Options OGGENC "
 
-#: src/translate.c:221
+#: glade/xcfa.glade:6548
 msgid "Wiki "
 msgstr "Wiki "
 
-#: src/translate.c:222 src/translate.c:264 src/translate.c:290
-#: src/translate.c:304
+#: glade/xcfa.glade:6604 glade/xcfa.glade:8337 glade/xcfa.glade:9386
+#: glade/xcfa.glade:9947
 msgid "ManPage"
 msgstr "ManPage"
 
-#: src/translate.c:223
+#: glade/xcfa.glade:6633
 msgid " Web Oggenc "
 msgstr " Web Oggenc "
 
-#: src/translate.c:227
-msgid ""
-" Options experts, definies par l'utilisateur - oggenc (wav -> ogg) "
+#: glade/xcfa.glade:6762
+msgid " Experts options defined by the user - oggenc (wav -> ogg) "
 msgstr ""
 " Options experts, définies par l'utilisateur - oggenc (wav -> ogg) "
 
-#: src/translate.c:228
+#: glade/xcfa.glade:6782
 msgid " Oggenc "
 msgstr " Oggenc "
 
-#: src/translate.c:229
+#: glade/xcfa.glade:6824
 msgid "Taux de compression"
 msgstr "Taux de compression"
 
-#: src/translate.c:230
+#: glade/xcfa.glade:6861
 msgid " Flac (fichier flac): "
 msgstr " Flac (fichier flac): "
 
-#: src/translate.c:232
+#: glade/xcfa.glade:6962
 msgid " Options FLAC "
 msgstr " Options FLAC "
 
-#: src/translate.c:234 src/translate.c:275
+#: glade/xcfa.glade:7078 glade/xcfa.glade:8796
 msgid "Framasoft "
 msgstr "Framasoft "
 
-#: src/translate.c:235
+#: glade/xcfa.glade:7133
 msgid "ManPage "
 msgstr "ManPage "
 
-#: src/translate.c:236
+#: glade/xcfa.glade:7162
 msgid " Web Flac "
 msgstr " Web Flac "
 
-#: src/translate.c:240
-msgid ""
-" Options experts, definies par l'utilisateur - flac (wav -> flac) "
+#: glade/xcfa.glade:7291
+msgid " Experts options defined by the user- flac (wav -> flac) "
 msgstr ""
 " Options experts, définies par l'utilisateur - flac (wav -> flac) "
 
-#: src/translate.c:241
+#: glade/xcfa.glade:7311
 msgid " Flac "
 msgstr " Flac "
 
-#: src/translate.c:242
+#: glade/xcfa.glade:7353
 msgid " Qualite"
 msgstr " Qualité"
 
-#: src/translate.c:243
+#: glade/xcfa.glade:7389
 msgid " Mac (fichier ape): "
 msgstr " Mac (fichier ape): "
 
-#: src/translate.c:245
+#: glade/xcfa.glade:7490
 msgid " Options MAC "
 msgstr " Options MAC "
 
-#: src/translate.c:246
+#: glade/xcfa.glade:7546
 msgid "Wiki"
 msgstr "Wiki"
 
-#: src/translate.c:247
+#: glade/xcfa.glade:7568
 msgid " Web Mac "
 msgstr " Web Mac "
 
-#: src/translate.c:251
-msgid " Options experts, definies par l'utilisateur - mac (wav -> ape) "
+#: glade/xcfa.glade:7697
+msgid " Experts options defined by the user - mac (wav -> ape) "
 msgstr ""
 " Options experts, définies par l'utilisateur - mac (wav -> ape) "
 
-#: src/translate.c:252
+#: glade/xcfa.glade:7717
 msgid " Mac "
 msgstr " Mac "
 
-#: src/translate.c:253
+#: glade/xcfa.glade:7765
 msgid "Compression"
 msgstr "Compression"
 
-#: src/translate.c:254
+#: glade/xcfa.glade:7817
 msgid "Son"
 msgstr "Son"
 
-#: src/translate.c:255
+#: glade/xcfa.glade:7869
 msgid "Mode hybride"
 msgstr "Mode hybride"
 
-#: src/translate.c:256
+#: glade/xcfa.glade:7921
 msgid "Fichier de correction"
 msgstr "Fichier de correction"
 
-#: src/translate.c:257
+#: glade/xcfa.glade:7973
 msgid "Compression maximum"
 msgstr "Compression maximum"
 
-#: src/translate.c:258
+#: glade/xcfa.glade:8025
 msgid "Signature MD5"
 msgstr "Signature MD5"
 
-#: src/translate.c:259
+#: glade/xcfa.glade:8077
 msgid "Extra encode processing"
 msgstr "Extra encode processing"
 
-#: src/translate.c:260
+#: glade/xcfa.glade:8120
 msgid " WavPack (fichier wv): "
 msgstr " WavPack (fichier wv): "
 
-#: src/translate.c:262
+#: glade/xcfa.glade:8221
 msgid " Options WAVPACK "
 msgstr " Options WAVPACK "
 
-#: src/translate.c:263
+#: glade/xcfa.glade:8282
 msgid "Wiki "
 msgstr "Wiki "
 
-#: src/translate.c:265
+#: glade/xcfa.glade:8366
 msgid " Web Wavpack "
 msgstr " Web Wavpack "
 
-#: src/translate.c:269
-msgid ""
-" Options experts, definies par l'utilisateur - wavpack (wav -> wv) "
+#: glade/xcfa.glade:8495
+msgid " Experts options defined by the user - wavpack (wav -> wv) "
 msgstr ""
 " Options experts, définies par l'utilisateur - wavpack (wav -> wv) "
 
-#: src/translate.c:270
+#: glade/xcfa.glade:8515
 msgid " Wavpack "
 msgstr " Wavpack "
 
-#: src/translate.c:271
+#: glade/xcfa.glade:8579
 msgid " MusePack (fichier mpc): "
 msgstr " MusePack (fichier mpc): "
 
-#: src/translate.c:273
+#: glade/xcfa.glade:8680
 msgid " Options MUSEPACK "
 msgstr " Options MUSEPACK "
 
-#: src/translate.c:276
+#: glade/xcfa.glade:8825
 msgid " Web Musepack "
 msgstr " Web Musepack "
 
-#: src/translate.c:280
-msgid ""
-" Options experts, definies par l'utilisateur - musepack (wav -> mpc) "
+#: glade/xcfa.glade:8954
+msgid " Experts options defined by the user- musepack (wav -> mpc) "
 msgstr ""
 " Options experts, définies par l'utilisateur - musepack (wav -> mpc) "
 
-#: src/translate.c:281
+#: glade/xcfa.glade:8974
 msgid " Musepack "
 msgstr " Musepack "
 
-#: src/translate.c:282
-msgid " Qualite VBR / Debit ABR"
-msgstr " Qualité VBR / Débit ABR"
+#: glade/xcfa.glade:9016
+msgid "Conteneur"
+msgstr "Conteneur"
 
-#: src/translate.c:283
-msgid " VBR / ABR"
-msgstr " VBR / ABR"
+#: glade/xcfa.glade:9027
+msgid "VBR / ABR"
+msgstr "VBR / ABR"
 
-#: src/translate.c:284
-msgid " Conteneur"
-msgstr " Conteneur"
+#: glade/xcfa.glade:9038
+msgid "Qualite VBR / Debit ABR"
+msgstr "Qualite VBR / Debit ABR"
 
-#: src/translate.c:285
+#: glade/xcfa.glade:9112
 msgid " Faac (fichier .m4a): "
 msgstr " Faac (fichier .m4a): "
 
-#: src/translate.c:287
+#: glade/xcfa.glade:9213
 msgid " Options FAAC "
 msgstr " Options FAAC "
 
-#: src/translate.c:288 src/translate.c:302
+#: glade/xcfa.glade:9274 glade/xcfa.glade:9835
 msgid "Site officiel "
 msgstr "Site officiel "
 
-#: src/translate.c:289 src/translate.c:303
+#: glade/xcfa.glade:9330 glade/xcfa.glade:9891
 msgid "Web Info "
 msgstr "Web Info "
 
-#: src/translate.c:291
+#: glade/xcfa.glade:9415
 msgid " Web Faac "
 msgstr " Web Faac "
 
-#: src/translate.c:295
-msgid ""
-" Options experts, definies par l'utilisateur - faac (wav -> m4a) "
+#: glade/xcfa.glade:9544
+msgid " Experts options defined by the user - faac (wav -> m4a) "
 msgstr ""
 " Options experts, définies par l'utilisateur - faac (wav -> m4a) "
 
-#: src/translate.c:296
+#: glade/xcfa.glade:9564
 msgid " Faac "
 msgstr " Faac "
 
-#: src/translate.c:297
-msgid " Stereo: Qualite en kbit/s"
-msgstr " Stéréo: Qualité en kbit/s"
+#: glade/xcfa.glade:9606
+msgid "Mono: Qualite en kbit/s"
+msgstr "Mono: Qualité en kbit/s"
 
-#: src/translate.c:298
-msgid " Mono: Qualite en kbit/s"
-msgstr " Mono: Qualité en kbit/s"
+#: glade/xcfa.glade:9617
+msgid "Stereo: Qualite en kbit/s"
+msgstr "Stéreo: Qualité en kbit/s"
 
-#: src/translate.c:299
+#: glade/xcfa.glade:9673
 msgid " AacplusEnc (fichier .aac): "
 msgstr " AacplusEnc (fichier .aac): "
 
-#: src/translate.c:301
+#: glade/xcfa.glade:9774
 msgid " Options AacPlusEnc "
 msgstr " Options AacPlusEnc "
 
-#: src/translate.c:305
+#: glade/xcfa.glade:9976
 msgid " Web AacPlusEnc "
 msgstr " Web AacPlusEnc "
 
-#: src/translate.c:306
+#: glade/xcfa.glade:10021
 msgid " AacplusEnc "
 msgstr " AacplusEnc "
 
-#: src/translate.c:307
+#: glade/xcfa.glade:10051
 msgid "Artiste"
 msgstr "Artiste"
 
-#: src/translate.c:308 src/translate.c:335
+#: glade/xcfa.glade:10070 glade/xcfa_win_treeview.glade:95
 msgid "Titre"
 msgstr "Titre"
 
-#: src/translate.c:309
+#: glade/xcfa.glade:10089
 msgid "Album"
 msgstr "Album"
 
-#: src/translate.c:310
+#: glade/xcfa.glade:10108
 msgid "Numero"
 msgstr "Numéro"
 
-#: src/translate.c:311
+#: glade/xcfa.glade:10127
 msgid "Genre"
 msgstr "Genre"
 
-#: src/translate.c:312
+#: glade/xcfa.glade:10146
 msgid "Annee"
 msgstr "Année"
 
-#: src/translate.c:313
+#: glade/xcfa.glade:10165
 msgid "Commentaire"
 msgstr "Commentaire"
 
-#: src/translate.c:314
+#: glade/xcfa.glade:10190
 msgid " Exportation de "
 msgstr " Exportation de "
 
-#: src/translate.c:316
+#: glade/xcfa.glade:10226
 msgid " Preferences "
 msgstr " Préférences "
 
-#: src/translate.c:317
+#: glade/xcfa.glade:10289
 msgid "SCAN"
 msgstr "SCAN"
 
-#: src/translate.c:318
+#: glade/xcfa.glade:10303
 msgid " Installation "
 msgstr " Installation "
 
-#: src/translate.c:319
-msgid " Votre systeme utilise ... "
+#: glade/xcfa.glade:10338
+msgid " Your system use ... "
 msgstr " Votre système utilise ... "
 
-#: src/translate.c:320
+#: glade/xcfa.glade:10375
 msgid ""
 "\n"
-"Pour installer les programmes externes requis,\n"
-"veuillez utiliser l'installateur de votre distribution Gnu/Linux.\n"
+"To install the required external programs\n"
+"Please use the installer to your distribution Gnu / Linux.\n"
 msgstr ""
 "\n"
 "Pour installer les programmes externes requis,\n"
 "veuillez utiliser l'installateur de votre distribution Gnu/Linux.\n"
 
-#: src/translate.c:321
+#: glade/xcfa.glade:10393
 msgid ""
 "Le programme XCFA_INSTALL_ALL ecrit en Perl vous sera utile en ligne de "
 "commande pour une installation des programmes complementaire."
@@ -2433,183 +2343,69 @@
 "Le programme XCFA_INSTALL_ALL écrit en Perl vous sera utile en ligne de "
 "commande pour une installation des programmes complémentaire."
 
-#: src/translate.c:322
+#: glade/xcfa.glade:10419
 msgid " Informations "
 msgstr " Informations "
 
-#: src/translate.c:323
-msgid " Application externes "
-msgstr " Application externes "
+#: glade/xcfa.glade:10443
+msgid " External application "
+msgstr " Application externe "
 
-#: src/translate.c:324 src/translate.c:326
+#: glade/xcfa.glade:10514 glade/xcfa.glade:10618
 msgid "parametres:"
 msgstr "paramètres:"
 
-#: src/translate.c:325
+#: glade/xcfa.glade:10527
+msgid ""
+"\n"
+" konqueror : newTab\n"
+" iceweasel : -new-window -new-tab \n"
+msgstr ""
+"\n"
+" konqueror : newTab\n"
+" iceweasel : -new-window -new-tab \n"
+
+#: glade/xcfa.glade:10548
 msgid "Navigateur"
 msgstr "Navigateur"
 
-#: src/translate.c:327
+#: glade/xcfa.glade:10648
 msgid "Lecteurs audio"
 msgstr "Lecteurs audio"
 
-#: src/translate.c:328
-msgid " Navigateurs / Lecteurs audio "
-msgstr " Navigateurs / Lecteurs audio "
+#: glade/xcfa.glade:10669
+msgid "  Browsers / Audio Players "
+msgstr " Navigateurs / Lecteurs audio"
 
-#: src/translate.c:329
+#: glade/xcfa.glade:10692
 msgid " Applications externes "
 msgstr " Applications externes "
 
-#: src/translate.c:330
-msgid "Scan en cours ..."
-msgstr "Scan en cours ..."
-
-#: src/translate.c:331
-msgid "Scan du support en cours ..."
-msgstr "Scan du support en cours ..."
-
-#: src/translate.c:332
-msgid "Detail extraction mode expert"
-msgstr "Détail extraction mode expert"
-
-#: src/translate.c:333
-msgid "Modification des champs"
-msgstr "Modification des champs"
-
-#: src/translate.c:334
-msgid ""
-"\n"
-"Modification des champs\n"
-msgstr ""
-"\n"
-"Modification des champs\n"
-
-#: src/translate.c:342 src/translate.c:361 src/translate.c:382
-#: src/translate.c:394 src/translate.c:405 src/translate.c:413
-msgid " Visibilite "
-msgstr " Visibilité "
-
-#: src/translate.c:343 src/translate.c:362 src/translate.c:383
-#: src/translate.c:395 src/translate.c:406 src/translate.c:414
-msgid "Nom a gauche"
-msgstr "Nom à gauche"
-
-#: src/translate.c:344 src/translate.c:363 src/translate.c:384
-#: src/translate.c:396 src/translate.c:407 src/translate.c:415
-msgid "Nom au centre"
-msgstr "Nom au centre"
-
-#: src/translate.c:345 src/translate.c:364 src/translate.c:385
-#: src/translate.c:397 src/translate.c:408 src/translate.c:416
-msgid "Nom a droite"
-msgstr "Nom à droite"
-
-#: src/translate.c:346
-msgid "DVD"
-msgstr "DVD"
-
-#: src/translate.c:351 src/translate.c:372
-msgid "Wavpack"
-msgstr "Wavpack"
-
-#: src/translate.c:355 src/translate.c:376
-msgid "Musepack"
-msgstr "Musepack"
-
-#: src/translate.c:365
-msgid "CD"
-msgstr "CD"
-
-#: src/translate.c:380
-msgid "Replaygain"
-msgstr "Replaygain"
-
-#: src/translate.c:386
-msgid "CONVERSIONS"
-msgstr "CONVERSIONS"
-
-#: src/translate.c:387
-msgid "Hertz"
-msgstr "Hertz"
-
-#: src/translate.c:388
-msgid "New Hertz"
-msgstr "New Hertz"
-
-#: src/translate.c:389
-msgid "Voie"
-msgstr "Voie"
-
-#: src/translate.c:390
-msgid "New Voie"
-msgstr "New Voie"
-
-#: src/translate.c:391
-msgid "Bits"
-msgstr "Bits"
-
-#: src/translate.c:392
-msgid "New Bits"
-msgstr "New Bits"
-
-#: src/translate.c:398
-msgid "WAV"
-msgstr "WAV"
-
-#: src/translate.c:401
-msgid "New Bitrate"
-msgstr "New Bitrate"
-
-#: src/translate.c:402
-msgid "Size"
-msgstr "Size"
-
-#: src/translate.c:409
-msgid "MP3-OGG"
-msgstr "MP3-OGG"
-
-#: src/translate.c:417
-msgid "TAGS"
-msgstr "TAGS"
-
-#: src/translate.c:418
-msgid "Selection globale"
-msgstr "Sélection globale"
-
-#: src/translate.c:419
-msgid "Deselection globale"
-msgstr "Désélection globale"
-
-#: src/translate.c:420
-msgid "Retour"
-msgstr "Retour"
-
-#: src/translate.c:421
+#: glade/xcfa_win_about.glade:7
 msgid "About X Convert File Audio"
 msgstr "About X Convert File Audio"
 
-#: src/translate.c:422
+#: glade/xcfa_win_about.glade:103
 msgid "Author"
 msgstr "Author"
 
-#: src/translate.c:423
+#: glade/xcfa_win_about.glade:139
 msgid "Licence"
 msgstr "Licence"
 
-#: src/translate.c:424
+#: glade/xcfa_win_about.glade:163
 msgid " Informations "
 msgstr " Informations "
 
-#: src/translate.c:425
+#: glade/xcfa_win_about.glade:198
 msgid " Machine "
 msgstr " Machine "
 
-#: src/translate.c:426
+#: glade/xcfa_win_about.glade:333
 msgid "Ingenieurs du son\n"
 msgstr "Ingénieurs du son\n"
 
-#: src/translate.c:427
+#: glade/xcfa_win_about.glade:350
 msgid ""
 "\n"
 "Graphisme\n"
@@ -2617,7 +2413,7 @@
 "\n"
 "Graphisme\n"
 
-#: src/translate.c:428
+#: glade/xcfa_win_about.glade:370
 msgid ""
 "Traduction Anglaise\n"
 "\n"
@@ -2627,7 +2423,7 @@
 "\n"
 "\n"
 
-#: src/translate.c:429
+#: glade/xcfa_win_about.glade:391
 msgid ""
 "\n"
 "Traduction Allemande"
@@ -2635,7 +2431,7 @@
 "\n"
 "Traduction Allemande"
 
-#: src/translate.c:430
+#: glade/xcfa_win_about.glade:628
 msgid ""
 "\n"
 "Codeur Xcfa"
@@ -2643,7 +2439,7 @@
 "\n"
 "Codeur Xcfa"
 
-#: src/translate.c:431
+#: glade/xcfa_win_about.glade:665
 msgid ""
 "\n"
 "ElementSpeak pour Xcfa "
@@ -2651,7 +2447,7 @@
 "\n"
 "ElementSpeak pour Xcfa "
 
-#: src/translate.c:432
+#: glade/xcfa_win_about.glade:702
 msgid ""
 "\n"
 "Codeur pages Web"
@@ -2659,7 +2455,7 @@
 "\n"
 "Codeur pages Web"
 
-#: src/translate.c:433
+#: glade/xcfa_win_about.glade:739
 msgid ""
 "\n"
 "Traduction Italienne"
@@ -2667,7 +2463,7 @@
 "\n"
 "Traduction Italienne"
 
-#: src/translate.c:434
+#: glade/xcfa_win_about.glade:800
 msgid ""
 "\n"
 "\n"
@@ -2677,51 +2473,43 @@
 "\n"
 "Pages à visiter\n"
 
-#: src/translate.c:435
+#: glade/xcfa_win_about.glade:1123
 msgid "Linux On The Root"
 msgstr "Linux On The Root"
 
-#: src/translate.c:436
+#: glade/xcfa_win_about.glade:1180
 msgid "Frugalware"
 msgstr "Frugalware"
 
-#: src/translate.c:437
+#: glade/xcfa_win_about.glade:1237
 msgid "Road2Mayotte"
 msgstr "Road2Mayotte"
 
-#: src/translate.c:438
+#: glade/xcfa_win_about.glade:1294
 msgid "La Linuxerie"
 msgstr "La Linuxerie"
 
-#: src/translate.c:439
-msgid "Audioptimisation by Dzef"
-msgstr "Audioptimisation by Dzef"
-
-#: src/translate.c:440
+#: glade/xcfa_win_about.glade:1351
 msgid "Tuxfamily"
 msgstr "Tuxfamily"
 
-#: src/translate.c:441
+#: glade/xcfa_win_about.glade:1408
 msgid "Framasoft"
 msgstr "Framasoft"
 
-#: src/translate.c:442
+#: glade/xcfa_win_about.glade:1465
 msgid "Ekd (EnKoDeur-Mixeur)"
 msgstr "Ekd (EnKoDeur-Mixeur)"
 
-#: src/translate.c:443
-msgid "Bishop's page"
-msgstr "Bishop's page"
+#: glade/xcfa_win_about.glade:1544
+msgid "Debian Multimedia"
+msgstr "Debian Multimedia"
 
-#: src/translate.c:444
+#: glade/xcfa_win_about.glade:1598
 msgid "Je suis libre"
 msgstr "Je suis libre"
 
-#: src/translate.c:445
-msgid "Debian Multimedia"
-msgstr "Debian Multimedia"
-
-#: src/translate.c:446
+#: glade/xcfa_win_about.glade:1705
 msgid ""
 "\n"
 "Forum\n"
@@ -2729,19 +2517,15 @@
 "\n"
 "Forum\n"
 
-#: src/translate.c:447
-msgid "XCFA Vorstellung "
-msgstr "XCFA Vorstellung "
+#: glade/xcfa_win_about.glade:1825
+msgid "Forum Xcfa"
+msgstr "Forum Xcfa"
 
-#: src/translate.c:448
+#: glade/xcfa_win_about.glade:1879
 msgid "XCFA LinuxForen.de"
 msgstr "XCFA LinuxForen.de"
 
-#: src/translate.c:449
-msgid "Forum Xcfa"
-msgstr "Forum Xcfa"
-
-#: src/translate.c:450
+#: glade/xcfa_win_about.glade:1929
 msgid ""
 "\n"
 "Documentation\n"
@@ -2749,102 +2533,208 @@
 "\n"
 "Documentation\n"
 
-#: src/translate.c:451
+#: glade/xcfa_win_about.glade:2164
 msgid "Wiki Xcfa par Shankarius"
 msgstr "Wiki Xcfa par Shankarius"
 
-#: src/translate.c:452
+#: glade/xcfa_win_about.glade:2219
 msgid "Doc Xcfa par Patachon"
 msgstr "Doc Xcfa par Patachon"
 
-#: src/translate.c:453
+#: glade/xcfa_win_about.glade:2276
 msgid "Ogg Vorbis explique par Shankarius"
 msgstr "Ogg Vorbis expliqué par Shankarius"
 
-#: src/translate.c:454
+#: glade/xcfa_win_about.glade:2333
 msgid "La normalisation expliquee par Dzef"
 msgstr "La normalisation expliquée par Dzef"
 
-#: src/translate.c:455
+#: glade/xcfa_win_about.glade:2390
 msgid "Xcfa sur Linux On The Root"
 msgstr "Xcfa sur Linux On The Root"
 
-#: src/translate.c:456
+#: glade/xcfa_win_about.glade:2433
 msgid " Contributions "
 msgstr " Contributions "
 
-#: src/translate.c:457
+#: glade/xcfa_win_about.glade:2461
 msgid " License "
 msgstr " Licence "
 
-#: src/translate.c:458
+#: glade/xcfa_win_about.glade:2482
 msgid "OK"
 msgstr "OK"
 
-#: src/web.c:147 src/web.c:207
-msgid "PAS de navigateur present"
-msgstr "PAS de navigateur présent"
+#: glade/xcfa_win_scan.glade:9
+msgid "Scan en cours ..."
+msgstr "Scan en cours ..."
 
-#: src/web.c:148
-msgid "L'acces au web est impossible car aucun navigateur"
-msgstr "L'accès au web est impossible car aucun navigateur"
+#: glade/xcfa_win_scan.glade:77
+msgid "Scan du support en cours ..."
+msgstr "Scan du support en cours ..."
 
-#: src/web.c:150
-msgid "n'est present dans votre configuration."
-msgstr "n'est présent dans votre configuration."
+#: glade/xcfa_win_scan.glade:128
+msgid "Detail extraction mode expert"
+msgstr "Détail extraction mode expert"
 
-#: src/web.c:152
-msgid "Veuillez installez un navigateur."
-msgstr "Veuillez installez un navigateur."
+#: glade/xcfa_win_treeview.glade:7
+msgid "Modification des champs"
+msgstr "Modification des champs"
 
-#: src/web.c:161
-msgid "Vous devez ouvrir l'acces internet"
-msgstr "Vous devez ouvrir l'accès internet"
+#: glade/xcfa_win_treeview.glade:41
+msgid ""
+"\n"
+"Modification des champs\n"
+msgstr ""
+"\n"
+"Modification des champs\n"
 
-#: src/web.c:209
-msgid " L'acces au web est impossible car aucun navigateur"
-msgstr " L'accès au web est impossible car aucun navigateur"
+#: glade/xcfa_win_treeview.glade:129
+msgid "Temps"
+msgstr "Temps"
 
-#: src/web.c:211
-msgid " n'est present dans votre configuration."
-msgstr " n'est présent dans votre configuration."
+#: glade/xcfa_win_treeview.glade:163
+msgid "Choix"
+msgstr "Choix"
 
-#: src/web.c:213
-msgid " Veuillez installez un navigateur."
-msgstr " Veuillez installez un navigateur."
+#: glade/xcfa_win_treeview.glade:197 glade/xcfa_win_treeview.glade:577
+#: glade/xcfa_win_treeview.glade:995 glade/xcfa_win_treeview.glade:1260
+#: glade/xcfa_win_treeview.glade:1508 glade/xcfa_win_treeview.glade:1706
+msgid "Nom"
+msgstr "Nom"
 
-#: src/web.c:222
-msgid "L'application est absente."
-msgstr "L'application est absente."
+#: glade/xcfa_win_treeview.glade:220 glade/xcfa_win_treeview.glade:600
+#: glade/xcfa_win_treeview.glade:1018 glade/xcfa_win_treeview.glade:1283
+#: glade/xcfa_win_treeview.glade:1531 glade/xcfa_win_treeview.glade:1732
+msgid " Visibilite "
+msgstr " Visibilité "
 
-#: src/web.c:223
-msgid "Veuillez installer : "
-msgstr "Veuillez installer : "
+#: glade/xcfa_win_treeview.glade:250 glade/xcfa_win_treeview.glade:630
+#: glade/xcfa_win_treeview.glade:1048 glade/xcfa_win_treeview.glade:1313
+#: glade/xcfa_win_treeview.glade:1562 glade/xcfa_win_treeview.glade:1763
+msgid "Nom a gauche"
+msgstr "Nom à gauche"
 
-#: src/win_about.c:138
-msgid " Xcfa sur le web"
-msgstr " Xcfa sur le web"
+#: glade/xcfa_win_treeview.glade:267 glade/xcfa_win_treeview.glade:647
+#: glade/xcfa_win_treeview.glade:1065 glade/xcfa_win_treeview.glade:1330
+#: glade/xcfa_win_treeview.glade:1579 glade/xcfa_win_treeview.glade:1780
+msgid "Nom au centre"
+msgstr "Nom au centre"
 
-#: src/win_about.c:188
-msgid ""
-"\n"
-"Au tout debut:\n"
-"\n"
-"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
-"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
-"... ;-)\n"
-"\n"
-""
-msgstr ""
-"\n"
-"Au tout début:\n"
-"\n"
-"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
-"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
-"... ;-)\n"
-"\n"
-""
+#: glade/xcfa_win_treeview.glade:286 glade/xcfa_win_treeview.glade:666
+#: glade/xcfa_win_treeview.glade:1084 glade/xcfa_win_treeview.glade:1349
+#: glade/xcfa_win_treeview.glade:1598 glade/xcfa_win_treeview.glade:1799
+msgid "Nom a droite"
+msgstr "Nom à droite"
 
-#: src/win_scan.c:166
-msgid "Waiting ..."
-msgstr "Waiting ..."
+#: glade/xcfa_win_treeview.glade:326
+msgid "DVD"
+msgstr "DVD"
+
+#: glade/xcfa_win_treeview.glade:373 glade/xcfa_win_treeview.glade:791
+msgid "Wav"
+msgstr "Wav"
+
+#: glade/xcfa_win_treeview.glade:390 glade/xcfa_win_treeview.glade:808
+msgid "Flac"
+msgstr "Flac"
+
+#: glade/xcfa_win_treeview.glade:407 glade/xcfa_win_treeview.glade:825
+msgid "Ape"
+msgstr "Ape"
+
+#: glade/xcfa_win_treeview.glade:424 glade/xcfa_win_treeview.glade:842
+msgid "Wavpack"
+msgstr "Wavpack"
+
+#: glade/xcfa_win_treeview.glade:441 glade/xcfa_win_treeview.glade:859
+msgid "Ogg"
+msgstr "Ogg"
+
+#: glade/xcfa_win_treeview.glade:458 glade/xcfa_win_treeview.glade:876
+msgid "M4a"
+msgstr "M4a"
+
+#: glade/xcfa_win_treeview.glade:475 glade/xcfa_win_treeview.glade:893
+msgid "Aac"
+msgstr "Aac"
+
+#: glade/xcfa_win_treeview.glade:492 glade/xcfa_win_treeview.glade:910
+msgid "Musepack"
+msgstr "Musepack"
+
+#: glade/xcfa_win_treeview.glade:509 glade/xcfa_win_treeview.glade:927
+msgid "Mp3"
+msgstr "Mp3"
+
+#: glade/xcfa_win_treeview.glade:526
+msgid "Num"
+msgstr "Num"
+
+#: glade/xcfa_win_treeview.glade:709
+msgid "CD"
+msgstr "CD"
+
+#: glade/xcfa_win_treeview.glade:978
+msgid "Replaygain"
+msgstr "Replaygain"
+
+#: glade/xcfa_win_treeview.glade:1127
+msgid "CONVERSIONS"
+msgstr "CONVERSIONS"
+
+#: glade/xcfa_win_treeview.glade:1158
+msgid "Hertz"
+msgstr "Hertz"
+
+#: glade/xcfa_win_treeview.glade:1175
+msgid "New Hertz"
+msgstr "New Hertz"
+
+#: glade/xcfa_win_treeview.glade:1192
+msgid "Voie"
+msgstr "Voie"
+
+#: glade/xcfa_win_treeview.glade:1209
+msgid "New Voie"
+msgstr "New Voie"
+
+#: glade/xcfa_win_treeview.glade:1226
+msgid "Bits"
+msgstr "Bits"
+
+#: glade/xcfa_win_treeview.glade:1243
+msgid "New Bits"
+msgstr "New Bits"
+
+#: glade/xcfa_win_treeview.glade:1392
+msgid "WAV"
+msgstr "WAV"
+
+#: glade/xcfa_win_treeview.glade:1440
+msgid "Bitrate"
+msgstr "Bitrate"
+
+#: glade/xcfa_win_treeview.glade:1457
+msgid "New Bitrate"
+msgstr "New Bitrate"
+
+#: glade/xcfa_win_treeview.glade:1641
+msgid "MP3-OGG"
+msgstr "MP3-OGG"
+
+#: glade/xcfa_win_treeview.glade:1842
+msgid "TAGS"
+msgstr "TAGS"
+
+#: glade/xcfa_win_treeview.glade:1894
+msgid "Selection globale"
+msgstr "Sélection globale"
+
+#: glade/xcfa_win_treeview.glade:1948
+msgid "Deselection globale"
+msgstr "Désélection globale"
+
+#: glade/xcfa_win_treeview.glade:2009
+msgid "Retour"
+msgstr "Retour"

xcfa-4.2.8.tar.gz/po/it.gmo -> xcfa-5.0.2.tar.gz/po/it.gmo Changed

xcfa-4.2.8.tar.gz/po/it.po -> xcfa-5.0.2.tar.gz/po/it.po Changed

@@ -5,243 +5,189 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xcfa 4.2.8\n"
+"Project-Id-Version: xcfa 5.0.2\n"
 "Report-Msgid-Bugs-To: xcfa@tuxfamily.org\n"
-"POT-Creation-Date: 2012-02-03 13:22+0100\n"
-"PO-Revision-Date: 2010-08-29 13:04+0200\n"
+"POT-Creation-Date: 2015-05-16 14:03+0200\n"
+"PO-Revision-Date: 2015-02-07 10:34+0100\n"
 "Last-Translator: BULIN Claude xcfa@tuxfamily.org\n"
 "Language-Team: French <>\n"
-"Language: fr\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.7.3\n"
 
-#: src/cd_audio.c:815 src/dvd.c:684 src/dvd.c:1327
-msgid "MPLAYER deja en action"
-msgstr "MPLAYER azione già in"
+#: src/cd_audio.c:814 src/dvd.c:686 src/dvd.c:1345
+msgid "MPLAYER already in action"
+msgstr "MPLAYER già in azione"
 
-#: src/cd_audio.c:816 src/dvd.c:685 src/dvd.c:1328
-msgid "MPLAYER est deja utilise !!"
+#: src/cd_audio.c:815 src/dvd.c:687 src/dvd.c:1346
+msgid "MPLAYER is already in use !!"
 msgstr "MPlayer è già in uso !!"
 
-#: src/cd_audio.c:1227 src/cd_audio.c:1233 src/dvd.c:871 src/file.c:2830
-msgid "(Click Droit = Menu) / En attente de selection."
-msgstr "(Clic Destro = Menu) / Aspettiamo la selezione"
+#: src/cd_audio.c:1227 src/cd_audio.c:1233 src/file.c:2837
+msgid "(Right click = Menu) / Waiting for selection."
+msgstr "(Clic Destro = Menu) / Selezionato."
 
-#: src/cd_audio.c:1230 src/file.c:2827
-msgid "Le programme externe d'extraction est absent."
-msgstr "Il programma esterno per l'estrazione non e installato"
+#: src/cd_audio.c:1230
+msgid "The external ripping program is missing."
+msgstr "Il programma di ripping esterna manca."
 
-#: src/cd_audio.c:1236 src/file.c:2833
-msgid "(Click Droit = Menu) / En attente de selection. Le fichier existe."
-msgstr "(Clic Destro = Menu) / Aspettando la selezione. Il file esiste già."
+#: src/cd_audio.c:1236
+msgid "(Right click = Menu) / Waiting for Selection. File exists.."
+msgstr "(Clic Destro = Menu) / Selezionato. Il file esiste già. "
 
-#: src/cd_audio.c:1239 src/file.c:2836
-msgid "(Click Droit = Menu) / En selection."
+#: src/cd_audio.c:1239
+msgid "(Right click = Menu) / Selected files."
 msgstr "(Clic Destro = Menu) / Selezionato."
 
-#: src/cd_audio.c:1242 src/file.c:2842
-msgid "(Click Droit = Menu) / Selection avec options expert."
-msgstr "(Clic Destro = Menu) / Selezione con opzioni esperti."
+#: src/cd_audio.c:1242 src/file.c:2849
+msgid "(Right click = Menu) / Selection - expert mode."
+msgstr "(Clic Destro = Menu) / Selezione con opzioni da esperto."
 
-#: src/cd_audio.c:1245 src/file.c:2839
-msgid "(Click Droit = Menu) / En selection. Le fichier existe."
+#: src/cd_audio.c:1245 src/file.c:2846
+msgid "(Right click = Menu) / Selected files. File exists."
 msgstr "(Clic Destro = Menu) / Selezionato. Il file esiste già. "
 
-#: src/cd_audio.c:1248 src/file.c:2845
-msgid ""
-"(Click Droit = Menu) / Selection avec options expert. Le fichier existe."
+#: src/cd_audio.c:1248 src/file.c:2852
+msgid "(Right click = Menu) / Selection - expert mode. File exists."
 msgstr ""
-"(Clic Destro = Menu) / Selezione con opzioni esperti. Il file esiste già. "
+"(Clic Destro = Menu) / Selezione con opzioni da esperto. Il file esiste già. "
 
 #: src/cd_audio.c:1257
 msgid ""
-"(Click Droit = Menu) / Possibilite d'ajustement INDIVIDUEL ou COLLECTIF "
-"maximal du volume"
+"(Right click = Menu) / Possibilities for individual adaptation or maximum "
+"collection volume"
 msgstr ""
-"(Clic Destro = Menu) / Possibilità di adattamento individuale o il volume "
+"(Right click = Menu) / Possibilità di adattamento individuale o volume "
 "massimo di raccolta"
 
 #: src/cd_audio.c:1262
-msgid "(Click Droit = Menu) / Ajustement INDIVIDUEL maximal du volume"
-msgstr ""
-"(Clic Destro = Menu) / INDIVIDUALI al massimo la regolazione del volume."
+msgid "(Right click = Menu) / INDIVIDUAL maximum volume adjustment"
+msgstr "(Clic Destro = Menu) / Regolazione INDIVIDUALE al massimo del volume"
 
 #: src/cd_audio.c:1265
-msgid "(Click Droit = Menu) / Ajustement COLLECTIF maximal du volume"
-msgstr "(Clic Destro = Menu) / COLLETTIVO regolazione del volume massimo"
-
-#: src/cd_audio.c:1505 src/dvd.c:1103 src/file.c:3139 src/translate.c:336
-#: src/translate.c:347 src/translate.c:366
-msgid "Play"
-msgstr "Play"
-
-#: src/cd_audio.c:1546 src/file.c:3204 src/translate.c:348 src/translate.c:369
-msgid "Wav"
-msgstr "Wav"
-
-#: src/cd_audio.c:1567 src/file.c:3223 src/translate.c:349 src/translate.c:370
-msgid "Flac"
-msgstr "Flac"
-
-#: src/cd_audio.c:1587 src/file.c:3242 src/translate.c:350 src/translate.c:371
-msgid "Ape"
-msgstr "Ape"
-
-#: src/cd_audio.c:1607 src/file.c:3261
-msgid "WavP"
-msgstr "WavP"
-
-#: src/cd_audio.c:1627 src/file.c:3280 src/translate.c:352 src/translate.c:373
-msgid "Ogg"
-msgstr "Ogg"
-
-#: src/cd_audio.c:1648 src/file.c:3299 src/translate.c:353 src/translate.c:374
-msgid "M4a"
-msgstr "M4a"
-
-#: src/cd_audio.c:1669 src/file.c:3318 src/translate.c:354 src/translate.c:375
-msgid "Aac"
-msgstr "Aac"
-
-#: src/cd_audio.c:1689 src/file.c:3337
-msgid "Mpc"
-msgstr "Mpc"
-
-#: src/cd_audio.c:1709 src/file.c:3356 src/translate.c:356 src/translate.c:377
-msgid "Mp3"
-msgstr "Mp3"
+msgid "(Right click = Menu) / COLLECTIVE maximum volume adjustment"
+msgstr "(Clic Destro = Menu) / Regolazione COLLETTIVA al massimo del volume"
 
-#: src/cd_audio.c:1730 src/translate.c:357
-msgid "Num"
-msgstr "Num"
-
-#: src/cd_audio.c:1745 src/translate.c:358 src/translate.c:378
-#: src/translate.c:403 src/translate.c:411
-msgid "Time"
-msgstr "Tempo"
-
-#: src/cd_audio.c:1760 src/dvd.c:1171 src/file.c:3392 src/translate.c:340
-#: src/translate.c:359 src/translate.c:379
+#: src/cd_audio.c:1764 src/dvd.c:1187 src/file.c:3403
+#: glade/xcfa_win_treeview.glade:180 glade/xcfa_win_treeview.glade:560
+#: glade/xcfa_win_treeview.glade:961
 msgid "Normalise"
 msgstr "Normalizza"
 
-#: src/cd_audio.c:1785 src/dvd.c:1191 src/file.c:3434 src/file_mp3ogg.c:1287
-#: src/file_tags.c:1209 src/file_wav.c:952 src/prg_init.c:614
-#: src/translate.c:341 src/translate.c:360 src/translate.c:381
-#: src/translate.c:393 src/translate.c:404 src/translate.c:412
-msgid "Nom"
-msgstr "Nome"
+#: src/cd_audio.c:1789 src/dvd.c:1207 src/file.c:3445 src/file_mp3ogg.c:964
+#: src/file_tags.c:1253 src/file_wav.c:830 src/prg_init.c:609
+msgid "Name"
+msgstr "Name"
 
-#: src/cd_audio.c:2507
-msgid " Parametrage CDDB: [ Nom du serveur ]"
+#: src/cd_audio.c:2517
+msgid " Setting up CDDB: [ Server name ]"
 msgstr " Impostazione CDDB: [ Nome server ]"
 
-#: src/cd_audio.c:2516
-msgid " Parametrage PROXY: [ serveur ] [ port ]"
+#: src/cd_audio.c:2526
+msgid " Proxy settings: [ server ] [ port ] "
 msgstr " Impostazioni PROXY: [ server ] [ porta ]"
 
-#: src/cd_audio.c:2526 src/translate.c:99
-msgid " Serveur "
-msgstr " Serventi "
+#: src/cd_audio.c:2536 glade/xcfa.glade:1842
+msgid " Server "
+msgstr " Server "
 
-#: src/cd_audio_extract.c:661
+#: src/cd_audio_extract.c:673
 #, c-format
-msgid ""
-"[Erreur du segment numero: %d]\n"
-"%d) Lecture PASS 1/2\n"
+msgid "[Error on segment #%d] %d) Playing PASS 1/2\n"
 msgstr ""
 "[Errore del segmento numero: %d]\n"
 "%d) Lettura PASS 1/2\n"
 
-#: src/cd_audio_extract.c:668
+#: src/cd_audio_extract.c:680
 #, c-format
 msgid ""
-"--> Deja %d fois 2 lectures du segment %d!\n"
+"--> Segment %d already read two %d times!\n"
 " Abandon :/\n"
 msgstr ""
-"--> Segmento %d!\n"
-" già letto %d volte 2 volte Abandono :/\n"
+"--> Segmento %d\n"
+" già letto %d volte 2 volte! Abbandono :/\n"
 
-#: src/cd_audio_extract.c:688
+#: src/cd_audio_extract.c:700
 #, c-format
-msgid "%d) Lecture PASS 2/2\n"
+msgid "%d) Read PASS 2/2\n"
 msgstr "%d) Lettura PASS 2/2\n"
 
-#: src/cd_audio_extract.c:769
+#: src/cd_audio_extract.c:780
 #, c-format
 msgid ""
 "\n"
-"[Piste: %d]\n"
+"[Track: %d]\n"
 msgstr ""
 "\n"
 "[Traccia: %d]\n"
 
-#: src/cd_audio_extract.c:773
-msgid "Extraction mode expert PASS 1/2\n"
+#: src/cd_audio_extract.c:784
+msgid "Ripping expert mode PASS 1/2\n"
 msgstr "Estrazione modo esperto PASS 1/2\n"
 
-#: src/cd_audio_extract.c:784
-msgid "Extraction mode expert PASS 2/2\n"
+#: src/cd_audio_extract.c:795
+msgid "Ripping expert mode PASS 2/2\n"
 msgstr "Estrazione modo esperto PASS 2/2\n"
 
-#: src/cd_audio_extract.c:792
-msgid "Controle du contenu des fichiers extraits\n"
-msgstr "Verificazione del contenuto dei files estratti\n"
+#: src/cd_audio_extract.c:803
+msgid "Control the content of the extracted files\n"
+msgstr "Verifica del contenuto dei files estratti\n"
 
-#: src/cd_audio_extract.c:1678 src/cd_audio_extract.c:1680
+#: src/cd_audio_extract.c:1710 src/cd_audio_extract.c:1712
 msgid "XCFA: Extraction CD"
 msgstr "XCFA: Estrazione CD"
 
-#: src/cd_audio_extract.c:1678 src/dvd_extract.c:412 src/file_action.c:190
-#: src/file_mp3ogg_conv.c:300 src/file_wav_conv.c:349
+#: src/cd_audio_extract.c:1710 src/dvd_extract.c:412 src/file_action.c:183
+#: src/file_mp3ogg_conv.c:329 src/file_wav_conv.c:343
 msgid "Ok"
 msgstr "Ok"
 
-#: src/cd_audio_extract.c:1680 src/dvd_extract.c:414 src/file_action.c:192
-#: src/file_mp3ogg_conv.c:302 src/file_wav_conv.c:351
-msgid "Arret par l'utilisateur"
-msgstr "Fermato dal utente"
+#: src/cd_audio_extract.c:1712 src/dvd_extract.c:414 src/file_action.c:185
+#: src/file_mp3ogg_conv.c:331 src/file_wav_conv.c:345
+msgid "Stop by user"
+msgstr "Stop di utente"
 
-#: src/cd_audio_extract.c:1938
-msgid "Nom de fichier unique absent"
-msgstr "Nome del unico file assente"
+#: src/cd_audio_extract.c:1983
+msgid "File name not found"
+msgstr "Nome file non trovato"
 
-#: src/cd_audio_extract.c:1939
-msgid "Veuillez saisir un nom pour le fichier unique"
-msgstr "Siete pregati di entrare un nome per l'unico file"
+#: src/cd_audio_extract.c:1984
+msgid "Please enter a file name"
+msgstr "Si prega di inserire un nome di file"
 
-#: src/cd_audio_toc.c:160
+#: src/cd_audio_toc.c:156
 msgid "cdda2wav and icedax NOT FOUND"
 msgstr "cdda2wav e icedax NON TROVATO"
 
-#: src/cd_audio_toc.c:161
+#: src/cd_audio_toc.c:157
 msgid "Please, install packages [ icedax, cdda2wav ]"
 msgstr "Per favore, installare i pacchetti [icedax, cdda2wav]"
 
-#: src/cd_audio_toc.c:166
+#: src/cd_audio_toc.c:163
 msgid "icedax NOT FOUND"
 msgstr "icedax NON TROVATO!"
 
-#: src/cd_audio_toc.c:167
+#: src/cd_audio_toc.c:164
 msgid "Please, install package [ icedax ]"
 msgstr "Per favore, installare il pacchetto [icedax]"
 
-#: src/cd_audio_toc.c:172
+#: src/cd_audio_toc.c:170
 msgid "cdda2wav NOT FOUND"
 msgstr "cdda2wav NON TROVATO"
 
-#: src/cd_audio_toc.c:173
+#: src/cd_audio_toc.c:171
 msgid "Please, install package [ cdda2wav ]"
 msgstr "Per favore, installare il pacchetto [ cdda2wav ]"
 
-#: src/cd_audio_toc.c:181
+#: src/cd_audio_toc.c:180
 msgid "cdparanoia NOT FOUND"
 msgstr "cdparanoia NON TROVATO!"
 
-#: src/cd_audio_toc.c:182
+#: src/cd_audio_toc.c:181
 msgid "Please, install package [ cdparanoia ]"
-msgstr "Siete pregati di installare il pacchetto [ cdparanoia ]"
+msgstr "Per favore, installare il pacchetto [ cdparanoia ]"
 
 #: src/cd_audio_toc.c:188
 msgid "cd-discid NOT FOUND"
@@ -251,1328 +197,1294 @@
 msgid "Please, install packages [ cd-discid ]"
 msgstr "Per favore, installare il pacchetto [ cd-discid ]"
 
-#: src/cd_audio_toc.c:202
-msgid "ERREUR datas proxy"
+#: src/cd_audio_toc.c:203
+msgid "ERROR datas proxy"
 msgstr "ERRORE dati proxy"
 
-#: src/cd_audio_toc.c:203
-msgid "Veuillez renseigner les champs du proxy"
-msgstr "Si prega di compilare tutti i campi delega"
+#: src/cd_audio_toc.c:204
+msgid "Please complete all fields proxy"
+msgstr "Si prega di compilare tutti i campi del proxy"
 
-#: src/cd_curl.c:718 src/web.c:160
-msgid "La liaison internet est absente"
-msgstr "La connessione Internet non e accesa"
+#: src/cd_curl.c:734 src/web.c:187
+msgid "A web connection is missing"
+msgstr "Una connessione web mancante"
 
-#: src/cd_curl.c:1122
+#: src/cd_curl.c:1204
 msgid "Couldn't find CD"
 msgstr "Impossibile trovare il CD"
 
-#: src/cd_curl.c:1185
+#: src/cd_curl.c:1267
 msgid "No Audio CD"
 msgstr "Nessun CD Audio"
 
-#: src/dvd.c:863
+#: src/dvd.c:877
 msgid ""
-"(Click Droit = Menu) / PEAK-ALBUM: Amplification maximale du volume pour un "
-"groupe de fichiers en respectant les ecarts de niveau entre chacun d'eux."
+"(Right click = Menu) / Maximum volume amplification of a group of files "
+"keeping the level difference between each of them."
 msgstr ""
-"(Clic Destro = Menu) / PEAK-ALBUM: Amplificazione maximale del volume per un "
-"grupo di files rispettando le differenze di livello tra ogni uno. "
+"(Right click = Menu) / Amplificazione massimo volume di un gruppo di file "
+"mantenendo la differenza di livello tra ciascuna di esse."
 
-#: src/dvd.c:866
-msgid ""
-"(Click Droit = Menu) / PEAK: Amplification maximale du volume pour chaque de "
-"fichier."
-msgstr ""
-"(Clic Destro = Menu) / PEAK: Amplificazione maximale del volume per ogni "
-"file. "
+#: src/dvd.c:882 src/file.c:2882
+msgid "PEAK: Maximum volume amplification of each file."
+msgstr "PEAK: l'amplificazione massima volume di ogni file."
 
-#: src/dvd.c:904 src/dvd.c:924
-msgid "En attente de selection. Un click activera la conversion vers 2 canaux."
-msgstr "Aspettiamo la selezione. Un clic mandarà la conversione verso 2 canali"
+#: src/dvd.c:887
+msgid "(Right click = Menu) / ReplayGain: Waiting for selection."
+msgstr "(Clic Destro = Menu) / ReplayGain: In attesa di selezione."
+
+#: src/dvd.c:920 src/dvd.c:940
+msgid ""
+"Waiting for selection. A click will activate the conversion to 2 channels."
+msgstr "In attesa di selezione. Un clic attiverà la conversione a 2 canali"
 
-#: src/dvd.c:916
-msgid "Conversion vers 2 canaux."
-msgstr "Conversione verso 2 canali"
+#: src/dvd.c:932
+msgid "Conversion to 2 channels."
+msgstr "Conversione a 2 canali"
 
-#: src/dvd.c:928
+#: src/dvd.c:944
 #, c-format
-msgid "Conversion vers %s canaux."
-msgstr "Conversione verso %s canali."
+msgid "Conversion to %s channels."
+msgstr "Conversione a %s canali."
 
-#: src/dvd.c:933
+#: src/dvd.c:949
 #, c-format
 msgid ""
-"Conversion vers 2 canaux. Un second click activera la conversion vers %s "
-"canaux."
+"Conversion to 2 channels. A second click will activate the conversion to %s "
+"channels."
 msgstr ""
-"Conversione verso 2 canali. Un secondo clic mandarà la conversione verso %s "
+"Conversione a 2 canali. Un secondo clic attiverà la conversione verso %s "
 "canali. "
 
-#: src/dvd.c:948
-msgid "Musique en ecoute."
-msgstr "Ascoltando musica"
+#: src/dvd.c:964
+msgid "Playing music."
+msgstr "Riproduzione di musica."
 
-#: src/dvd.c:951
-msgid "Musique en attente."
-msgstr "Musica in pausa"
+#: src/dvd.c:967
+msgid "Music paused."
+msgstr "Musica in pausa."
 
-#: src/dvd.c:966
+#: src/dvd.c:982
 #, c-format
 msgid "Total selection%s: %d, 2ch: %d"
 msgstr "Totale selezionato%s: %d, 2ch: %d"
 
-#: src/dvd.c:967
+#: src/dvd.c:983
 msgid "s"
 msgstr "s"
 
-#: src/dvd.c:973
-msgid "Ce fichier ne peut etre extrait !"
-msgstr "Questo file non puo essere estratto !"
+#: src/dvd.c:989
+msgid "This file can not be ripped !"
+msgstr "Questo file non può essere strappato !"
 
-#: src/dvd.c:1091
-msgid "Titres"
-msgstr "Titoli"
+#: src/dvd.c:1107
+msgid "Titles"
+msgstr "Titles"
 
-#: src/dvd.c:1115 src/file.c:3375 src/file_mp3ogg.c:1272 src/file_tags.c:1193
-#: src/translate.c:337
-msgid "Temps"
+#: src/dvd.c:1119 glade/xcfa_win_treeview.glade:112
+#: glade/xcfa_win_treeview.glade:356 glade/xcfa_win_treeview.glade:740
+msgid "Play"
+msgstr "Play"
+
+#: src/dvd.c:1131 src/file.c:3386 src/file_mp3ogg.c:949 src/file_tags.c:1237
+#: glade/xcfa_win_treeview.glade:543 glade/xcfa_win_treeview.glade:944
+#: glade/xcfa_win_treeview.glade:1491 glade/xcfa_win_treeview.glade:1689
+msgid "Time"
 msgstr "Tempo"
 
-#: src/dvd.c:1127 src/translate.c:338
+#: src/dvd.c:1143 glade/xcfa_win_treeview.glade:146
 msgid "Format"
 msgstr "Formato"
 
-#: src/dvd.c:1139 src/translate.c:339
-msgid "Choix"
+#: src/dvd.c:1155
+msgid "Choice"
 msgstr "Scelta"
 
-#: src/dvd.c:1253
-msgid "Fichier structure DVD"
+#: src/dvd.c:1267
+msgid "DVD file structure"
 msgstr "File struttura DVD"
 
-#: src/dvd.c:1303
-msgid "Le DVD est absent du lecteur."
-msgstr "Il lettore DVD è assente."
+#: src/dvd.c:1320
+msgid "The DVD player is absent."
+msgstr "Sox e Mplayer assenti"
 
-#: src/dvd.c:1338
-msgid "Scan ..."
-msgstr "scannerizzazione ..."
-
-#: src/dvd.c:1387
-msgid "lsdvd est absent !"
+#: src/dvd.c:1410
+msgid "lsdvd is missing !"
 msgstr "lsdvd è assente"
 
-#: src/dvd.c:1388
-msgid "Il faut installer le programme: lsdvd"
+#: src/dvd.c:1411
+msgid "You must install the program: lsdvd"
 msgstr "È necessario installare il programma: lsdvd"
 
 #: src/dvd_extract.c:412 src/dvd_extract.c:414
-msgid "XCFA: Extraction DVD"
-msgstr "XCFA: Estrazione DVD"
+msgid "XCFA: DVD rip"
+msgstr "XCFA: DVD rip"
 
-#: src/dvd_read.c:267
+#: src/dvd_read.c:226
 #, c-format
-msgid "Titre [%02d ** ]"
+msgid "Title [%02d ** ]"
 msgstr "Titolo [%02d ** ]"
 
-#: src/dvd_read.c:270
+#: src/dvd_read.c:227
 #, c-format
-msgid "Titre [%02d]"
+msgid "Title [%02d]"
 msgstr "Titolo [%02d]"
 
-#: src/dvd_read.c:313
-#, c-format
-msgid "Fichier_complet_%02d_%s"
-msgstr "File_completo_%02d_%s"
-
-#: src/dvd_read.c:357
+#: src/dvd_read.c:252
 #, c-format
-msgid "Chapitre: [%02d]"
+msgid "Chapter: [%02d]"
 msgstr "Capitolo: [%02d]"
 
-#: src/dvd_read.c:402
-#, c-format
-msgid "Titre_%02d_Chapitre_%02d_audio_%02d_%s"
-msgstr "Titolo_%02d_Capitolo_%02d_audio_%02d_%s"
-
-#: src/file_action.c:190 src/file_action.c:192
-msgid "XCFA: Traitement fichiers"
-msgstr "XCFA: Elaborazione immagini"
+#: src/file_action.c:183 src/file_action.c:185
+msgid "XCFA: Processing files"
+msgstr "XCFA: file di elaborazione"
 
-#: src/file_analyze.c:624
+#: src/file_analyze.c:731
 msgid "Package checkmp3 (mp3check) NOT FOUND !"
 msgstr "Pacchetto checkmp3 (mp3check) NON TROVAO !"
 
-#: src/file_analyze.c:625
+#: src/file_analyze.c:732
 msgid ""
-"Veuillez installer checkmp3 ou mp3check pour\n"
-"la prise en compte des fichiers mp3"
+"Please install or checkmp3 mp3check for\n"
+"consideration of mp3 files"
 msgstr ""
-"Si prega di installare o checkmp3 mp3check\n"
-"a titolo oneroso di file mp3"
+"Si prega di installare o checkmp3 mp3check per\n"
+"poter gestire i file mp3"
 
-#: src/file.c:332
+#: src/file.c:327
 #, c-format
-msgid "Total fichiers: %d, Selections: %d"
-msgstr "Numero totale di file: %d, Numero di file selezionati: %d"
+msgid "Total files: %d, Selections: %d"
+msgstr "File totali: %d, File selezionati: %d"
 
-#: src/file.c:445
-msgid "CAPACITE DOSSIER TEMPORAIRE TROP FAIBLE"
-msgstr "CAPACITA CARTELLA TEMPORANEA TROPPO BASSA"
+#: src/file.c:441
+msgid "TEMPORARY CAPACITY TOO LOW"
+msgstr "Capacità temporanea TROPPO BASSA"
 
-#: src/file.c:446
-msgid "Pas assez de place dans le dossier temporaire"
-msgstr "ATTENZIONE: Capacita della cartella temporanea troppo bassa."
+#: src/file.c:442 src/file.c:2875
+msgid "WARNING: Not enough space available in the temp folder."
+msgstr ""
+"ATTENZIONE: Non abbastanza spazio disponibile nella cartella temporanea."
 
-#: src/file.c:452
-msgid "Veuillez deselectionner des PeakGroup."
-msgstr "Siete pregati di deselezionare PeakGroup"
+#: src/file.c:448
+msgid "Please deselect PeakGroup."
+msgstr "Si prega di deselezionare PeakGroup"
 
-#: src/file.c:1439
-msgid "Conversion(s) vers la source"
-msgstr "Conversione verso la cartella di origine"
+#: src/file.c:1431
+msgid "Conversion(s) to source"
+msgstr "Conversione(i) nella directory di origine"
 
-#: src/file.c:1440
-msgid "Choix d'une nouvelle destination"
-msgstr "Nuova destinazione"
+#: src/file.c:1432
+msgid "Select a new destination"
+msgstr "Selezionare una nuova destinazione"
 
-#: src/file.c:1510
+#: src/file.c:1501
 msgid "Select type: --"
 msgstr "Seleziona il tipo: --"
 
-#: src/file.c:1595
+#: src/file.c:1584
 msgid "Peak/album"
 msgstr "Peak/album"
 
-#: src/file.c:1596
+#: src/file.c:1585
 msgid "Peak"
 msgstr "Peak"
 
-#: src/file.c:1597
+#: src/file.c:1586
 msgid "Mix (scan)Rms/album"
 msgstr "Mix (scan)Rms/album"
 
-#: src/file.c:1598
+#: src/file.c:1587
 msgid "Fix (scan)Rms"
 msgstr "Fix (scan)Rms"
 
-#: src/file.c:2854
-#, c-format
-msgid "MAX FICHIERS ATTEINT = %d"
-msgstr "MAX FILE RAGIUNTO = %d"
+#: src/file.c:2834
+msgid "The external ripping program is missing"
+msgstr "Il programma di ripping esterna manca"
 
-#: src/file.c:2864
-msgid "Normalise: En attente de selection."
-msgstr "Normalizzare: Aspettando la selezione. "
+#: src/file.c:2840
+msgid "(Right click = Menu) / Waiting for Selection. File exists."
+msgstr "(Clic Destro = Menu) / Selezionato. Il file esiste già. "
+
+#: src/file.c:2843
+msgid "(Right click = Menu) / Selected files"
+msgstr "(Clic Destro = Menu) / Selezionato."
 
-#: src/file.c:2868
-msgid "ATTENTION: Pas assez de place dans le dossier temporaire."
-msgstr "ATTENZIONE: Capacita della cartella temporanea troppo bassa. "
+#: src/file.c:2861
+#, c-format
+msgid "MAX FILES REACHED = %d"
+msgstr "RAGIUNTO IL NUMERO MASSIMO DI FILE = %d"
 
 #: src/file.c:2871
+msgid "Normalise: Waiting for selection."
+msgstr "Normalizzazione: In attesa di selezione."
+
+#: src/file.c:2878
 msgid ""
-"PEAK-ALBUM: Amplification maximale du volume pour un groupe de fichiers en "
-"respectant les ecarts de niveau entre chacun d'eux."
+"PEAK-ALBUM: Maximum volume amplification for a group of files according to "
+"the deviations in level between them"
 msgstr ""
-"PEAK-ALBUM: Amplificazione massimale del volume per ogni gruppo di file "
-"rispettando le variazione tra ogni uno di loro. "
+"PEAK-ALBUM: l'amplificazione massima di volume per un gruppo di file in base "
+"alle deviazioni a livello tra di loro"
 
-#: src/file.c:2875
-msgid "PEAK: Amplification maximale du volume pour chaque de fichier."
-msgstr "PEAK: Amplificazione massimale del volume di ogni file. "
-
-#: src/file.c:2878
+#: src/file.c:2885
 msgid ""
-"RMS-ALBUM: Ajustement du volume moyen pour un groupe de fichiers en "
-"respectant les ecarts de niveau moyen entre chacun d'eux."
+"RMS-ALBUM: Adjusting the average volume for a group of files according to "
+"the average level of deviation between them."
 msgstr ""
-"RMS-ALBUM: Aggiustamento del volume medio per un gruppo di file rispettando "
-"le variazione di livello medio tra ogni uno. "
+"RMS-ALBUM: Regolazione del volume medio di un gruppo di file secondo il "
+"livello medio di deviazione tra loro."
 
-#: src/file.c:2881
-msgid "RMS: Ajustement du volume moyen de chaque de fichier."
-msgstr "RMS: Aggiustamento del volume medio di ogni file. "
+#: src/file.c:2888
+msgid "RMS: Average volume amplification of each file."
+msgstr "RMS: l'amplificazione medio volume di ogni file."
 
-#: src/file.c:2895
-msgid "(Click Droit = Menu) / ReplayGain: En attente de selection."
-msgstr "(Clic Destro = Menu) / ReplayGain: Aspettando la selezione. "
+#: src/file.c:2902
+msgid "(Right Click = Menu) / ReplayGain: Waiting for selection."
+msgstr "(Clic Destro = Menu) / ReplayGain: In attesa di selezione."
 
-#: src/file.c:2898
-msgid "(Click Droit = Menu) / Mode piste."
-msgstr "(Clic Destro = Menu) / Modo traccia"
+#: src/file.c:2905
+msgid "(Right Click = Menu) / Track mode."
+msgstr "(Clic Destro = Menu) / Modo traccia."
 
-#: src/file.c:2901
-msgid "(Click Droit = Menu) / Mode album."
+#: src/file.c:2908
+msgid "(Right Click = Menu) / Album mode."
 msgstr "(Clic Destro = Menu) / Modo album."
 
-#: src/file.c:2904
-msgid "(Click Droit = Menu) / Mode effacer."
-msgstr "(Clic Destro = Menu) / Modo cancellare"
+#: src/file.c:2911
+msgid "(Right Click = Menu) / Erase mode."
+msgstr "(Clic Destro = Menu) / Selezionato."
 
-#: src/file.c:3016
+#: src/file.c:3026
 msgid ""
-"(Click Droit = Menu) / Cliquez ici pour envoyer ce fichier apres traitement "
-"a la corbeille"
-msgstr ""
-"(Clic Destro = Menu) / Clicare per spostare il file nel cestino dopo il "
-"trattamento. "
+"(Click Droit = Menu) / Click here to send the processed file to the trash"
+msgstr "(Clic Destro = Menu) / Scelta del numero di bit per la codifica"
 
-#: src/file.c:3019
+#: src/file.c:3029
 msgid ""
-"(Click Droit = Menu) / Ce fichier sera dirige apres traitement vers la "
-"corbeille"
+"(Right Click = Menu) / This file will be sent to the trash after processing"
 msgstr ""
-"(Clic Destro = Menu) / Questo file sarà spostato nel cestino dopo il "
-"trattamento. "
+"(Right Click = Menu) / Questo file verrà inviato nel cestino dopo "
+"l'elaborazione"
 
-#: src/file.c:3152 src/file_trash.c:367 src/translate.c:367
+#: src/file.c:3163 src/file_trash.c:208 glade/xcfa_win_treeview.glade:757
 msgid "Trash"
 msgstr "Cestino"
 
-#: src/file.c:3172 src/file_mp3ogg.c:1212 src/file_tags.c:1178
-#: src/translate.c:368 src/translate.c:399 src/translate.c:410
+#: src/file.c:3183 src/file_mp3ogg.c:889 src/file_tags.c:1222
+#: glade/xcfa_win_treeview.glade:774 glade/xcfa_win_treeview.glade:1423
+#: glade/xcfa_win_treeview.glade:1672
 msgid "Type"
 msgstr "Tipo"
 
-#: src/file.c:3411
-msgid "ReplayGain"
-msgstr "ReplayGain"
-
-#: src/file_mp3ogg.c:771
-msgid "128 -defaut"
-msgstr "128 -di base"
+#: src/file_conv.c:1187
+msgid "Error since MPLAYER !"
+msgstr "Errore da MPLAYER !"
 
-#: src/file_mp3ogg.c:787
-msgid "V0 -meilleure qualite"
-msgstr "V0 - migliore qualita"
+#: src/file_conv.c:1188 src/file_conv.c:1200 src/file_mp3ogg_conv.c:337
+#: src/file_mp3ogg_conv.c:349
+msgid "You can enable XCFA command line with: "
+msgstr "È possibile attivare la linea di comando XCFA con: "
 
-#: src/file_mp3ogg.c:791 src/file_mp3ogg.c:811
-msgid "V4 -defaut"
-msgstr "V4 -di base"
+#: src/file_conv.c:1190 src/file_conv.c:1202 src/file_mp3ogg_conv.c:339
+#: src/file_mp3ogg_conv.c:351
+msgid "$ xcfa -verbose"
+msgstr "$ xcfa -verbose"
 
-#: src/file_mp3ogg.c:796
-msgid "V9 -moins bonne qualite"
-msgstr "V9 -qualita meno buona"
+#: src/file_conv.c:1192 src/file_mp3ogg_conv.c:341
+msgid "to see the type of error returned by mplayer."
+msgstr "per vedere il tipo di errore riportato da mplayer."
 
-#: src/file_mp3ogg.c:849
-msgid "Defaut"
-msgstr "Di base"
+#: src/file_conv.c:1199
+msgid "Error since SOX !"
+msgstr "Errore da SOX !"
 
-#: src/file_mp3ogg.c:884
-msgid "Qualite -1 -Moins bonne qualite"
-msgstr "Qualita -1 - Qualita meno buona"
+#: src/file_conv.c:1204 src/file_mp3ogg_conv.c:353
+msgid "to see the type of error returned by sox."
+msgstr "per vedere il tipo di errore riportato da sox."
 
-#: src/file_mp3ogg.c:885 src/options_oggenc.c:149
-msgid "Qualite 0"
-msgstr "Qualita 0"
+#: src/file_mp3ogg.c:670
+msgid "Right click: access popup"
+msgstr "Click destro del mouse: accedere al popup"
 
-#: src/file_mp3ogg.c:886 src/options_oggenc.c:150
-msgid "Qualite 1"
-msgstr "Qualita 1"
-
-#: src/file_mp3ogg.c:887 src/options_oggenc.c:151
-msgid "Qualite 2"
-msgstr "Qualita 2"
-
-#: src/file_mp3ogg.c:888
-msgid "Qualite 3 -Defaut"
-msgstr "Qualita 3 - Di base"
-
-#: src/file_mp3ogg.c:889 src/options_oggenc.c:153
-msgid "Qualite 4"
-msgstr "Qualita 4"
-
-#: src/file_mp3ogg.c:890 src/options_oggenc.c:154
-msgid "Qualite 5"
-msgstr "Qualita 5"
-
-#: src/file_mp3ogg.c:891 src/options_oggenc.c:155
-msgid "Qualite 6"
-msgstr "Qualita 6"
-
-#: src/file_mp3ogg.c:892 src/options_oggenc.c:156
-msgid "Qualite 7"
-msgstr "Qualita 7"
-
-#: src/file_mp3ogg.c:893 src/options_oggenc.c:157
-msgid "Qualite 8"
-msgstr "Qualita 8"
-
-#: src/file_mp3ogg.c:894 src/options_oggenc.c:158
-msgid "Qualite 9"
-msgstr "Qualita 9"
-
-#: src/file_mp3ogg.c:895
-msgid "Qualite 10 -Meilleure qualite"
-msgstr "Qualita 10 - Migliore qualita"
-
-#: src/file_mp3ogg.c:926 src/options_oggenc.c:189 src/options_wavpack.c:186
-#: src/options_wavpack.c:209 src/options_wavpack.c:232
-msgid "Oui"
-msgstr "Si"
-
-#: src/file_mp3ogg.c:927 src/options_oggenc.c:190 src/options_wavpack.c:153
-#: src/options_wavpack.c:185 src/options_wavpack.c:208
-#: src/options_wavpack.c:231 src/options_wavpack.c:252
-msgid "Non"
-msgstr "No"
-
-#: src/file_mp3ogg.c:949 src/options_oggenc.c:211
-msgid "Mono force"
-msgstr "Mono obbligato "
-
-#: src/file_mp3ogg.c:950 src/options_oggenc.c:212
-msgid "Stereo"
-msgstr "Stereo"
+#: src/file_mp3ogg.c:921
+msgid "New bitrate"
+msgstr "Nuovo Bitrate"
 
-#: src/file_mp3ogg.c:1228 src/translate.c:400
-msgid "Bitrate"
-msgstr "Bitrate"
+#: src/file_mp3ogg.c:935 glade/xcfa_win_treeview.glade:1474
+msgid "Size"
+msgstr "Dimensione"
 
-#: src/file_mp3ogg.c:1244
-msgid "Nouveau bitrate"
-msgstr "Nuovo bitrate"
+#: src/file_mp3ogg_conv.c:329 src/file_mp3ogg_conv.c:331
+msgid "XCFA: Bitrate change"
+msgstr "XCFA: Elaborazione file"
 
-#: src/file_mp3ogg.c:1258
-msgid "Taille"
-msgstr "Dimensione"
+#: src/file_mp3ogg_conv.c:336
+msgid "Error from MPLAYER !"
+msgstr "Errore da MPLAYER !"
 
-#: src/file_mp3ogg_conv.c:300 src/file_mp3ogg_conv.c:302
-msgid "XCFA: Modification bitrate"
-msgstr "XCFA: Modificazione del bitrate"
+#: src/file_mp3ogg_conv.c:348
+msgid "Error from SOX !"
+msgstr "Errore da SOX !"
 
-#: src/file_mp3ogg_conv.c:379
+#: src/file_mp3ogg_conv.c:432
 #, c-format
-msgid " ATTENTION: Il faut installer %s%s%s"
+msgid " WARNING : you need to install %s%s%s"
 msgstr " ATTENZIONE: bisogna installare %s%s%s"
 
-#: src/file_mp3ogg_conv.c:387
+#: src/file_mp3ogg_conv.c:440
 #, c-format
-msgid " ATTENTION: Il faut installer %s%s"
+msgid " WARNING : you need to install %s%s"
 msgstr " ATTENZIONE: bisogna installare %s%s"
 
-#: src/file_mp3ogg_conv.c:394
+#: src/file_mp3ogg_conv.c:447
 #, c-format
-msgid " ATTENTION: Il faut installer %s"
+msgid " WARNING : you need to install %s"
 msgstr " ATTENZIONE: bisogna installare %s"
 
-#: src/file_mp3ogg_conv.c:400
+#: src/file_mp3ogg_conv.c:454
 msgid "Package NOT FOUND !"
 msgstr "Pacchetto NON TROVATO!"
 
-#: src/fileselect.c:116
-msgid "Choix d'un dossier de destination"
+#: src/fileselect.c:105
+msgid "Choosing a destination folder"
 msgstr "Scelta della cartella di destinazione"
 
-#: src/fileselect.c:117
-msgid "Choix d'un fichier CUE WAV FLAC OGG MP3 APE WMA"
-msgstr "La scelta di un CUE file WAV MP3 OGG FLAC APE WMA"
+#: src/fileselect.c:106
+msgid "Choosing a file CUE WAV FLAC OGG MP3 APE WMA"
+msgstr "Selezionare un file di tipo CUE, WAV, MP3, OGG, FLAC, APE, WMA"
 
-#: src/fileselect.c:118
-msgid "Choix d'un fichier musical"
-msgstr "Selezione di un file musicale"
+#: src/fileselect.c:107
+msgid "Choosing a file musical"
+msgstr "Selezionare un file musicale"
 
-#: src/fileselect.c:119
-msgid "Choix d'un fichier"
-msgstr "Scelta di un file"
+#: src/fileselect.c:108 src/fileselect.c:109
+msgid "Choosing a file"
+msgstr "La scelta di un file"
 
-#: src/fileselect.c:120
-msgid "Choix de fichiers"
-msgstr "Scelta di file "
+#: src/fileselect.c:110
+msgid "Choosing a WAV file"
+msgstr "La scelta di un file WAV"
 
-#: src/fileselect.c:121
-msgid "Choix de fichiers WAV"
-msgstr "Scelta di file WAV"
+#: src/fileselect.c:111
+msgid "Choosing a MP3 OGG file"
+msgstr "La scelta di un file OGG MP3"
 
-#: src/fileselect.c:122
-msgid "Choix de fichiers MP3/OGG"
-msgstr "Scelta di file MP3/OGG"
+#: src/fileselect.c:112
+msgid "Choosing a FLAC MPC OGG MP3 file"
+msgstr "Selezionare ei file FLAC MPC OGG MP3"
 
-#: src/fileselect.c:123
-msgid "Choix de fichiers FLAC MPC OGG MP3"
-msgstr "Scelta di file FLAC MPC OGG MP3"
+#: src/fileselect.c:113
+msgid "Import pictures for the cover"
+msgstr "Importa immagini per la copertina"
 
-#: src/fileselect.c:124
-msgid "Importer des images pour la pochette"
-msgstr "Importare imagini per la copertina"
+#: src/fileselect.c:114
+msgid "Choosing an Image Storage path"
+msgstr "La scelta di un immagine Percorso di memorizzazione"
 
-#: src/fileselect.c:125
-msgid "Choix d'un chemin de stockage des images"
-msgstr "Scelta di un percorso per salvare le immagine"
+#: src/fileselect.c:115
+msgid "Choosing a place for backup"
+msgstr "La scelta di un posto per il backup"
 
-#: src/fileselect.c:126
-msgid "Choix d'un lieu de sauvegarde"
-msgstr "Scelta di una cartella per salvare"
+#: src/fileselect.c:396 src/fileselect.c:415 src/fileselect.c:703
+msgid "Cancel"
+msgstr "Cancel"
 
-#: src/fileselect.c:475 src/fileselect.c:591 src/fileselect.c:599
-#: src/fileselect.c:622
+#: src/fileselect.c:398 src/fileselect.c:417 src/fileselect.c:705
+msgid "Open"
+msgstr "Open"
+
+#: src/fileselect.c:494 src/fileselect.c:617 src/fileselect.c:627
+#: src/fileselect.c:650
 msgid "All Files (*.*)"
 msgstr "Tutti file (*.*)"
 
-#: src/file_trash.c:368
+#: src/file_trash.c:211
 msgid "Trash files ..."
 msgstr "Mettere file nel cestino ..."
 
-#: src/file_wav.c:629
-msgid "(Click Droit = Menu) / Choix de la frequence"
+#: src/file_wav.c:485
+msgid "(Right Click = Menu) / Select frequency"
 msgstr "(Clic Destro = Menu) / Scelta della frequenza"
 
-#: src/file_wav.c:632
-msgid "(Click Droit = Menu) / Choix du nombre de pistes (voies)"
-msgstr "(Clic Destro = Menu) / Scelta del numero di tracce (vie)"
+#: src/file_wav.c:488
+msgid "(Right Click = Menu) / Select number of tracks (channels)"
+msgstr "(Right Click = Menu) / Selezionare il numero di tracce (canali)"
 
-#: src/file_wav.c:635
-msgid "(Click Droit = Menu) / Choix du codage en nombre de bits"
-msgstr "(Clic Destro = Menu) / Scelta della codificazione (numero di bit)"
+#: src/file_wav.c:491
+msgid "(Right Click = Menu) / Encoding selection in number of bits"
+msgstr "(Clic Destro = Menu) / Selezionato. Il file esiste già. "
 
-#: src/file_wav.c:861
-msgid "Frequence"
+#: src/file_wav.c:739
+msgid "Frequency"
 msgstr "Frequenza"
 
-#: src/file_wav.c:877
-msgid "FREQUENCE"
+#: src/file_wav.c:755
+msgid "FREQUENCY"
 msgstr "FREQUENZA"
 
-#: src/file_wav.c:891
-msgid "Piste"
-msgstr "Traccia"
+#: src/file_wav.c:769
+msgid "Track"
+msgstr "Track"
 
-#: src/file_wav.c:907
-msgid "PISTE"
-msgstr "TRACCIA"
+#: src/file_wav.c:785
+msgid "TRACK"
+msgstr "TRACK"
 
-#: src/file_wav.c:921
+#: src/file_wav.c:799
 msgid "Quantification"
 msgstr "Quantificazione"
 
-#: src/file_wav.c:937
+#: src/file_wav.c:815
 msgid "QUANTIFICATION"
 msgstr "QUANTIFICAZIONE"
 
-#: src/file_wav_conv.c:265
+#: src/file_wav_conv.c:261
 #, c-format
-msgid "%s Copie fichier: %d%%"
+msgid "%s Copy file: %d%%"
 msgstr "%s Copia file: %d%%"
 
-#: src/file_wav_conv.c:275
+#: src/file_wav_conv.c:271
 #, c-format
-msgid "%s Restitution fichier: %d%%"
-msgstr "%s Restituzione file: %d%%"
+msgid "%s Return file: %d%%"
+msgstr "%s Produzione del file: %d%%"
 
-#: src/file_wav_conv.c:285
+#: src/file_wav_conv.c:281
 #, c-format
-msgid "%s Traitement Sox: %d%%"
+msgid "%s Use Sox: %d%%"
 msgstr "%s Trattamento Sox: %d%%"
 
-#: src/file_wav_conv.c:302
+#: src/file_wav_conv.c:298
 #, c-format
-msgid "%s Traitement Mplayer: %d%%"
+msgid "%s Use Mplayer: %d%%"
 msgstr "%s Trattamento Mplayer: %d%%"
 
-#: src/file_wav_conv.c:349 src/file_wav_conv.c:351
+#: src/file_wav_conv.c:343 src/file_wav_conv.c:345
 msgid "XCFA: Conversions WAV TO WAV"
 msgstr "XCFA: Conversione WAV TO WAV"
 
-#: src/main.c:372
-msgid "= Adressage memoire invalide\n"
-msgstr "= Indirizzi memoria non validi\n"
+#: src/main.c:644
+msgid "ADMINISTRATOR MODE"
+msgstr "MODALITA' AMMINISTRATORE"
 
-#: src/main.c:375
-msgid "= Vous avez probablement trouve un bug dans XCFA\n"
-msgstr "= Avete probabilmente trovato un bug in XCFA\n"
+#: src/main.c:646
+msgid " You should not use "
+msgstr " Non si deve usare "
 
-#: src/main.c:676
-msgid "MODE ADMINISTRATEUR"
-msgstr "Modalità Amministratore"
+#: src/main.c:648
+msgid " XCFA under ROOT !"
+msgstr " XCFA come ROOT !"
 
-#: src/main.c:678
-msgid " Vous ne devriez pas utiliser "
-msgstr " Non si deve usare "
+#: src/options.c:169
+msgid "ERROR : storage location not permitted !"
+msgstr "ERRORE: posizione di memorizzazione non consentito!"
 
-#: src/main.c:680
-msgid " XCFA sous ROOT !"
-msgstr " XCFA come root !"
+#: src/options.c:170
+msgid "Please start again."
+msgstr "Si prega di ricominciare da capo."
 
-#: src/options.c:175
-msgid "ERREUR: Lieu de stockage non autorise !"
-msgstr "ERRORE: Questo luogo di stoccaggio non e autorizzato !"
+#: src/options_cd.c:122
+msgid "To assess the templates, you must enable a reading cdaudio"
+msgstr "Per valutare i modelli, è necessario attivare una cdaudio lettura"
 
-#: src/options.c:176
-msgid "Veuillez recommencer."
-msgstr "Siete pregati di ricominciare"
-
-#: src/options_cd.c:120
-msgid "Pour evaluer les templates, vous devez activer une lecture de cdaudio"
-msgstr "Per valutare i modelli, è necessario attivare una lettura cdaudio"
-
-#: src/options_faac.c:101
+#: src/options_faac.c:94
 msgid "Transport Stream (ADTS) - Extension .aac"
 msgstr "Transport Stream (ADTS) - Estensione .aac"
 
-#: src/options_faac.c:102
+#: src/options_faac.c:95
 msgid "MPEG-4 File Format (MP4) - Extension .m4a"
-msgstr "MPEG-4 File Formato (MP4) - Estensione .m4a"
+msgstr "Formato file MPEG-4 (MP4) - Estensione .m4a"
 
-#: src/options_flac.c:72
-msgid "0 (Rapide)"
+#: src/options_flac.c:65
+msgid "0 (Fast)"
 msgstr "0 (Veloce)"
 
-#: src/options_flac.c:80
-msgid "8 (Lent)"
+#: src/options_flac.c:73
+msgid "8 (Low)"
 msgstr "8 (Lento)"
 
-#: src/options_mp3.c:298
-msgid "V0 (meilleure qualite)"
-msgstr "V0 (migliore qualità)"
+#: src/options_mp3.c:276
+msgid "V0 (Best quality)"
+msgstr "V0 (qualità migliore)"
 
-#: src/options_mp3.c:307
-msgid "V9 (moins bonne qualite)"
-msgstr "V9 (pessima qualità)"
+#: src/options_mp3.c:285
+msgid "V9 (Poor quality)"
+msgstr "V9 (qualità peggiore)"
 
-#: src/options_musepack.c:75
+#: src/options_musepack.c:68
 msgid "telephone: lowest quality : 32 .. 48 kbit/s"
-msgstr "telefono: qualità la più bassa : 32 .. 48 kbit/s"
+msgstr "telefono: qualità peggiore : 32 .. 48 kbit/s"
 
-#: src/options_musepack.c:76
+#: src/options_musepack.c:69
 msgid "thumb : low quality/internet : 58 .. 86 kbit/s"
 msgstr "thumb : qualità bassa/Internet : 58 .. 86 kbit/s"
 
-#: src/options_musepack.c:77
+#: src/options_musepack.c:70
 msgid "radio : medium (MP3) quality : 112 .. 152 kbit/s"
 msgstr "radio : qualità media (MP3) : 112 .. 152 kbit/s"
 
-#: src/options_musepack.c:78
+#: src/options_musepack.c:71
 msgid "standard : high quality (dflt) : 142 .. 184 kbit/s"
-msgstr "stendardo : alta qualità (dflt) : 142 .. 184 kbit/s"
+msgstr "standard : alta qualità (dflt) : 142 .. 184 kbit/s"
 
-#: src/options_musepack.c:79
+#: src/options_musepack.c:72
 msgid "xtreme : extreme high quality : 168 .. 212 kbit/s"
-msgstr "estremo : estrema qualità : 168 .. 212 kbit/s"
+msgstr "estremo : qualità molto alta : 168 .. 212 kbit/s"
 
-#: src/options_musepack.c:80
+#: src/options_musepack.c:73
 msgid "insane : extreme high quality : 232 .. 268 kbit/s"
-msgstr "insano : estremamente alta qualità : 232 ;. 268 kbit/s"
+msgstr "insane : qualità estremamente alta: 232 .. 268 kbit/s"
 
-#: src/options_musepack.c:81
+#: src/options_musepack.c:74
 msgid "braindead : extreme high quality : 232 .. 278 kbit/s"
-msgstr "deficiente : estremamente alta qualità : 232 .. 278 kbit/s"
+msgstr "braindead : qualità estremamente alta : 232 .. 278 kbit/s"
 
-#: src/options_oggenc.c:148
-msgid "Qualite -1 (Moins bonne qualite)"
-msgstr "Qualità -1 (Pessima qualità)"
+#: src/options_oggenc.c:137
+msgid "Quality -1 (Poor quality)"
+msgstr "Qualità -1 (Qualità peggiore)"
+
+#: src/options_oggenc.c:138 src/popup.c:1294
+msgid "Quality 0"
+msgstr "Qualità 0"
 
-#: src/options_oggenc.c:152
-msgid "Qualite 3"
+#: src/options_oggenc.c:139 src/popup.c:1294
+msgid "Quality 1"
+msgstr "Qualità 1"
+
+#: src/options_oggenc.c:140 src/popup.c:1294
+msgid "Quality 2"
+msgstr "Qualità 2"
+
+#: src/options_oggenc.c:141
+msgid "Quality 3"
 msgstr "Qualità 3"
 
-#: src/options_oggenc.c:159
-msgid "Qualite 10 (Meilleure qualite)"
-msgstr "Qualità 10 (Migliore qualità)"
+#: src/options_oggenc.c:142 src/popup.c:1295
+msgid "Quality 4"
+msgstr "Qualità 4"
+
+#: src/options_oggenc.c:143 src/popup.c:1295
+msgid "Quality 5"
+msgstr "Qualità 5"
 
-#: src/options_wavpack.c:105
-msgid "Mode normal"
-msgstr "Modo normale"
+#: src/options_oggenc.c:144 src/popup.c:1295
+msgid "Quality 6"
+msgstr "Qualità 6"
 
-#: src/options_wavpack.c:106
-msgid "Mode rapide de compression"
-msgstr "Modo di compressione rapido"
+#: src/options_oggenc.c:145 src/popup.c:1295
+msgid "Quality 7"
+msgstr "Qualità 7"
 
-#: src/options_wavpack.c:107
-msgid "Bonne qualite de compression"
+#: src/options_oggenc.c:146 src/popup.c:1296
+msgid "Quality 8"
+msgstr "Qualità 8"
+
+#: src/options_oggenc.c:147 src/popup.c:1296
+msgid "Quality 9"
+msgstr "Qualità 9"
+
+#: src/options_oggenc.c:148
+msgid "Quality 10 (Best quality)"
+msgstr "Qualità 10 (Qualità migliore)"
+
+#: src/options_oggenc.c:176 src/options_wavpack.c:173
+#: src/options_wavpack.c:194 src/options_wavpack.c:215 src/popup.c:1298
+msgid "Yes"
+msgstr "sì"
+
+#: src/options_oggenc.c:177 src/options_wavpack.c:142
+#: src/options_wavpack.c:172 src/options_wavpack.c:193
+#: src/options_wavpack.c:214 src/options_wavpack.c:233 src/popup.c:1298
+msgid "No"
+msgstr "Nome"
+
+#: src/options_oggenc.c:196
+msgid "Force mono"
+msgstr "Force mono"
+
+#: src/options_oggenc.c:197
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/options_wavpack.c:98
+msgid "Standard"
+msgstr "Standard"
+
+#: src/options_wavpack.c:99
+msgid "Fast (Faster encode and decode)"
+msgstr "Veloce (codifica più veloce e decodifica)"
+
+#: src/options_wavpack.c:100
+msgid "High quality (Better compression ratio)"
 msgstr "Buona qualità di compressione"
 
-#: src/options_wavpack.c:108
-msgid "Meilleure qualite de compression"
-msgstr "Migliore qualità di compressione"
+#: src/options_wavpack.c:101
+msgid "Very high quality (Best compression but slowest)"
+msgstr "Altissima qualità (migliore compressione ma più lento)"
 
-#: src/options_wavpack.c:134
+#: src/options_wavpack.c:125
 msgid "stereo left/right"
 msgstr "Stereo sinistra/destra"
 
-#: src/options_wavpack.c:135
+#: src/options_wavpack.c:126
 msgid "stereo mid/side"
-msgstr "stereo mezzo/lati "
+msgstr "Stereo centro/lati "
 
-#: src/options_wavpack.c:253
+#: src/options_wavpack.c:234
 msgid "1 (fast / rapide)"
 msgstr "1 (fast / veloce)"
 
-#: src/options_wavpack.c:258
+#: src/options_wavpack.c:239
 msgid "6 (very slow / tres lent)"
 msgstr "6 (very slow / molto lento)"
 
-#: src/play_file.c:112
-msgid "PAS de lecteur audio present"
-msgstr "NO lettore audio presente"
+#: src/play_file.c:107
+msgid "NO audio player present"
+msgstr "NO Lettore audio presenti"
 
-#: src/play_file.c:113
-msgid "Veuillez installez un lecteur audio."
-msgstr "Siete pregati di installare un lettore audio."
+#: src/play_file.c:108
+msgid "Please install an audio player."
+msgstr "Per favore, installare il pacchetto [ cdparanoia ]"
 
-#: src/poche_dir.c:436
+#: src/poche_dir.c:433
 msgid ""
 "Utilisez le glisser / deplacer - Effacer une image avec Ctrl + "
 "Click"
 msgstr ""
-"Usa drag / drop - cancellare un'immagine con Ctrl +Clicca</"
+"Usa drag / drop - Cancellare un'immagine con Ctrl + Click</"
 "b>"
 
 #: src/poche_save.c:117
-msgid "Nom de fichier absent !!"
-msgstr "Nome file mancante !!"
+msgid "File name not found !!"
+msgstr "Il nome del file non trovato !!"
 
-#: src/poche_save.c:118 src/poche_web.c:361 src/poche_web.c:382
-msgid "Pour resoudre ce probleme:"
+#: src/poche_save.c:118 src/poche_web.c:323 src/poche_web.c:345
+msgid "To solve this problem :"
 msgstr "Per risolvere questo problema:"
 
 #: src/poche_save.c:121
-msgid "Saisissez un nom de fichier sans extention"
+msgid "Enter a file name without extension"
 msgstr "Inserire un nome di file senza estensione"
 
-#: src/poche_save.c:132
-msgid "Sauvegarde aux formats PDF et PostScript"
-msgstr "Salvataggio in formato PDF e PostScript"
-
-#: src/poche_save.c:157
-msgid "Sauvegarde au format PNG"
-msgstr "Salvataggio in formato PNG"
+#: src/poche_save.c:131
+msgid "Saving to PDF"
+msgstr "Salvataggio in PDF"
 
-#: src/poche_web.c:360
-msgid "Aucun fichier trouve !"
-msgstr "No file trovato!"
+#: src/poche_web.c:322
+msgid "No file found !"
+msgstr "Nessun file trovato!"
 
-#: src/poche_web.c:364
-msgid "Modifiez la chaine de recherche et"
-msgstr "Modificate la catena di caratteri di ricerca "
+#: src/poche_web.c:326 src/poche_web.c:348
+msgid "Modify the search parameters and"
+msgstr "Modificare i parametri di ricerca e"
 
-#: src/poche_web.c:366 src/poche_web.c:387
-msgid "recommencez."
-msgstr "e ricominciate."
+#: src/poche_web.c:328 src/poche_web.c:350
+msgid "start again."
+msgstr "ricominciare."
 
-#: src/poche_web.c:381
-msgid "Critere de recherche absent !!"
-msgstr "Criteri di ricerca dispersi !!"
+#: src/poche_web.c:344
+msgid "Search criteria away !!"
+msgstr "Criteri di ricerca di distanza !!"
 
-#: src/poche_web.c:385
-msgid "Saisissez une chaine de recherche et"
-msgstr "Immettere una stringa di ricerca e"
+#: src/poche_web.c:362
+msgid "[Search images files]"
+msgstr "[Cerca file di immagini]"
 
-#: src/poche_web.c:394
-msgid "[Recherche des fichiers images]"
-msgstr "[Ricerca dei file imagine]"
-
-#: src/popup.c:87 src/popup.c:106
+#: src/popup.c:81 src/popup.c:100
 msgid " Deselection globale"
 msgstr " Deselezione globale"
 
-#: src/popup.c:88 src/popup.c:107 src/popup.c:168
+#: src/popup.c:82 src/popup.c:101 src/popup.c:162
 msgid " Deselection verticale"
 msgstr " Deselezione verticale"
 
-#: src/popup.c:89 src/popup.c:108
+#: src/popup.c:83 src/popup.c:102
 msgid " Deselection horizontale"
 msgstr " Deselezione orizzontale"
 
-#: src/popup.c:90 src/popup.c:93 src/popup.c:109 src/popup.c:112
-#: src/popup.c:126 src/popup.c:139 src/popup.c:153
+#: src/popup.c:84 src/popup.c:87 src/popup.c:103 src/popup.c:106
+#: src/popup.c:120 src/popup.c:133 src/popup.c:147
 msgid " ---"
 msgstr " ---"
 
-#: src/popup.c:91 src/popup.c:110
+#: src/popup.c:85 src/popup.c:104
 msgid " Selection verticale"
 msgstr " Selezione verticale"
 
-#: src/popup.c:92 src/popup.c:111
+#: src/popup.c:86 src/popup.c:105
 msgid " Selection Expert verticale"
-msgstr " Selezione Esperto verticale"
+msgstr " Selezione verticale da esperti"
 
-#: src/popup.c:94 src/popup.c:113
+#: src/popup.c:88 src/popup.c:107
 msgid " Selection horizontale"
 msgstr " Selezione orizzontale"
 
-#: src/popup.c:95 src/popup.c:114
+#: src/popup.c:89 src/popup.c:108
 msgid " Selection Expert horizontale "
-msgstr " Selezione Esperto orizzontale "
+msgstr " Selezione orizzontale da esperti"
 
-#: src/popup.c:125 src/popup.c:138
+#: src/popup.c:119 src/popup.c:132
 msgid " Deselection verticale "
 msgstr " Deselezione verticale "
 
-#: src/popup.c:127 src/popup.c:140
+#: src/popup.c:121 src/popup.c:134
 msgid " Selection verticale "
 msgstr " Selezione verticale "
 
-#: src/popup.c:151
+#: src/popup.c:145
 msgid "---SELECTION VERTICALE-----"
 msgstr "---SELEZIONE VERTICALE-----"
 
-#: src/popup.c:152
+#: src/popup.c:146
 msgid " Deselection verticale "
 msgstr " Deselezione verticale "
 
-#: src/popup.c:154
+#: src/popup.c:148
 msgid " Selection PISTE "
 msgstr " Selezione TRACCIA "
 
-#: src/popup.c:155
+#: src/popup.c:149
 msgid " Selection ALBUM "
 msgstr " Selezione ALBUM "
 
-#: src/popup.c:156
+#: src/popup.c:150
 msgid " Selection NETTOYER "
-msgstr " Selezione PULIRE "
+msgstr " Selezione di PULIZIA "
 
-#: src/popup.c:167
+#: src/popup.c:161
 msgid "---MENU TRASH--------------"
 msgstr "---MENU CESTINO--------------"
 
-#: src/popup.c:169
+#: src/popup.c:163
 msgid " Selection verticale "
 msgstr " Selezione verticale "
 
-#: src/popup.c:544 src/popup.c:752 src/popup.c:968
-msgid "Cellule"
-msgstr "Cellula"
+#: src/popup.c:504 src/popup.c:619 src/popup.c:715
+msgid "Original value"
+msgstr "valore originale"
 
-#: src/popup.c:551 src/popup.c:577
-msgid "1 piste"
-msgstr "1 traccia"
-
-#: src/popup.c:554 src/popup.c:580
-msgid "2 pistes"
-msgstr "2 tracce"
-
-#: src/popup.c:557 src/popup.c:583
-msgid "4 pistes"
-msgstr "4 tracce"
-
-#: src/popup.c:560 src/popup.c:586
-msgid "6 pistes"
-msgstr "6 tracce"
-
-#: src/popup.c:566 src/popup.c:592 src/popup.c:786 src/popup.c:824
-#: src/popup.c:993 src/popup.c:1023
-msgid "Valeur d'origine"
-msgstr "Valore originale"
-
-#: src/popup.c:570 src/popup.c:790 src/popup.c:997
-msgid "Colonne"
-msgstr "Colonna"
-
-#: src/popup.c:759 src/popup.c:797
-msgid " 8000 Hertz"
-msgstr " 8000 Hertz"
-
-#: src/popup.c:762 src/popup.c:800
-msgid "22000 Hertz"
-msgstr "22000 Hertz"
-
-#: src/popup.c:765 src/popup.c:803
-msgid "32000 Hertz"
-msgstr "32000 Hertz"
-
-#: src/popup.c:768 src/popup.c:806
-msgid "44056 Hertz"
-msgstr "44056 Hertz"
-
-#: src/popup.c:771 src/popup.c:809
-msgid "44100 Hertz"
-msgstr "44100 Hertz"
-
-#: src/popup.c:774 src/popup.c:812
-msgid "48000 Hertz"
-msgstr "48000 Hertz"
-
-#: src/popup.c:777 src/popup.c:815
-msgid "88200 Hertz"
-msgstr "88200 Hertz"
-
-#: src/popup.c:780 src/popup.c:818
-msgid "96000 Hertz"
-msgstr "96000 Hertz"
-
-#: src/popup.c:975 src/popup.c:1004
-msgid " 8 bits"
-msgstr " 8 bits"
-
-#: src/popup.c:978 src/popup.c:1008
-msgid "16 bits"
-msgstr "16 bits"
-
-#: src/popup.c:981 src/popup.c:1011
-msgid "24 bits"
-msgstr "24 bits"
-
-#: src/popup.c:984 src/popup.c:1014
-msgid "32 bits"
-msgstr "32 bits"
+#: src/popup.c:765
+msgid "Next selector"
+msgstr "Indice di lettura"
 
-#: src/popup.c:987 src/popup.c:1017
-msgid "64 bits"
-msgstr "64 bits"
+#: src/popup.c:769
+msgid "Previous selector"
+msgstr "selettore Precedente"
 
-#: src/popup.c:1089
-msgid "Selecteur suivant"
-msgstr "Seguente selettore"
+#: src/popup.c:777
+msgid "Delete the active range"
+msgstr "Eliminare il campo attivo"
 
-#: src/popup.c:1093
-msgid "Selecteur precedant"
-msgstr "Selettore prima "
+#: src/popup.c:850
+msgid "Flip Horizontal"
+msgstr " Selezione orizzontale"
 
-#: src/popup.c:1101
-msgid "Supprimer la plage active"
-msgstr "Eliminare l'intervallo attivo"
+#: src/popup.c:854
+msgid "Flip Vertical"
+msgstr "Rifletti verticale"
 
-#: src/popup.c:1173
-msgid "Retourner horizontalement"
-msgstr "Capovolgi orizzontalmente"
+#: src/popup.c:862
+msgid "Foreground image"
+msgstr "immagine in primo piano"
 
-#: src/popup.c:1177
-msgid "Retourner verticalement"
-msgstr "Rifletti verticale"
+#: src/popup.c:866
+msgid "Image above"
+msgstr "Immagine sopra"
 
-#: src/popup.c:1185
-msgid "Image au premier plan"
-msgstr "In primo piano l'immagine"
+#: src/popup.c:870
+msgid "Image below"
+msgstr "Immagine sotto"
 
-#: src/popup.c:1189
-msgid "Image au dessus"
-msgstr "Immagine qui sopra"
+#: src/popup.c:874
+msgid "Image to the background"
+msgstr "Immagine di sfondo"
 
-#: src/popup.c:1193
-msgid "Image en dessous"
-msgstr "Immagine qui sotto"
+#: src/popup.c:882
+msgid "Clear image"
+msgstr "Cancellare l'immagine"
 
-#: src/popup.c:1197
-msgid "Image au dernier plan"
-msgstr "Immagine per lo sfondo"
+#: src/popup.c:920
+msgid "Remove image from the list"
+msgstr "Rimuovi immagine dalla lista"
 
-#: src/popup.c:1205
-msgid "Effacer l'image"
-msgstr "Un'immagine chiara"
+#: src/popup.c:1111
+msgid "V0 [ best quality ]"
+msgstr "V0 (qualità migliore)"
 
-#: src/popup.c:1242
-msgid "Supprimer l'image de la liste"
-msgstr "Rimuovere l'immagine dalla lista"
+#: src/popup.c:1111 src/popup.c:1114
+msgid "V4 [ default ]"
+msgstr "V4 [ default ]"
 
-#: src/popup_systray.c:127
-msgid " Cacher Xcfa "
-msgstr " Nascondi Xcfa "
+#: src/popup.c:1111
+msgid "V9 [ Lower quality ]"
+msgstr "V9 [ qualità peggiore ]"
 
-#: src/popup_systray.c:130
-msgid " Montrer Xcfa "
-msgstr " Mostra Xcfa "
+#: src/popup.c:1294
+msgid "Quality -1 [ Lower quality ]"
+msgstr "Qualità -1 (Qualità peggiore)"
 
-#: src/popup_systray.c:150
-msgid " Quitter Xcfa "
-msgstr " Esci Xcfa "
+#: src/popup.c:1295
+msgid "Quality 3 [ Defaut ]"
+msgstr "Qualità 3 [ default ]"
 
-#: src/popup_systray.c:201
-msgid ""
-"XCFA\n"
-"Programme pour convertir les fichiers audio."
-msgstr ""
-"XCFA\n"
-"Programma per la conversione di file audio."
+#: src/popup.c:1296
+msgid "Quality 10 [ Best Quality ]"
+msgstr "Qualità 10 (Qualità migliore)"
 
-#: src/prg_init.c:90
+#: src/prg_init.c:85
 msgid " Decode ATSC A/52 audio streams"
 msgstr " Decode ATSC A/52 audio streams"
 
-#: src/prg_init.c:101
+#: src/prg_init.c:96
 msgid " AAC+ encoder"
 msgstr " AAC+ encoder"
 
-#: src/prg_init.c:112 src/prg_init.c:178
+#: src/prg_init.c:107 src/prg_init.c:173
 msgid " Extracteur cd audio"
 msgstr " Estrattore di cd audio"
 
-#: src/prg_init.c:123
+#: src/prg_init.c:118
 msgid " Read CD and get CDDB discid information"
-msgstr " Read CD and get CDDB discid information"
+msgstr " Leggi il CD ed estrai l'informazione discid per CDDB"
 
-#: src/prg_init.c:134
+#: src/prg_init.c:129
 msgid " Cherche des renseignements sur les formats mp3"
-msgstr " Ricerca informazione sugli formati mp3"
+msgstr " Ricerca di informazioni sui formati mp3"
 
-#: src/prg_init.c:145
+#: src/prg_init.c:140
 msgid " Audio Codeur freeware"
-msgstr " Coder audio gratuito"
+msgstr " Codec audio gratuito"
 
-#: src/prg_init.c:156
+#: src/prg_init.c:151
 msgid " MPEG-4 AAC decodeur"
 msgstr " MPEG-4 AAC decoder"
 
-#: src/prg_init.c:167
+#: src/prg_init.c:162
 msgid " Conversion wav : flac"
-msgstr " Converzione wav -> flac"
+msgstr " Conversione wav : flac"
 
-#: src/prg_init.c:189
+#: src/prg_init.c:184
 msgid " Conversion wav : mp3"
-msgstr " Converzione wav : mp3"
+msgstr " Conversione wav : mp3"
 
-#: src/prg_init.c:200
+#: src/prg_init.c:195
 msgid " Cherche les informations d'un dvd"
-msgstr " Ricerca informazioni di un dvd"
+msgstr " Ricerca di informazioni di un dvd"
 
-#: src/prg_init.c:212
+#: src/prg_init.c:207
 msgid " Monkey's Audio Console Front End : APE"
 msgstr " Monkey's Audio Console Front End : APE"
 
-#: src/prg_init.c:224 src/prg_init.c:235
+#: src/prg_init.c:219 src/prg_init.c:230
 msgid " MusePack commandline utilities"
-msgstr " MusePack commandline utilities"
+msgstr " Utilità a riga di comando per MusePack"
 
-#: src/prg_init.c:246
+#: src/prg_init.c:241
 msgid " Lecteur et extracteur"
 msgstr " Lettore e estrattore"
 
-#: src/prg_init.c:257
+#: src/prg_init.c:252
 msgid " Normaliseur de fichier mp3"
 msgstr " Normalizzatore di file mp3"
 
-#: src/prg_init.c:268
+#: src/prg_init.c:263
 msgid " Normaliseur de fichier wav"
 msgstr " Normalizzatore di file wav"
 
-#: src/prg_init.c:279
+#: src/prg_init.c:274
 msgid " A program to send desktop notifications"
-msgstr " Un programma per mandare desktop notificazioni"
+msgstr " Un programma per mandare le notifiche al desktop"
 
-#: src/prg_init.c:290
+#: src/prg_init.c:285
 msgid " Forte compression au format wave"
 msgstr " Alta compressione al formato wave"
 
-#: src/prg_init.c:301
+#: src/prg_init.c:296
 msgid " Decoupage de fichiers sans decodage"
-msgstr " Taglia di file senza decodare"
+msgstr " Taglia i file senza prima decodificare"
 
-#: src/prg_init.c:312
+#: src/prg_init.c:307
 msgid " Transformation universelle de fichiers son"
-msgstr " trasformazione universale di audio file"
+msgstr " Trasformazione universale di audio file"
 
-#: src/prg_init.c:323
+#: src/prg_init.c:318
 msgid " Conversion wav : ogg"
-msgstr " Converzione wav : ogg"
+msgstr " Conversione wav : ogg"
 
-#: src/prg_init.c:334
+#: src/prg_init.c:329
 msgid " Normaliseur de fichier ogg"
 msgstr " Normalizzatore di file ogg"
 
-#: src/prg_init.c:345
+#: src/prg_init.c:340
 msgid " WAVPACK Hybrid Lossless Audio Compressor"
 msgstr " WAVPACK Hybrid Lossless Audio Compressor"
 
-#: src/prg_init.c:362
-msgid " ... les paquets: deb "
+#: src/prg_init.c:357
+msgid " ... Packets: deb "
 msgstr " ... i pacchetti: deb "
 
-#: src/prg_init.c:368
-msgid " ... les paquets: tgz "
+#: src/prg_init.c:363
+msgid " ... Packets: tgz "
 msgstr " ... i pacchetti: tgz "
 
-#: src/prg_init.c:374
-msgid " ... les paquets: fpm "
+#: src/prg_init.c:369
+msgid " ... Packets: fpm "
 msgstr " ... i pacchetti: fpm "
 
-#: src/prg_init.c:380
-msgid " ... les paquets: rpm "
+#: src/prg_init.c:375
+msgid " ... Packets: rpm "
 msgstr " ... i pacchetti: rpm "
 
-#: src/prg_init.c:386
-msgid " ... les paquets: pkg.tar.xz "
+#: src/prg_init.c:381
+msgid " ... Packets: pkg.tar.xz "
 msgstr " ... i pacchetti: pkg.tar.xz "
 
-#: src/prg_init.c:392
-msgid " ... les paquets: ? "
+#: src/prg_init.c:387
+msgid " ... Packets: ? "
 msgstr " ... i pacchetti: ? "
 
-#: src/prg_init.c:628
+#: src/prg_init.c:623
 msgid "Status"
-msgstr "Statuto"
+msgstr "Stato"
 
-#: src/prg_init.c:642
-msgid "Paquet"
-msgstr "Pacchetti"
+#: src/prg_init.c:637
+msgid "Packets"
+msgstr "Packets"
 
-#: src/prg_init.c:657
+#: src/prg_init.c:652
 msgid "Action"
 msgstr "Azione"
 
-#: src/scan.c:260
-msgid "PACKAGE dvd+rw-tools ABSENT"
-msgstr "PACCHETTO dvd + rw-tools ASSENTE"
+#: src/scan.c:259
+msgid "PACKAGE dvd+rw-tools is missing"
+msgstr "PACCHETTO dvd+rw-tools ASSENTE"
 
-#: src/scan.c:261
-msgid "Le package 'dvd+rw-tools' est absent"
-msgstr "Pacchetto 'imagemagick' non è installato"
+#: src/scan.c:260
+msgid "The package 'imagemagick' is missing"
+msgstr "Il pacchetto 'ImageMagick' manca"
 
-#: src/scan.c:263
-msgid "de votre systeme !"
+#: src/scan.c:262
+msgid "on your system !"
 msgstr "sul vostro sistema!"
 
-#: src/scan.c:265
-msgid "Veuillez l'installer car j'ai besoin de"
-msgstr "Siete pregati di installarlo e di ricominciare."
+#: src/scan.c:264 src/split.c:438
+msgid "Please install it and resume"
+msgstr "Installare e riprendere"
 
-#: src/scan.c:267
-msgid "'dvd+rw-mediainfo' pour identifier le(s)"
-msgstr "'Dvd + rw-MediaInfo' per identificare il progetto (s)"
+#: src/scan.c:266
+msgid "'Dvd + rw-mediainfo' to identify the"
+msgstr "'dvd+rw-mediainfo' per identificare i(l)"
 
-#: src/scan.c:269
-msgid "lecteur(s) de cd / dvd."
-msgstr "lettore di (s) cd / dvd."
+#: src/scan.c:268
+msgid "reader of cd / dvd."
+msgstr "lettore(i) di cd / dvd."
 
-#: src/split.c:284
+#
+#: src/split.c:297
 msgid ""
-"Menu: Click droit / Ajout plage: Click bouton centre / Zoom: Ctrl+Scroll"
+"Menu: right click / Adding track: Click the center button / Zoom: Ctrl"
+"+Scroll"
 msgstr ""
 "Menu: Tasto destro del mouse / Aggiunta di pista: Fare clic sul pulsante / "
 "Zoom: Ctrl+Scrollcentrale"
 
-#: src/split.c:287
-msgid "Ajout plage: Click bouton centre / Zoom: Ctrl+Scroll"
+#
+#: src/split.c:300
+msgid "Adding track: Click the center button / Zoom: Ctrl+Scroll"
 msgstr ""
 "Aggiunta di pista: Fare clic sul pulsante centrale / Zoom: Ctrl+Scroll"
 
-#: src/split.c:291
-msgid ""
-"Pret pour l'import d'un fichier CUE, WAV, FLAC, OGG, MP3, APE, WMA"
+#: src/split.c:304
+msgid "Ready for imports and a CUE file, WAV, FLAC, OGG, MP3, APE, WMA"
 msgstr ""
 "Pronto per l'import di un file CUE, WAV, FLAC, OGG, MP3, APE, WMA"
 
-#: src/split.c:360 src/split.c:387
-msgid "Ce fichier appartient a XCFA"
+#: src/split.c:378 src/split.c:407
+msgid "This file belongs XCFA"
 msgstr "Questo file appartiene XCFA"
 
-#: src/split.c:361 src/split.c:388
-msgid "Selectionnez un autre fichier."
+#: src/split.c:379 src/split.c:408
+msgid "Select another file."
 msgstr "Selezionare un altro file."
 
-#: src/split.c:368
-msgid "Fichier vide"
-msgstr "File vuoto"
+#: src/split.c:387
+msgid "Empty file"
+msgstr "file vuoto"
 
-#: src/split.c:369
-msgid "Le fichier ne contient aucune donnee !!!"
+#: src/split.c:388
+msgid "The file contains no data !!!"
 msgstr "Il file non contiene dati !!!"
 
-#: src/split.c:412
-msgid "Sox et Mplayer absents"
-msgstr "Sox e Mplayer assente"
+#: src/split.c:433
+msgid "Sox and Mplayer not found"
+msgstr "Sox e Mplayer assenti"
 
-#: src/split.c:413
-msgid "Sox et Mplayer sont absents de votre"
-msgstr "Sox e Mplayer sono assente dal tuo"
+#: src/split.c:434
+msgid "Sox et Mplayer are not found"
+msgstr "Sox e Mplayer assenti"
 
-#: src/split.c:415
-msgid "configuration."
+#: src/split.c:436
+msgid "in your configuration."
 msgstr "configurazione."
 
-#: src/split.c:417
-msgid "Veuillez les installer pour pouvoir continuer."
-msgstr "Si prega di installare per continuare."
-
-#: src/split.c:467
-msgid "Erreur de choix de fichier"
-msgstr "Scelta di file"
+#: src/split.c:492
+msgid "Error file select"
+msgstr "Errore di lettura !"
 
-#: src/split.c:468
-msgid "Veuillez selectionner un fichier de type WAV FLAC MP3 OGG APE"
-msgstr "Si prega di selezionare un tipo di file MP3 WAV OGG FLAC APE"
+#: src/split.c:493
+msgid "Please select a file type of MP3 WAV OGG FLAC APE"
+msgstr "Selezionare un tipo di file di WAV MP3 OGG FLAC APE"
 
-#: src/split.c:504 src/split.c:577
-msgid "Mauvais type de fichier"
-msgstr "Scelta di file "
+#: src/split.c:531 src/split.c:603
+msgid "Wrong type of file"
+msgstr "Tipo sbagliato di di file"
 
-#: src/split.c:505 src/split.c:578
+#: src/split.c:532 src/split.c:604
 msgid ""
-"Les types de fichiers acceptes\n"
-"sont: WAV FLAC MP3 OGG APE WMA CUE"
+"File types accepted\n"
+"sare: WAV FLAC MP3 OGG APE WMA CUE"
 msgstr ""
-"Tipi di file accettati sono:\n"
+"I tipi di file accettati sono:\n"
 "WAV FLAC MP3 OGG APE WMA CUE"
 
-#: src/split_conv.c:312 src/split_conv.c:328
-msgid "Erreur SOX"
-msgstr "Errore di SOX"
+#: src/split_conv.c:316 src/split_conv.c:333
+msgid "SOX Error"
+msgstr "SOX Errore"
 
-#: src/split_conv.c:313 src/split_conv.c:329
-msgid "Le programme SOX de votre distribution"
-msgstr "Il programma SOX sulla distribuzione"
+#: src/split_conv.c:317 src/split_conv.c:334
+msgid "The SOX program on your distribution"
+msgstr "Il programma SOX della vostra distribuzione"
 
-#: src/split_conv.c:315 src/split_conv.c:331
-msgid "a generer une erreur pendant la conversion."
+#: src/split_conv.c:319 src/split_conv.c:336
+msgid "has generated an error during conversion."
 msgstr "ha generato un errore durante la conversione."
 
-#: src/split_cue.c:121
-msgid "Erreur de lecture !"
-msgstr "Travisamento !"
+#: src/split_cue.c:116
+msgid "Misreading !"
+msgstr "Fraintendimento!"
 
-#: src/split_cue.c:181 src/split_cue.c:190 src/split_cue.c:199
-msgid "Erreur"
-msgstr "Errore"
+#: src/split_cue.c:177 src/split_cue.c:187 src/split_cue.c:196
+msgid "Error"
+msgstr "errore"
 
-#: src/split_cue.c:182
-msgid "Aucun fichier de musique associe au cue-file !"
-msgstr "Nessun file musicale associato al file cue !"
+#: src/split_cue.c:178
+msgid "No music file associated with the cue-file"
+msgstr "Nessun file musicale associato con la stecca file"
 
-#: src/split_cue.c:191
-msgid "Pas de fichier WAV dans le cue-file !"
-msgstr "Nessun file WAV nel file cue !"
+#: src/split_cue.c:188
+msgid "No WAV file in the cue-file"
+msgstr "Nessun file WAV in file di cue-"
 
-#: src/split_cue.c:200
-msgid "Aucun fichier de musique associe dans le dossier"
-msgstr "Nessun file musicali nella cartella associata"
+#: src/split_cue.c:197
+msgid "No music file in the folder associated"
+msgstr "Nessun file musicale nella cartella associata"
 
-#: src/split_cue.c:202
-msgid "du cue-file"
-msgstr "il file-cue"
+#: src/split_cue.c:199
+msgid "of cue-file"
+msgstr "al file cue"
 
-#: src/split_cue.c:288
-msgid "Erreur de donnees dans le fichier CUE"
-msgstr "errori nei dati nel file CUE"
+#: src/split_cue.c:293
+msgid "Data errors in the CUE file"
+msgstr "Errori di dati nel file CUE"
 
-#: src/split_cue.c:289
-msgid "La solution est d'importer le fichier de"
+#: src/split_cue.c:294
+msgid "The solution is to import the file"
 msgstr "La soluzione è quella di importare il file"
 
-#: src/split_cue.c:291
-msgid "musique qui sera reconnu et pre-decoupe"
-msgstr "musica che sarà riconosciuto e pre-taglio"
+#: src/split_cue.c:296
+msgid "music that will be recognized and pre-cutting"
+msgstr "musica che verrà riconosciuto e pre-taglio"
 
-#: src/split_cue.c:293
-msgid "dans le module Split."
-msgstr "Spalato nel modulo."
+#: src/split_cue.c:298
+msgid "in the split module."
+msgstr "nel modulo di divisione."
 
-#: src/split_cue.c:295
-msgid "Il ne restera qu'a ajuster les plages pour"
+#: src/split_cue.c:300
+msgid "We will just adjust to the beaches"
 msgstr "Ci sarà solo regolare per le spiagge"
 
-#: src/split_cue.c:297
-msgid "generer un nouveau cue-file ou des decoupes"
-msgstr "generare un nuovo cue-file o tagli"
+#: src/split_cue.c:302
+msgid "generate a new cue-file or cuts"
+msgstr "generare un nuovo file cue o i tagli"
+
+#: src/split_cue.c:304
+msgid "corresponding to the beaches."
+msgstr "corrispondenti ai range."
+
+#: src/split_selector.c:136
+msgid "Deleting not during playback"
+msgstr "Non Eliminazione durante la riproduzione"
+
+#: src/split_selector.c:231 src/split_selector.c:237 src/split_selector.c:291
+#: src/split_selector.c:297 src/split_selector.c:354 src/split_selector.c:361
+#: src/split_selector.c:431 src/split_selector.c:437
+msgid "Time of less than 5 seconds between marker and cursor !"
+msgstr "Tempo inferiore a 5 secondi tra il marker e il cursore!"
 
-#: src/split_cue.c:299
-msgid "correspondant aux plages."
-msgstr "delle piste."
+#: src/web.c:173 src/web.c:221
+msgid "No web browser"
+msgstr "No browser web"
 
-#: src/split_selector.c:141
-msgid "Suppression pendant la lecture impossible"
-msgstr "L'eliminazione non durante la riproduzione"
+#: src/web.c:174 src/web.c:222
+msgid "No Web access: no web browser"
+msgstr "No Web accesso: nessun browser web"
 
-#: src/split_selector.c:234 src/split_selector.c:240 src/split_selector.c:294
-#: src/split_selector.c:300 src/split_selector.c:357 src/split_selector.c:364
-#: src/split_selector.c:434 src/split_selector.c:440
-msgid "Temps inferieur a 5 secondes entre marqueur et curseur !"
-msgstr "Tempo di meno di 5 secondi tra il marker e il cursore!"
+#: src/web.c:176 src/web.c:224
+msgid "found in your system."
+msgstr "trovato nel vostro sistema."
 
-#: src/translate.c:55
-msgid "Fichier"
+#: src/web.c:178 src/web.c:226
+msgid "Please install a web browser."
+msgstr "Per favore, installare il pacchetto [icedax]"
+
+#: src/web.c:188
+msgid "You need to enable web access"
+msgstr "È necessario abilitare l'accesso web"
+
+#: src/web.c:236
+msgid "Application is missing."
+msgstr "L'applicazione è assente."
+
+#: src/web.c:237
+msgid "Please install : "
+msgstr "Si prega di installare : "
+
+#: src/win_about.c:124
+msgid " Xcfa on the web"
+msgstr " Xcfa nel Web"
+
+#: src/win_about.c:174
+msgid ""
+"\n"
+"Au tout debut:\n"
+"\n"
+"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
+"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
+"... ;-)\n"
+"\n"
+""
+msgstr ""
+"\n"
+"All'inizio:\n"
+"\n"
+"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
+"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
+"... ;-)\n"
+"\n"
+""
+
+#: src/win_scan.c:170
+msgid "Waiting ..."
+msgstr "In attesa ... "
+
+#: glade/xcfa.glade:66 glade/xcfa.glade:2533
+msgid "File"
 msgstr "File"
 
-#: src/translate.c:56
-msgid "Quitter"
+#: glade/xcfa.glade:75
+msgid "Quit"
 msgstr "Uscire"
 
-#: src/translate.c:57
-msgid "Outils"
-msgstr "Instrumenti"
+#: glade/xcfa.glade:89
+msgid "Tools"
+msgstr "Tools"
 
-#: src/translate.c:58
-msgid "Visibilite des champs"
+#: glade/xcfa.glade:99
+msgid "Visibility fields"
 msgstr "Visibilità dei campi"
 
-#: src/translate.c:59
-msgid "Aide"
-msgstr "Aiuto"
+#: glade/xcfa.glade:112
+msgid "Help"
+msgstr "Help"
 
-#: src/translate.c:60
-msgid "A propos"
-msgstr "A proposito"
+#: glade/xcfa.glade:121
+msgid "About"
+msgstr "About"
 
-#: src/translate.c:61 src/translate.c:71
-msgid "Lecture"
-msgstr "Lettura"
+#: glade/xcfa.glade:224
+msgid "Read"
+msgstr "Read"
 
-#: src/translate.c:62
-msgid " Choix du peripherique / Lecture du DVD "
+#: glade/xcfa.glade:252
+msgid " Choosing the peripheral / DVD playback "
 msgstr " Scelta della periferica / Lettura del DVD "
 
-#: src/translate.c:63 src/translate.c:73 src/translate.c:134
-msgid " Destination des fichiers "
-msgstr " Destinazione dei file "
+#: glade/xcfa.glade:303 glade/xcfa.glade:921
+msgid " File Destination "
+msgstr " Installazione "
 
-#: src/translate.c:64 src/translate.c:74
+#: glade/xcfa.glade:359 glade/xcfa.glade:1009
 msgid " Eject "
 msgstr " Eject "
 
-#: src/translate.c:65 src/translate.c:96
-msgid " Normaliser "
+#: glade/xcfa.glade:434
+msgid " Normalize "
 msgstr " Normalizzare "
 
-#: src/translate.c:66
-msgid "Deplier"
-msgstr "Spiegare"
+#: glade/xcfa.glade:494
+msgid "Unfold"
+msgstr "spiegare"
 
-#: src/translate.c:67
-msgid "Replier"
-msgstr "Ripiegare"
+#: glade/xcfa.glade:548
+msgid "Fold"
+msgstr "piega"
 
-#: src/translate.c:68
+#: glade/xcfa.glade:649
 msgid " Vers 2CH: Sub / Ambiance "
-msgstr " Verso 2CH: Sub / Ambiance "
+msgstr " Verso 2CH: Sub / Ambiente "
 
-#: src/translate.c:69 src/translate.c:102
-msgid "Extraire"
-msgstr "Estrarre"
+#: glade/xcfa.glade:705
+msgid "Extraction"
+msgstr "XCFA: Estrazione CD"
 
-#: src/translate.c:70
+#: glade/xcfa.glade:756
 msgid " DVD "
 msgstr " DVD "
 
-#: src/translate.c:72
-msgid " Choix du peripherique / Lecture du CD "
+#: glade/xcfa.glade:842
+msgid "Lecture"
+msgstr "Lettura"
+
+#: glade/xcfa.glade:870
+msgid " Choosing the peripheral / CD playback "
 msgstr " Scelta della periferica / Lettura del CD "
 
-#: src/translate.c:75
-msgid "Titre:"
+#: glade/xcfa.glade:1065
+msgid "Title:"
 msgstr "Titolo:"
 
-#: src/translate.c:76
+#: glade/xcfa.glade:1077
 msgid "Album:"
 msgstr "Album:"
 
-#: src/translate.c:77
-msgid "Artiste:"
+#: glade/xcfa.glade:1089
+msgid "Artist:"
 msgstr "Artista:"
 
-#: src/translate.c:78
-msgid " Annee:"
-msgstr " Anno:"
+#: glade/xcfa.glade:1101
+msgid "Comment:"
+msgstr "Commento:"
 
-#: src/translate.c:79
+#: glade/xcfa.glade:1113
+msgid " Year:"
+msgstr " Genere:"
+
+#: glade/xcfa.glade:1125
 msgid " Genre:"
 msgstr " Genere:"
 
-#: src/translate.c:80
-msgid " Piste:"
-msgstr " Pista:"
+#: glade/xcfa.glade:1137
+msgid " Track:"
+msgstr "Titolo:"
 
-#: src/translate.c:81
+#: glade/xcfa.glade:1149
 msgid " *.m3u et xspf: "
 msgstr " *.m3u e xspf: "
 
-#: src/translate.c:82
-msgid "Commentaire:"
-msgstr "Commentario:"
-
-#: src/translate.c:83
-msgid " Modification des tags Freedb "
-msgstr " Modificazione dei tags Freedb "
+#: glade/xcfa.glade:1287
+msgid "Editing tags Freedb"
+msgstr " Modifica dei tag Freedb "
 
-#: src/translate.c:84
+#: glade/xcfa.glade:1302
 msgid ""
 "%a [ %a=\"Artist\" ]\n"
 "\n"
@@ -1586,18 +1498,19 @@
 "le ou les caracteres devant etre conserves doivent etre precedes par le "
 "caractere %"
 msgstr ""
-"%a [ %a=\"Artist\" ]\n"
+"%a [ %a=\"Artista\" ]\n"
 "\n"
 "%b [ %b=\"Album\" ]\n"
 "\n"
 "%Tl - Tetsumaki lower\n"
 "\n"
-"Converte la stringa in caratteri minuscoli, tranne per il primo carattere\n"
+"Converte la stringa in caratteri minuscoli, tranne per il primo carattere.\n"
 "\n"
-"Nel campo 'Titolo' dal [Modifica tag FreeDB]\n"
-"il carattere oi caratteri da conservare deve essere preceduto dacarattere %"
+"Nel campo 'Titolo' in [Modifica dei tag FreeDB]\n"
+"il carattere o i caratteri da mantenere invariati devono essere preceduti "
+"dal carattere %"
 
-#: src/translate.c:85
+#: glade/xcfa.glade:1312
 msgid ""
 "%a - artiste %b - titre "
 "de l'album %c - numero de la piste\n"
@@ -1613,996 +1526,891 @@
 "%d - titolo della canzone %e - "
 "anno %g - genere\n"
 "%f - creazione di un file *.m3u e *."
-"xspf %na - no accent\n"
+"xspf %na - niente a</"
+"b>ccenti\n"
 "%u - sostituzione di caratteri: %u(AB=C) %u( =_) %Tl "
 "- Tetsumaki lower"
 
-#: src/translate.c:86
-msgid " Arrangement des titres du CD "
-msgstr " Sistemazione dei titoli del CD"
+#: glade/xcfa.glade:1346
+msgid " Arrangement of CD titles"
+msgstr " Ordinamento delle tracce del CD "
 
-#: src/translate.c:87
-msgid "Creation d'un fichier unique au format: "
-msgstr "Creazione di un file unico al formato: "
+#: glade/xcfa.glade:1382
+msgid "Creation of a single file format: "
+msgstr "Creazione di un solo file nel formato: "
 
-#: src/translate.c:88
-msgid " et dont le nom sera: "
-msgstr " e sarà nomato: "
+#: glade/xcfa.glade:1430
+msgid " and whose name will be: "
+msgstr " e il cui nome sarà:"
 
-#: src/translate.c:89
-msgid "Ecriture du fichier cue"
-msgstr "Scritura del file cue"
+#: glade/xcfa.glade:1461
+msgid "Writing the cue file"
+msgstr "Scrivere il file cue"
 
-#: src/translate.c:90
-msgid " Au moins deux selections colonne Wav "
-msgstr " Almeno due selezione colonna Wav "
+#: glade/xcfa.glade:1484
+msgid " At least two selections column Wav "
+msgstr " Almeno due selezioni di colonna Wav "
 
-#: src/translate.c:91
+#: glade/xcfa.glade:1514
 msgid ""
-"Creation d'un fichier cue\n"
-"unique depuis une lecture\n"
-"du cd audio"
+"\n"
+"Creating a cue file from a single\n"
+"reading audio cd\n"
 msgstr ""
-"Creazione di un file cue\n"
-"unico dalla lettura\n"
-"del cd audio"
+"\n"
+"Creazione di un file spunto da un singolo \n"
+"lettura audio cd \n"
 
-#: src/translate.c:92
-msgid "Creation fichier cue uniquement"
-msgstr "Creazione solo del file cue "
+#: glade/xcfa.glade:1562
+msgid "File Creation cue only"
+msgstr "Solo Creazione File cue"
 
-#: src/translate.c:93
+#: glade/xcfa.glade:1597
 msgid " Creation Cue cd "
 msgstr " Creazione Cue cd "
 
-#: src/translate.c:94
-msgid " Creation d'un fichier unique "
-msgstr " Creazione di un file unico"
+#: glade/xcfa.glade:1625
+msgid "  Creation of a single file"
+msgstr "Creazione di un singolo file"
 
-#: src/translate.c:95
-msgid "Gestion des tags, titres et fichiers cue"
-msgstr "Gestione dei tags, titoli e file cue"
+#: glade/xcfa.glade:1638
+msgid "Management of tags, titles and cue files"
+msgstr "Gestione dei tags, dei titoli e dei file cue"
 
-#: src/translate.c:97
+#: glade/xcfa.glade:1688
+msgid " normalize "
+msgstr " Normalizzare "
+
+#: glade/xcfa.glade:1749
 msgid "definit le serveur a contacter pour les recherches titre"
-msgstr "Imposta il numero di porta da utilizzare per le ricerche titolo"
+msgstr "definisce il server da contattare per la ricerca dei titoli"
 
-#: src/translate.c:98
+#: glade/xcfa.glade:1788
 msgid "Parametres par defaut"
 msgstr "I parametri di default"
 
-#: src/translate.c:100
-msgid "Choix parmis les differentes bases de donnees pour le CD."
-msgstr "Scelta tra diversi database per il CD."
-
-#: src/translate.c:101
+#: glade/xcfa.glade:1887
 msgid "DiscId"
 msgstr "DiscId"
 
-#: src/translate.c:103
+#: glade/xcfa.glade:1946
+msgid "Extract"
+msgstr "XCFA: Estrazione CD"
+
+#: glade/xcfa.glade:2053
 msgid " CD "
 msgstr " CD "
 
-#: src/translate.c:104 src/translate.c:133
-msgid " Importer "
+#: glade/xcfa.glade:2135 glade/xcfa.glade:3271
+msgid " Import "
 msgstr " Importare "
 
-#: src/translate.c:105
-msgid " Destination des conversions "
-msgstr " Destinazione dei converzioni "
+#: glade/xcfa.glade:2190
+msgid " Destination conversions "
+msgstr " Destinazione delle conversioni "
 
-#: src/translate.c:106
-msgid " Nettoyer "
-msgstr " Pulire "
+#: glade/xcfa.glade:2266
+msgid " Clean up "
+msgstr " Creazione Cue cd "
 
-#: src/translate.c:107 src/translate.c:114
+#: glade/xcfa.glade:2389
 msgid "Appliquer les modifications"
 msgstr "Applicare le modifiche"
 
-#: src/translate.c:108
-msgid " Normalise: "
+#: glade/xcfa.glade:2444
+msgid " Normalize: "
 msgstr " Normalizza: "
 
-#: src/translate.c:109
-msgid " Choix niveau dBFS: "
-msgstr " Scelta del livello dBFS "
-
-#: src/translate.c:110 src/translate.c:132
-msgid " Fichiers "
-msgstr " File "
-
-#: src/translate.c:111
-msgid "Quantification"
-msgstr "Quantificazione"
+#: glade/xcfa.glade:2477
+msgid " Level selection dBFS: "
+msgstr " dBFS selezione Livello: "
 
-#: src/translate.c:112
-msgid "Voie"
-msgstr "Canalo"
+#: glade/xcfa.glade:2615
+msgid "Apply changes"
+msgstr "Applica modifiche"
 
-#: src/translate.c:113
-msgid " Frequence - Hertz "
-msgstr " Frequenza - Hertz "
-
-#: src/translate.c:115
+#: glade/xcfa.glade:2651
 msgid " Wav "
 msgstr " Wav "
 
-#: src/translate.c:116 src/translate.c:202
-msgid " Lame (fichier mp3): "
-msgstr " Lame (file mp3): "
+#: glade/xcfa.glade:2735
+msgid "Apply"
+msgstr "applicare"
 
-#: src/translate.c:117 src/translate.c:218
-msgid " Oggenc (fichier ogg): "
-msgstr " Oggenc (file ogg): "
-
-#: src/translate.c:118 src/translate.c:130
-msgid "Appliquer"
-msgstr "Applicare"
-
-#: src/translate.c:119
-msgid "Effacer"
-msgstr "Cancellare"
+#: glade/xcfa.glade:2789
+msgid "Delete"
+msgstr "cancellare"
 
-#: src/translate.c:120
+#: glade/xcfa.glade:2826
 msgid " Mp3-Ogg "
 msgstr " Mp3-Ogg "
 
-#: src/translate.c:121
-msgid "Titre:"
+#: glade/xcfa.glade:2875
+msgid "Title:"
 msgstr "Titolo:"
 
-#: src/translate.c:122
+#: glade/xcfa.glade:2886
 msgid "Album:"
 msgstr "Album:"
 
-#: src/translate.c:123
-msgid "Artiste:"
+#: glade/xcfa.glade:2897
+msgid "Artist:"
 msgstr "Artista:"
 
-#: src/translate.c:124
-msgid "Commentaire:"
-msgstr "Commentario:"
+#: glade/xcfa.glade:2908
+msgid "Comment:"
+msgstr "Commento:"
 
-#: src/translate.c:125
-msgid " Annee:"
-msgstr " Anno:"
+#: glade/xcfa.glade:2919
+msgid " Year:"
+msgstr " Anno:"
 
-#: src/translate.c:126
+#: glade/xcfa.glade:2930
 msgid " Genre:"
 msgstr " Genere:"
 
-#: src/translate.c:127
-msgid " Piste:"
+#: glade/xcfa.glade:2941
+msgid " Track:"
 msgstr " Traccia:"
 
-#: src/translate.c:128
+#: glade/xcfa.glade:2952
 msgid " Modif.:"
 msgstr " Modif.:"
 
-#: src/translate.c:129
+#: glade/xcfa.glade:3078
 msgid "0"
 msgstr "0"
 
-#: src/translate.c:131 src/translate.c:315
+#: glade/xcfa.glade:3102
+msgid "Apply "
+msgstr "Applicare "
+
+#: glade/xcfa.glade:3160 glade/xcfa.glade:10210
 msgid " Tags "
 msgstr " Tags "
 
-#: src/translate.c:135
+#: glade/xcfa.glade:3190
+msgid " Files "
+msgstr "Tutti file (*.*)"
+
+#: glade/xcfa.glade:3322
+msgid "   File Destination "
+msgstr " Destinazione dei file "
+
+#: glade/xcfa.glade:3494
 msgid "Lecture de 5 secondes apres le marqueur de debut"
-msgstr "Lettura 5 secondi dopo il marcatore inizio"
+msgstr "Lettura di 5 secondi dopo il marker di inizio"
 
-#: src/translate.c:136
+#: glade/xcfa.glade:3546
 msgid "Index de debut"
 msgstr "Indice iniziale"
 
-#: src/translate.c:137 src/translate.c:144 src/translate.c:147
+#: glade/xcfa.glade:3547 glade/xcfa.glade:3813 glade/xcfa.glade:3874
 msgid "00h00m00s"
 msgstr "00h00m00s"
 
-#: src/translate.c:138
+#: glade/xcfa.glade:3600
 msgid "lecture"
 msgstr "Lettura"
 
-#: src/translate.c:139
+#: glade/xcfa.glade:3653
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/translate.c:140
+#: glade/xcfa.glade:3712
 msgid "Index de lecture"
 msgstr "Indice di lettura"
 
-#: src/translate.c:141 src/translate.c:180
+#: glade/xcfa.glade:3713 glade/xcfa.glade:4767
 msgid "label"
 msgstr "label"
 
-#: src/translate.c:142
+#: glade/xcfa.glade:3760
 msgid "Lecture de 5 secondes avant le marqueur de fin"
-msgstr "Lettura di 5 secondi prima del marcatore di fine"
+msgstr "Lettura di 5 secondi prima del marker di fine"
 
-#: src/translate.c:143
+#: glade/xcfa.glade:3812
 msgid "Index de fin"
 msgstr "Fine indice"
 
-#: src/translate.c:145
+#: glade/xcfa.glade:3860
 msgid "Plage"
-msgstr "Beach"
+msgstr "Range"
 
-#: src/translate.c:146
+#: glade/xcfa.glade:3873
 msgid "Duree de la plage active"
-msgstr "Lunghezza della spiaggia attivo"
+msgstr "Durata del range attivo"
 
-#: src/translate.c:148
+#: glade/xcfa.glade:3955
 msgid "Suprimer tous les marqueurs pour les remplacer par un marqueur unique"
-msgstr "Pulire tutti i marcatori e sostituirli con un singolo marker"
+msgstr "Eliminare tutti i marker e sostituirli con un singolo marker"
 
-#: src/translate.c:149
+#: glade/xcfa.glade:4044
 msgid "Le fichier CUE sera enregistre vers 'Destination des fichiers'."
-msgstr "file CUE essere registrati 'file di destinazione'."
+msgstr "Il file CUE sarà memorizzato nella directory 'Destinazione dei file'."
 
-#: src/translate.c:150
-msgid "Production fichier Cue"
+#: glade/xcfa.glade:4073
+msgid "Production Cue file"
 msgstr "Generazione del file Cue"
 
-#: src/translate.c:151
+#: glade/xcfa.glade:4098
 msgid "Le resultat du Split sera dirige vers 'Destination des fichiers'."
-msgstr "Il risultato della Spalato sarà la rubrica di 'file di destinazione'."
+msgstr ""
+"Il risultato dello split sarà memorizzato nella diretory 'Destinazione dei "
+"file'."
 
-#: src/translate.c:152
+#: glade/xcfa.glade:4127
 msgid "Split"
 msgstr "Split"
 
-#: src/translate.c:153
+#: glade/xcfa.glade:4188
 msgid " Split "
 msgstr " Split "
 
-#: src/translate.c:154
+#: glade/xcfa.glade:4253
 msgid "Importation du titre du CD."
-msgstr "Importare il titolo del CD."
+msgstr "Importazione del titolo del CD."
 
-#: src/translate.c:155
-msgid "Titre CD"
+#: glade/xcfa.glade:4276
+msgid "Title CD"
 msgstr "Titolo CD"
 
-#: src/translate.c:156
+#: glade/xcfa.glade:4296
 msgid "Choix d'une nouvelle police."
-msgstr "La scelta di un nuovo font."
+msgstr "Scelta di un nuovo font."
 
-#: src/translate.c:157
+#: glade/xcfa.glade:4318
 msgid "Texte gras."
 msgstr "Testo in grassetto."
 
-#: src/translate.c:158
+#: glade/xcfa.glade:4340
 msgid "Texte italique."
 msgstr "Testo in corsivo."
 
-#: src/translate.c:159
-msgid ""
-"Apres une lecture de CD et un ajout d'etiquette, ce menu permet la mise en "
-"forme des titres, auteurs ..."
-msgstr ""
-"Dopo la lettura di un CD e aggiungere un'etichetta, questo menu permette la "
-"formattazione di titoli, autori ..."
-
-#: src/translate.c:160
+#: glade/xcfa.glade:4375
 msgid "Ajouter du texte editable."
-msgstr "Aggiungi testo modificabile."
+msgstr "Aggiunta di testo modificabile."
 
-#: src/translate.c:161
-msgid "Texte"
+#: glade/xcfa.glade:4430
+msgid "Text"
 msgstr "Testo"
 
-#: src/translate.c:162
+#: glade/xcfa.glade:4462
 msgid "Saisissez ici un critere de recherche d'images."
-msgstr "Inserisci qui una ricerca di immagini."
+msgstr "Inserisci qui un criterio di ricerca di immagini."
 
-#: src/translate.c:163
+#: glade/xcfa.glade:4484
 msgid "Importation des images depuis le Web."
 msgstr "Importazione di immagini dal web."
 
-#: src/translate.c:164
-msgid "Import images web"
-msgstr "Importare immagini web"
+#: glade/xcfa.glade:4509
+msgid "Import web images "
+msgstr "Importare immagini dal web"
 
-#: src/translate.c:165
+#: glade/xcfa.glade:4578
 msgid "Supprimer l'image en selection"
-msgstr "Eliminare la selezione delle immagini"
+msgstr "Eliminare l'iimagine selezionsnata"
 
-#: src/translate.c:166
+#: glade/xcfa.glade:4600
 msgid "AJouter de nouvelles images."
 msgstr "Aggiungere nuove immagini."
 
-#: src/translate.c:167
+#: glade/xcfa.glade:4606
 msgid "Ouvre un fichier"
 msgstr "Aprire un file"
 
-#: src/translate.c:168
+#: glade/xcfa.glade:4623
 msgid "Enregistrer la page au format png."
-msgstr "Salva pagina png."
+msgstr "Salva la pagina in formato png."
 
-#: src/translate.c:169
+#: glade/xcfa.glade:4629
 msgid "Sauvegarde le fichier"
 msgstr "Salvare il file"
 
-#: src/translate.c:170
+#: glade/xcfa.glade:4646
 msgid "Diminution de l'echelle."
 msgstr "Riduzione della scala."
 
-#: src/translate.c:171
+#: glade/xcfa.glade:4652
 msgid "Reduit l'agrandissement"
-msgstr "Espansione ridotto"
+msgstr "Riduci l'ingrandimento"
 
-#: src/translate.c:172
+#: glade/xcfa.glade:4669
 msgid "Echelle a 100%."
-msgstr "Scala 100%."
+msgstr "Scala al 100%."
 
-#: src/translate.c:173
+#: glade/xcfa.glade:4675
 msgid "Remet l'echelle a 100%"
-msgstr "Dà la scala al 100%"
+msgstr "Ripristina la scala al 100%"
 
-#: src/translate.c:174
+#: glade/xcfa.glade:4692
 msgid "Augmentation de l'echelle."
 msgstr "Aumento della scala."
 
-#: src/translate.c:175
+#: glade/xcfa.glade:4698
 msgid "Augmente l'agrandissement"
-msgstr "Crescente espansione"
+msgstr "Aumenta l'ingrandimento"
 
-#: src/translate.c:176
+#: glade/xcfa.glade:4715
 msgid "Echelle compatible avec la taille de la fenetre."
 msgstr "Scala compatibile con le dimensioni della finestra."
 
-#: src/translate.c:177
+#: glade/xcfa.glade:4721
 msgid "Adapte l'echelle a la taille de la fenetre"
-msgstr "Regola la scala per le dimensioni della finestra"
+msgstr "Adatta la scala alle dimensioni della finestra"
 
-#: src/translate.c:178
+#: glade/xcfa.glade:4738
 msgid "Emplacement de sauvegarde des fichiers."
-msgstr "Posizione di backup dei file."
+msgstr "Posizione dei file di backup."
 
-#: src/translate.c:179
+#: glade/xcfa.glade:4752
 msgid "Nom (sans extention) du fichier a sauvegarder."
-msgstr "Nome (senza estensione) del file è salvato."
+msgstr "Il nome (senza estensione) del file è mantenuto."
 
-#: src/translate.c:181
+#: glade/xcfa.glade:4815
 msgid " Pochette "
 msgstr " Copertina "
 
-#: src/translate.c:182
+#: glade/xcfa.glade:4861
 msgid "Nice"
 msgstr "Nice"
 
-#: src/translate.c:183
-msgid " Priorite systeme "
-msgstr " Priorite sistema "
+#: glade/xcfa.glade:4896
+msgid " Priority system "
+msgstr " Priorità di sistema "
 
-#: src/translate.c:184
+#: glade/xcfa.glade:4935
 msgid ""
-"Indiquez ici le dossier sur votre systeme qui servira de lieu\n"
-"de stockage provisoire pendant les differentes conversions.\n"
+"\n"
+"Enter here the folder on your system that will serve as\n"
+"temporary storage for the different conversions.\n"
 msgstr ""
-"Indicate qui la cartella del vostro sistema che servirà di luogo\n"
-"di stoccaggio provisorio durante le diverse converzioni.\n"
+"\n"
+"Indicaee qui la diretory del vostro sistema che servirà per\n"
+"la memorizzazione temporanea per le diverse conversioni.\n"
 
-#: src/translate.c:185
-msgid " Dossier provisoire des conversions "
-msgstr " Cartella temporaria per le converzioni "
+#: glade/xcfa.glade:4971
+msgid " Provisional file conversions "
+msgstr " Directory temporanea per le conversioni "
 
-#: src/translate.c:186
+#: glade/xcfa.glade:5017
 msgid "button"
-msgstr "button"
+msgstr "bottone"
 
-#: src/translate.c:187
-msgid " Jouer une musique en fin de tache "
-msgstr " Riproduzione di musica alla fine del compito "
+#: glade/xcfa.glade:5038
+msgid " Playing a job end music "
+msgstr " Riproduzione di musica fine lavoro "
 
-#: src/translate.c:188
+#: glade/xcfa.glade:5058
 msgid " General "
 msgstr " Generale"
 
-#: src/translate.c:189
+#: glade/xcfa.glade:5100
 msgid "cdparanoia"
 msgstr "cdparanoia"
 
-#: src/translate.c:190
+#: glade/xcfa.glade:5120
+msgid "cdparanoia mode expert"
+msgstr "cdparanoia modalità da esperti"
+
+#: glade/xcfa.glade:5140
+msgid "cdparanoia mode expert multi passes"
+msgstr "cdparanoia modalità da esperti a passi multipli"
+
+#: glade/xcfa.glade:5168
 msgid "cdda2wav / icedax"
 msgstr "cdda2wav / icedax"
 
-#: src/translate.c:191
-msgid "cdparanoia mode expert"
-msgstr "cdparanoia modo esperto"
-
-#: src/translate.c:192
+#: glade/xcfa.glade:5194
 msgid " Extraction cd-audio avec: "
 msgstr " Estrazione CD audio con: "
 
-#: src/translate.c:193
+#: glade/xcfa.glade:5268
 msgid "HomePage"
 msgstr "HomePage"
 
-#: src/translate.c:194
+#: glade/xcfa.glade:5323
 msgid "ManPage "
 msgstr "ManPage "
 
-#: src/translate.c:195
+#: glade/xcfa.glade:5352
 msgid " Web cdparanoia "
 msgstr " Web cdparanoia "
 
-#: src/translate.c:196
+#: glade/xcfa.glade:5414
 msgid ""
-"%a - artiste %b - titre "
+"Le fichier LogExpertMode.txt sera cree dans le dossier des "
+"extractions"
+msgstr ""
+"Il file LogExpertMode.txt verrà creato nella directory delle "
+"estrazioni"
+
+#: glade/xcfa.glade:5431
+msgid "Generation of a report for: cdparanoia mode expert multi passes"
+msgstr ""
+"Generazione di un report per: modalità da esperti cdparanoia a passi "
+"multipli"
+
+#: glade/xcfa.glade:5467
+msgid ""
+"%a - artist %b - titre "
 "de l'album %c - numero de la piste\n"
 "%d - titre de la chanson %e - "
-"annee %g - genre\n"
+"year %g - genre\n"
 "%na - no accent %Tl "
 "- Tetsumaki lower\n"
-"%u - remplacement de caracteres: %u(AB=C) %u( =_)"
+"%u - replacement characters: %u(AB=C) %u( =_)"
 msgstr ""
 "%a - artista %b - titolo "
 "dell'album %c - numero della traccia\n"
-"%d - titolo della canzone %e - "
+"%d - titolo del brano %e - "
 "anno %g - genere\n"
 "- Tetsumaki lower\n"
 "%u - caratteri di sostituzione: %u(AB=C) %u( =_)"
 
-#: src/translate.c:197
+#: glade/xcfa.glade:5536
 msgid " Dossier de stockage "
-msgstr " Cartella di stoccaggio "
+msgstr " Directory di salvataggio "
 
-#: src/translate.c:198
+#: glade/xcfa.glade:5567
 msgid " CD "
 msgstr " CD "
 
-#: src/translate.c:199
+#: glade/xcfa.glade:5615
 msgid "ABR / CBR / VBR / VBR-NEW"
 msgstr "ABR / CBR / VBR / VBR-NEW"
 
-#: src/translate.c:200
+#: glade/xcfa.glade:5660 glade/xcfa.glade:6295
 msgid "Debit"
-msgstr "Deflusso"
+msgstr "Compressione"
 
-#: src/translate.c:201
+#: glade/xcfa.glade:5705 glade/xcfa.glade:6317
 msgid "Mode"
 msgstr "Modo"
 
-#: src/translate.c:203 src/translate.c:219 src/translate.c:231
-#: src/translate.c:244 src/translate.c:261 src/translate.c:272
-#: src/translate.c:286 src/translate.c:300
+#: glade/xcfa.glade:5747
+msgid " Lame (fichier mp3): "
+msgstr " Lame (file mp3): "
+
+#: glade/xcfa.glade:5827 glade/xcfa.glade:6466 glade/xcfa.glade:6941
+#: glade/xcfa.glade:7469 glade/xcfa.glade:8200 glade/xcfa.glade:8659
+#: glade/xcfa.glade:9192 glade/xcfa.glade:9753
 msgid "Par defaut"
-msgstr "Per defaut"
+msgstr "Di default"
 
-#: src/translate.c:204
+#: glade/xcfa.glade:5848
 msgid " Options LAME "
 msgstr " Opzioni LAME "
 
-#: src/translate.c:205 src/translate.c:233 src/translate.c:274
+#: glade/xcfa.glade:5909 glade/xcfa.glade:7023 glade/xcfa.glade:8741
 msgid "Site officiel"
 msgstr "Sito ufficiale"
 
-#: src/translate.c:206
+#: glade/xcfa.glade:5964
 msgid "Wiki mp3 "
 msgstr "Wiki mp3 "
 
-#: src/translate.c:207
+#: glade/xcfa.glade:6020
 msgid "Wiki "
 msgstr "Wiki "
 
-#: src/translate.c:208
+#: glade/xcfa.glade:6076
 msgid "ManPage "
 msgstr "ManPage "
 
-#: src/translate.c:209
+#: glade/xcfa.glade:6105
 msgid " Web Lame "
 msgstr " Web Lame "
 
-#: src/translate.c:210 src/translate.c:224 src/translate.c:237
-#: src/translate.c:248 src/translate.c:266 src/translate.c:277
-#: src/translate.c:292
+#: glade/xcfa.glade:6181 glade/xcfa.glade:6709 glade/xcfa.glade:7238
+#: glade/xcfa.glade:7644 glade/xcfa.glade:8442 glade/xcfa.glade:8901
+#: glade/xcfa.glade:9491
 msgid "["
 msgstr "["
 
-#: src/translate.c:211 src/translate.c:225 src/translate.c:238
-#: src/translate.c:249 src/translate.c:267 src/translate.c:278
-#: src/translate.c:293
+# VR dubious
+#: glade/xcfa.glade:6194 glade/xcfa.glade:6722 glade/xcfa.glade:7251
+#: glade/xcfa.glade:7657 glade/xcfa.glade:8455 glade/xcfa.glade:8914
+#: glade/xcfa.glade:9504
 msgid "string option interne"
 msgstr "string opzione interna"
 
-#: src/translate.c:212 src/translate.c:226 src/translate.c:239
-#: src/translate.c:250 src/translate.c:268 src/translate.c:279
-#: src/translate.c:294
+#: glade/xcfa.glade:6209 glade/xcfa.glade:6737 glade/xcfa.glade:7266
+#: glade/xcfa.glade:7672 glade/xcfa.glade:8470 glade/xcfa.glade:8929
+#: glade/xcfa.glade:9519
 msgid "]"
 msgstr "]"
 
-#: src/translate.c:213
-msgid ""
-" Options experts, definies par l'utilisateur - lame (wav -> mp3) "
-msgstr " Opzioni esperti, definite dall'utente - lame (wav -> mp3) "
+#: glade/xcfa.glade:6234
+msgid " Experts options defined by the user- lame (wav -> mp3) "
+msgstr " Opzioni da esperti, definite dall'utente - lame (wav -> mp3) "
 
-#: src/translate.c:214
+#: glade/xcfa.glade:6254
 msgid " Mp3 "
 msgstr " Mp3 "
 
-#: src/translate.c:215
-msgid " Mode"
-msgstr " Modo"
-
-#: src/translate.c:216
-msgid " Mode flux (streaming)"
-msgstr " Modo flusso (streaming)"
+#: glade/xcfa.glade:6306
+msgid "Mode flux (streaming)"
+msgstr "Modo flusso (streaming)"
 
-#: src/translate.c:217
-msgid " Debit"
-msgstr " Deflusso"
+#: glade/xcfa.glade:6386
+msgid " Oggenc (fichier ogg): "
+msgstr " Oggenc (file ogg): "
 
-#: src/translate.c:220
+#: glade/xcfa.glade:6487
 msgid " Options OGGENC "
 msgstr " Opzioni OGGENC "
 
-#: src/translate.c:221
+#: glade/xcfa.glade:6548
 msgid "Wiki "
 msgstr "Wiki "
 
-#: src/translate.c:222 src/translate.c:264 src/translate.c:290
-#: src/translate.c:304
+#: glade/xcfa.glade:6604 glade/xcfa.glade:8337 glade/xcfa.glade:9386
+#: glade/xcfa.glade:9947
 msgid "ManPage"
 msgstr "ManPage"
 
-#: src/translate.c:223
+#: glade/xcfa.glade:6633
 msgid " Web Oggenc "
 msgstr " Web Oggenc "
 
-#: src/translate.c:227
-msgid ""
-" Options experts, definies par l'utilisateur - oggenc (wav -> ogg) "
-msgstr " Opzioni esperti, definite dall'utente - oggenc (wav -> ogg) "
+#: glade/xcfa.glade:6762
+msgid " Experts options defined by the user - oggenc (wav -> ogg) "
+msgstr ""
+" Opzioni da esperti, definite dall'utente - oggenc (wav -> ogg) "
 
-#: src/translate.c:228
+#: glade/xcfa.glade:6782
 msgid " Oggenc "
 msgstr " Oggenc "
 
-#: src/translate.c:229
+#: glade/xcfa.glade:6824
 msgid "Taux de compression"
 msgstr "Tasso di compressione"
 
-#: src/translate.c:230
+#: glade/xcfa.glade:6861
 msgid " Flac (fichier flac): "
 msgstr " Flac (file flac): "
 
-#: src/translate.c:232
+#: glade/xcfa.glade:6962
 msgid " Options FLAC "
 msgstr " Opzioni FLAC "
 
-#: src/translate.c:234 src/translate.c:275
+#: glade/xcfa.glade:7078 glade/xcfa.glade:8796
 msgid "Framasoft "
 msgstr "Framasoft "
 
-#: src/translate.c:235
+#: glade/xcfa.glade:7133
 msgid "ManPage "
 msgstr "ManPage "
 
-#: src/translate.c:236
+#: glade/xcfa.glade:7162
 msgid " Web Flac "
 msgstr " Web Flac "
 
-#: src/translate.c:240
-msgid ""
-" Options experts, definies par l'utilisateur - flac (wav -> flac) "
-msgstr " Opzioni esperti, definite dall'utente - flac (wav -> flac) "
+#: glade/xcfa.glade:7291
+msgid " Experts options defined by the user- flac (wav -> flac) "
+msgstr " Opzioni da esperti, definite dall'utente - flac (wav -> flac) "
 
-#: src/translate.c:241
+#: glade/xcfa.glade:7311
 msgid " Flac "
 msgstr " Flac "
 
-#: src/translate.c:242
+#: glade/xcfa.glade:7353
 msgid " Qualite"
 msgstr " Qualità"
 
-#: src/translate.c:243
+#: glade/xcfa.glade:7389
 msgid " Mac (fichier ape): "
 msgstr " Mac (file ape): "
 
-#: src/translate.c:245
+#: glade/xcfa.glade:7490
 msgid " Options MAC "
 msgstr " Opzioni MAC "
 
-#: src/translate.c:246
+#: glade/xcfa.glade:7546
 msgid "Wiki"
 msgstr "Wiki"
 
-#: src/translate.c:247
+#: glade/xcfa.glade:7568
 msgid " Web Mac "
 msgstr " Web Mac "
 
-#: src/translate.c:251
-msgid " Options experts, definies par l'utilisateur - mac (wav -> ape) "
-msgstr " Opzioni esperti, definite dall'utente - mac (wav -> ape) "
+#: glade/xcfa.glade:7697
+msgid " Experts options defined by the user - mac (wav -> ape) "
+msgstr " Opzioni da esperti, definite dall'utente - mac (wav -> ape) "
 
-#: src/translate.c:252
+#: glade/xcfa.glade:7717
 msgid " Mac "
 msgstr " Mac "
 
-#: src/translate.c:253
+#: glade/xcfa.glade:7765
 msgid "Compression"
 msgstr "Compressione"
 
-#: src/translate.c:254
+#: glade/xcfa.glade:7817
 msgid "Son"
 msgstr "Suono"
 
-#: src/translate.c:255
+#: glade/xcfa.glade:7869
 msgid "Mode hybride"
 msgstr "Modo ibrido"
 
-#: src/translate.c:256
+#: glade/xcfa.glade:7921
 msgid "Fichier de correction"
 msgstr "File di correzione"
 
-#: src/translate.c:257
+#: glade/xcfa.glade:7973
 msgid "Compression maximum"
-msgstr "Compressione massimale"
+msgstr "Compressione massima"
 
-#: src/translate.c:258
+#: glade/xcfa.glade:8025
 msgid "Signature MD5"
 msgstr "Firma MD5"
 
-#: src/translate.c:259
+#: glade/xcfa.glade:8077
 msgid "Extra encode processing"
-msgstr "Extra encode processing"
+msgstr "Elaborazione extra per la codifica"
 
-#: src/translate.c:260
+#: glade/xcfa.glade:8120
 msgid " WavPack (fichier wv): "
 msgstr " WavPack (file wv): "
 
-#: src/translate.c:262
+#: glade/xcfa.glade:8221
 msgid " Options WAVPACK "
 msgstr " Opzioni WAVPACK "
 
-#: src/translate.c:263
+#: glade/xcfa.glade:8282
 msgid "Wiki "
 msgstr "Wiki "
 
-#: src/translate.c:265
+#: glade/xcfa.glade:8366
 msgid " Web Wavpack "
 msgstr " Web Wavpack "
 
-#: src/translate.c:269
-msgid ""
-" Options experts, definies par l'utilisateur - wavpack (wav -> wv) "
-msgstr " Opzioni esperti, definiti dall'utente - wavpack (wav -> wv) "
+#: glade/xcfa.glade:8495
+msgid " Experts options defined by the user - wavpack (wav -> wv) "
+msgstr ""
+" Opzioni da esperti, definite dall'utente - wavpack (wav -> wv) "
 
-#: src/translate.c:270
+#: glade/xcfa.glade:8515
 msgid " Wavpack "
 msgstr " Wavpack "
 
-#: src/translate.c:271
+#: glade/xcfa.glade:8579
 msgid " MusePack (fichier mpc): "
 msgstr " MusePack (file mpc): "
 
-#: src/translate.c:273
+#: glade/xcfa.glade:8680
 msgid " Options MUSEPACK "
 msgstr " Opzioni MUSEPACK "
 
-#: src/translate.c:276
+#: glade/xcfa.glade:8825
 msgid " Web Musepack "
 msgstr " Web Musepack "
 
-#: src/translate.c:280
-msgid ""
-" Options experts, definies par l'utilisateur - musepack (wav -> mpc) "
-msgstr " Opzioni esperti, definiti dall'utente - musepack (wav -> mpc) "
+#: glade/xcfa.glade:8954
+msgid " Experts options defined by the user- musepack (wav -> mpc) "
+msgstr ""
+" Opzioni da esperti, definite dall'utente - musepack (wav -> mpc) "
 
-#: src/translate.c:281
+#: glade/xcfa.glade:8974
 msgid " Musepack "
 msgstr " Musepack "
 
-#: src/translate.c:282
-msgid " Qualite VBR / Debit ABR"
-msgstr " Qualità VBR / Bitrate ABR"
+#: glade/xcfa.glade:9016
+msgid "Conteneur"
+msgstr "Contenitore"
 
-#: src/translate.c:283
-msgid " VBR / ABR"
-msgstr " VBR / ABR"
+#: glade/xcfa.glade:9027
+msgid "VBR / ABR"
+msgstr "VBR / ABR"
 
-#: src/translate.c:284
-msgid " Conteneur"
-msgstr " Contenitore"
+#: glade/xcfa.glade:9038
+msgid "Qualite VBR / Debit ABR"
+msgstr "Qualità VBR / Compressione ABR"
 
-#: src/translate.c:285
+#: glade/xcfa.glade:9112
 msgid " Faac (fichier .m4a): "
 msgstr " Faac (file .m4a): "
 
-#: src/translate.c:287
+#: glade/xcfa.glade:9213
 msgid " Options FAAC "
 msgstr " Opzioni FAAC "
 
-#: src/translate.c:288 src/translate.c:302
+#: glade/xcfa.glade:9274 glade/xcfa.glade:9835
 msgid "Site officiel "
 msgstr "Sito ufficiale "
 
-#: src/translate.c:289 src/translate.c:303
+#: glade/xcfa.glade:9330 glade/xcfa.glade:9891
 msgid "Web Info "
 msgstr "Web Info "
 
-#: src/translate.c:291
+#: glade/xcfa.glade:9415
 msgid " Web Faac "
 msgstr " Web Faac "
 
-#: src/translate.c:295
-msgid ""
-" Options experts, definies par l'utilisateur - faac (wav -> m4a) "
-msgstr " Opzioni esperti, definiti dall'utente - faac (wav -> m4a) "
+#: glade/xcfa.glade:9544
+msgid " Experts options defined by the user - faac (wav -> m4a) "
+msgstr " Opzioni da esperti, definite dall'utente - faac (wav -> m4a) "
 
-#: src/translate.c:296
+#: glade/xcfa.glade:9564
 msgid " Faac "
 msgstr " Faac "
 
-#: src/translate.c:297
-msgid " Stereo: Qualite en kbit/s"
-msgstr " Stereo: Qualità in kbit/s"
+#: glade/xcfa.glade:9606
+msgid "Mono: Qualite en kbit/s"
+msgstr "Mono: Qualità in kbit/s"
 
-#: src/translate.c:298
-msgid " Mono: Qualite en kbit/s"
-msgstr " Mono: Qualità in kbit/s"
+#: glade/xcfa.glade:9617
+msgid "Stereo: Qualite en kbit/s"
+msgstr "Stereo: Qualità in kbit/s"
 
-#: src/translate.c:299
+#: glade/xcfa.glade:9673
 msgid " AacplusEnc (fichier .aac): "
 msgstr " AacplusEnc (file .aac): "
 
-#: src/translate.c:301
+#: glade/xcfa.glade:9774
 msgid " Options AacPlusEnc "
-msgstr " Opzioni AacPlusEnc "
+msgstr " Opzioni di AacPlusEnc "
 
-#: src/translate.c:305
+#: glade/xcfa.glade:9976
 msgid " Web AacPlusEnc "
 msgstr " Web AacPlusEnc "
 
-#: src/translate.c:306
+#: glade/xcfa.glade:10021
 msgid " AacplusEnc "
 msgstr " AacplusEnc "
 
-#: src/translate.c:307
+#: glade/xcfa.glade:10051
 msgid "Artiste"
 msgstr "Artista"
 
-#: src/translate.c:308 src/translate.c:335
+#: glade/xcfa.glade:10070 glade/xcfa_win_treeview.glade:95
 msgid "Titre"
 msgstr "Titolo"
 
-#: src/translate.c:309
+#: glade/xcfa.glade:10089
 msgid "Album"
 msgstr "Album"
 
-#: src/translate.c:310
+#: glade/xcfa.glade:10108
 msgid "Numero"
 msgstr "Numero"
 
-#: src/translate.c:311
+#: glade/xcfa.glade:10127
 msgid "Genre"
 msgstr "Genere"
 
-#: src/translate.c:312
+#: glade/xcfa.glade:10146
 msgid "Annee"
 msgstr "Anno"
 
-#: src/translate.c:313
+#: glade/xcfa.glade:10165
 msgid "Commentaire"
 msgstr "Commento"
 
-#: src/translate.c:314
+#: glade/xcfa.glade:10190
 msgid " Exportation de "
 msgstr " Esportazione di "
 
-#: src/translate.c:316
+#: glade/xcfa.glade:10226
 msgid " Preferences "
 msgstr " Preferenze "
 
-#: src/translate.c:317
+#: glade/xcfa.glade:10289
 msgid "SCAN"
-msgstr "SCANNERIZA"
+msgstr "CERCA E ANALIZZA"
 
-#: src/translate.c:318
+#: glade/xcfa.glade:10303
 msgid " Installation "
 msgstr " Installazione "
 
-#: src/translate.c:319
-msgid " Votre systeme utilise ... "
-msgstr " Il vostro sistema utiliza ... "
+#: glade/xcfa.glade:10338
+msgid " Your system use ... "
+msgstr " Il vostro sistema utilizza ... "
 
-#: src/translate.c:320
+#: glade/xcfa.glade:10375
 msgid ""
 "\n"
-"Pour installer les programmes externes requis,\n"
-"veuillez utiliser l'installateur de votre distribution Gnu/Linux.\n"
+"To install the required external programs\n"
+"Please use the installer to your distribution Gnu / Linux.\n"
 msgstr ""
 "\n"
-"Per installare i programmi esterni di qui avete bisogno,\n"
+"Per installare i programmi esterni necessari,\n"
 "siete pregati di utilizare il gestore di pacchetti della vostra "
 "distribuzione Gnu/Linux.\n"
 
-#: src/translate.c:321
+#: glade/xcfa.glade:10393
 msgid ""
 "Le programme XCFA_INSTALL_ALL ecrit en Perl vous sera utile en ligne de "
 "commande pour une installation des programmes complementaire."
 msgstr ""
-"Il XCFA_INSTALL_ALL programma scritto in Perl sarà utile sulla riga di "
-"comando per l'installazione di programmi complementari"
+"Il programma XCFA_INSTALL_ALL scritto in Perl sarà utile sulla riga di "
+"comando per l'installazione di programmi complementari."
 
-#: src/translate.c:322
+#: glade/xcfa.glade:10419
 msgid " Informations "
 msgstr " Informazioni "
 
-#: src/translate.c:323
-msgid " Application externes "
-msgstr "Applicazioni esterne"
+#: glade/xcfa.glade:10443
+msgid " External application "
+msgstr "XCFA: Estrazione CD"
 
-#: src/translate.c:324 src/translate.c:326
+#: glade/xcfa.glade:10514 glade/xcfa.glade:10618
 msgid "parametres:"
 msgstr "parametri:"
 
-#: src/translate.c:325
-msgid "Navigateur"
-msgstr "Navigatore"
-
-#: src/translate.c:327
-msgid "Lecteurs audio"
-msgstr "Lettori audio"
-
-#: src/translate.c:328
-msgid " Navigateurs / Lecteurs audio "
-msgstr " Navigatori / Lettori audio "
-
-#: src/translate.c:329
-msgid " Applications externes "
-msgstr " Applicazioni esterne "
-
-#: src/translate.c:330
-msgid "Scan en cours ..."
-msgstr "Scanerizzazione in corso ..."
-
-#: src/translate.c:331
-msgid "Scan du support en cours ..."
-msgstr "Scanerizzazione del sopporto in corso ..."
-
-#: src/translate.c:332
-msgid "Detail extraction mode expert"
-msgstr "Detagli estrazione modo esperto"
-
-#: src/translate.c:333
-msgid "Modification des champs"
-msgstr "Modificazione dei campi"
-
-#: src/translate.c:334
+#: glade/xcfa.glade:10527
 msgid ""
 "\n"
-"Modification des champs\n"
+" konqueror : newTab\n"
+" iceweasel : -new-window -new-tab \n"
 msgstr ""
 "\n"
-"Modificazione dei campi\n"
-
-#: src/translate.c:342 src/translate.c:361 src/translate.c:382
-#: src/translate.c:394 src/translate.c:405 src/translate.c:413
-msgid " Visibilite "
-msgstr " Visibilità "
-
-#: src/translate.c:343 src/translate.c:362 src/translate.c:383
-#: src/translate.c:395 src/translate.c:406 src/translate.c:414
-msgid "Nom a gauche"
-msgstr "Nome a sinistra"
-
-#: src/translate.c:344 src/translate.c:363 src/translate.c:384
-#: src/translate.c:396 src/translate.c:407 src/translate.c:415
-msgid "Nom au centre"
-msgstr "Nome al centro"
-
-#: src/translate.c:345 src/translate.c:364 src/translate.c:385
-#: src/translate.c:397 src/translate.c:408 src/translate.c:416
-msgid "Nom a droite"
-msgstr "Nome a destra"
-
-#: src/translate.c:346
-msgid "DVD"
-msgstr "DVD"
+" konqueror : newTab\n"
+" iceweasel : -new-window -new-tab \n"
 
-#: src/translate.c:351 src/translate.c:372
-msgid "Wavpack"
-msgstr "Wavpack"
-
-#: src/translate.c:355 src/translate.c:376
-msgid "Musepack"
-msgstr "Musepack"
-
-#: src/translate.c:365
-msgid "CD"
-msgstr "CD"
-
-#: src/translate.c:380
-msgid "Replaygain"
-msgstr "Replaygain"
-
-#: src/translate.c:386
-msgid "CONVERSIONS"
-msgstr "CONVERSIONE"
-
-#: src/translate.c:387
-msgid "Hertz"
-msgstr "Hertz"
-
-#: src/translate.c:388
-msgid "New Hertz"
-msgstr "Nuovo Hertz"
-
-#: src/translate.c:389
-msgid "Voie"
-msgstr "Via"
-
-#: src/translate.c:390
-msgid "New Voie"
-msgstr "Nuova Via"
-
-#: src/translate.c:391
-msgid "Bits"
-msgstr "Bits"
-
-#: src/translate.c:392
-msgid "New Bits"
-msgstr "Nuovi Bits"
-
-#: src/translate.c:398
-msgid "WAV"
-msgstr "WAV"
-
-#: src/translate.c:401
-msgid "New Bitrate"
-msgstr "Nuovo Bitrate"
-
-#: src/translate.c:402
-msgid "Size"
-msgstr "Dimenzione"
-
-#: src/translate.c:409
-msgid "MP3-OGG"
-msgstr "MP3-OGG"
-
-#: src/translate.c:417
-msgid "TAGS"
-msgstr "TAGS"
+#: glade/xcfa.glade:10548
+msgid "Navigateur"
+msgstr "Browser"
 
-#: src/translate.c:418
-msgid "Selection globale"
-msgstr "Selezione globale"
+#: glade/xcfa.glade:10648
+msgid "Lecteurs audio"
+msgstr "Lettori audio"
 
-#: src/translate.c:419
-msgid "Deselection globale"
-msgstr "Deselezione globale"
+#: glade/xcfa.glade:10669
+msgid "  Browsers / Audio Players "
+msgstr "Browser / Lettori audio"
 
-#: src/translate.c:420
-msgid "Retour"
-msgstr "Ritorno"
+#: glade/xcfa.glade:10692
+msgid " Applications externes "
+msgstr " Applicazioni esterne "
 
-#: src/translate.c:421
+#: glade/xcfa_win_about.glade:7
 msgid "About X Convert File Audio"
 msgstr "A proposito di X Convert File Audio"
 
-#: src/translate.c:422
+#: glade/xcfa_win_about.glade:103
 msgid "Author"
 msgstr "Autore"
 
-#: src/translate.c:423
+#: glade/xcfa_win_about.glade:139
 msgid "Licence"
-msgstr "Licence"
+msgstr "Licenza"
 
-#: src/translate.c:424
+#: glade/xcfa_win_about.glade:163
 msgid " Informations "
-msgstr " Informazione "
+msgstr " Informazioni "
 
-#: src/translate.c:425
+#: glade/xcfa_win_about.glade:198
 msgid " Machine "
 msgstr "Macchina"
 
-#: src/translate.c:426
+#: glade/xcfa_win_about.glade:333
 msgid "Ingenieurs du son\n"
 msgstr "Ingegnere del suono\n"
 
-#: src/translate.c:427
+#: glade/xcfa_win_about.glade:350
 msgid ""
 "\n"
 "Graphisme\n"
@@ -2610,7 +2418,7 @@
 "\n"
 "Grafismo\n"
 
-#: src/translate.c:428
+#: glade/xcfa_win_about.glade:370
 msgid ""
 "Traduction Anglaise\n"
 "\n"
@@ -2620,7 +2428,7 @@
 "\n"
 "\n"
 
-#: src/translate.c:429
+#: glade/xcfa_win_about.glade:391
 msgid ""
 "\n"
 "Traduction Allemande"
@@ -2628,7 +2436,7 @@
 "\n"
 "Traduzione Tedesca"
 
-#: src/translate.c:430
+#: glade/xcfa_win_about.glade:628
 msgid ""
 "\n"
 "Codeur Xcfa"
@@ -2636,7 +2444,7 @@
 "\n"
 "Programmatore Xcfa"
 
-#: src/translate.c:431
+#: glade/xcfa_win_about.glade:665
 msgid ""
 "\n"
 "ElementSpeak pour Xcfa "
@@ -2644,15 +2452,15 @@
 "\n"
 "ElementSpeak per Xcfa "
 
-#: src/translate.c:432
+#: glade/xcfa_win_about.glade:702
 msgid ""
 "\n"
 "Codeur pages Web"
 msgstr ""
 "\n"
-"Programmatore Web"
+"Programmatore delle pagine Web"
 
-#: src/translate.c:433
+#: glade/xcfa_win_about.glade:739
 msgid ""
 "\n"
 "Traduction Italienne"
@@ -2660,7 +2468,7 @@
 "\n"
 "Traduzione Italiana"
 
-#: src/translate.c:434
+#: glade/xcfa_win_about.glade:800
 msgid ""
 "\n"
 "\n"
@@ -2668,53 +2476,45 @@
 msgstr ""
 "\n"
 "\n"
-"Pagina Web da visitare\n"
+"Pagine Web da visitare\n"
 
-#: src/translate.c:435
+#: glade/xcfa_win_about.glade:1123
 msgid "Linux On The Root"
 msgstr "Linux On The Root"
 
-#: src/translate.c:436
+#: glade/xcfa_win_about.glade:1180
 msgid "Frugalware"
 msgstr "Frugalware"
 
-#: src/translate.c:437
+#: glade/xcfa_win_about.glade:1237
 msgid "Road2Mayotte"
 msgstr "Road2Mayotte"
 
-#: src/translate.c:438
+#: glade/xcfa_win_about.glade:1294
 msgid "La Linuxerie"
 msgstr "La Linuxerie"
 
-#: src/translate.c:439
-msgid "Audioptimisation by Dzef"
-msgstr "Audioptimisation by Dzef"
-
-#: src/translate.c:440
+#: glade/xcfa_win_about.glade:1351
 msgid "Tuxfamily"
 msgstr "Tuxfamily"
 
-#: src/translate.c:441
+#: glade/xcfa_win_about.glade:1408
 msgid "Framasoft"
 msgstr "Framasoft"
 
-#: src/translate.c:442
+#: glade/xcfa_win_about.glade:1465
 msgid "Ekd (EnKoDeur-Mixeur)"
 msgstr "Ekd (EnKoDeur-Mixeur)"
 
-#: src/translate.c:443
-msgid "Bishop's page"
-msgstr "Bishop's page"
-
-#: src/translate.c:444
-msgid "Je suis libre"
-msgstr "Je suis libre"
-
-#: src/translate.c:445
+#: glade/xcfa_win_about.glade:1544
 msgid "Debian Multimedia"
 msgstr "Debian Multimedia"
 
-#: src/translate.c:446
+#: glade/xcfa_win_about.glade:1598
+msgid "Je suis libre"
+msgstr "Io sono libero"
+
+#: glade/xcfa_win_about.glade:1705
 msgid ""
 "\n"
 "Forum\n"
@@ -2722,19 +2522,15 @@
 "\n"
 "Forum\n"
 
-#: src/translate.c:447
-msgid "XCFA Vorstellung "
-msgstr "XCFA Vorstellung "
+#: glade/xcfa_win_about.glade:1825
+msgid "Forum Xcfa"
+msgstr "Forum Xcfa"
 
-#: src/translate.c:448
+#: glade/xcfa_win_about.glade:1879
 msgid "XCFA LinuxForen.de"
 msgstr "XCFA LinuxForen.de"
 
-#: src/translate.c:449
-msgid "Forum Xcfa"
-msgstr "Forum Xcfa"
-
-#: src/translate.c:450
+#: glade/xcfa_win_about.glade:1929
 msgid ""
 "\n"
 "Documentation\n"
@@ -2742,102 +2538,208 @@
 "\n"
 "Documentazione\n"
 
-#: src/translate.c:451
+#: glade/xcfa_win_about.glade:2164
 msgid "Wiki Xcfa par Shankarius"
 msgstr "Wiki Xcfa da Shankarius"
 
-#: src/translate.c:452
+#: glade/xcfa_win_about.glade:2219
 msgid "Doc Xcfa par Patachon"
 msgstr "Doc Xcfa da Patachon"
 
-#: src/translate.c:453
+#: glade/xcfa_win_about.glade:2276
 msgid "Ogg Vorbis explique par Shankarius"
 msgstr "Ogg Vorbis spiegato da Shankarius"
 
-#: src/translate.c:454
+#: glade/xcfa_win_about.glade:2333
 msgid "La normalisation expliquee par Dzef"
 msgstr "La normalizzazione spiegata da Dzef"
 
-#: src/translate.c:455
+#: glade/xcfa_win_about.glade:2390
 msgid "Xcfa sur Linux On The Root"
 msgstr "Xcfa in Linux On The Root"
 
-#: src/translate.c:456
+#: glade/xcfa_win_about.glade:2433
 msgid " Contributions "
 msgstr " Contributi "
 
-#: src/translate.c:457
+#: glade/xcfa_win_about.glade:2461
 msgid " License "
 msgstr " Licenza "
 
-#: src/translate.c:458
+#: glade/xcfa_win_about.glade:2482
 msgid "OK"
 msgstr "OK"
 
-#: src/web.c:147 src/web.c:207
-msgid "PAS de navigateur present"
-msgstr "No navigatore installato"
+#: glade/xcfa_win_scan.glade:9
+msgid "Scan en cours ..."
+msgstr "Analisi in corso ..."
+
+#: glade/xcfa_win_scan.glade:77
+msgid "Scan du support en cours ..."
+msgstr "Analisi del supporto in corso ..."
+
+#: glade/xcfa_win_scan.glade:128
+msgid "Detail extraction mode expert"
+msgstr "Detagli estrazione modo esperto"
+
+#: glade/xcfa_win_treeview.glade:7
+msgid "Modification des champs"
+msgstr "Modifica dei campi"
 
-#: src/web.c:148
-msgid "L'acces au web est impossible car aucun navigateur"
-msgstr "L'accesso al Web non e possibile perché non c'è di"
+#: glade/xcfa_win_treeview.glade:41
+msgid ""
+"\n"
+"Modification des champs\n"
+msgstr ""
+"\n"
+"Modifica dei campi\n"
 
-#: src/web.c:150
-msgid "n'est present dans votre configuration."
-msgstr "navigatore installato sul vostro sistema."
+#: glade/xcfa_win_treeview.glade:129
+msgid "Temps"
+msgstr "Tempo"
 
-#: src/web.c:152
-msgid "Veuillez installez un navigateur."
-msgstr "Siete pregati di installare un navigatore"
+#: glade/xcfa_win_treeview.glade:163
+msgid "Choix"
+msgstr "Scelta"
 
-#: src/web.c:161
-msgid "Vous devez ouvrir l'acces internet"
-msgstr "Dovete accendere la connessione Internet"
+#: glade/xcfa_win_treeview.glade:197 glade/xcfa_win_treeview.glade:577
+#: glade/xcfa_win_treeview.glade:995 glade/xcfa_win_treeview.glade:1260
+#: glade/xcfa_win_treeview.glade:1508 glade/xcfa_win_treeview.glade:1706
+msgid "Nom"
+msgstr "Nome"
 
-#: src/web.c:209
-msgid " L'acces au web est impossible car aucun navigateur"
-msgstr " L'accesso al Web non e possibile perché non c'è di"
+#: glade/xcfa_win_treeview.glade:220 glade/xcfa_win_treeview.glade:600
+#: glade/xcfa_win_treeview.glade:1018 glade/xcfa_win_treeview.glade:1283
+#: glade/xcfa_win_treeview.glade:1531 glade/xcfa_win_treeview.glade:1732
+msgid " Visibilite "
+msgstr " Visibilità "
 
-#: src/web.c:211
-msgid " n'est present dans votre configuration."
-msgstr " navigatore installato sul vostro sistema. "
+#: glade/xcfa_win_treeview.glade:250 glade/xcfa_win_treeview.glade:630
+#: glade/xcfa_win_treeview.glade:1048 glade/xcfa_win_treeview.glade:1313
+#: glade/xcfa_win_treeview.glade:1562 glade/xcfa_win_treeview.glade:1763
+msgid "Nom a gauche"
+msgstr "Nome a sinistra"
 
-#: src/web.c:213
-msgid " Veuillez installez un navigateur."
-msgstr " Siete pregati di installare un navigatore"
+#: glade/xcfa_win_treeview.glade:267 glade/xcfa_win_treeview.glade:647
+#: glade/xcfa_win_treeview.glade:1065 glade/xcfa_win_treeview.glade:1330
+#: glade/xcfa_win_treeview.glade:1579 glade/xcfa_win_treeview.glade:1780
+msgid "Nom au centre"
+msgstr "Nome al centro"
 
-#: src/web.c:222
-msgid "L'application est absente."
-msgstr "L'applicazione è assente."
+#: glade/xcfa_win_treeview.glade:286 glade/xcfa_win_treeview.glade:666
+#: glade/xcfa_win_treeview.glade:1084 glade/xcfa_win_treeview.glade:1349
+#: glade/xcfa_win_treeview.glade:1598 glade/xcfa_win_treeview.glade:1799
+msgid "Nom a droite"
+msgstr "Nome a destra"
 
-#: src/web.c:223
-msgid "Veuillez installer : "
-msgstr "Si prega di installare : "
+#: glade/xcfa_win_treeview.glade:326
+msgid "DVD"
+msgstr "DVD"
 
-#: src/win_about.c:138
-msgid " Xcfa sur le web"
-msgstr " Xcfa nel Web"
+#: glade/xcfa_win_treeview.glade:373 glade/xcfa_win_treeview.glade:791
+msgid "Wav"
+msgstr "Wav"
 
-#: src/win_about.c:188
-msgid ""
-"\n"
-"Au tout debut:\n"
-"\n"
-"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
-"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
-"... ;-)\n"
-"\n"
-""
-msgstr ""
-"\n"
-"A l'origine:\n"
-"\n"
-"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
-"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
-"... ;-)\n"
-"\n"
-""
+#: glade/xcfa_win_treeview.glade:390 glade/xcfa_win_treeview.glade:808
+msgid "Flac"
+msgstr "Flac"
 
-#: src/win_scan.c:166
-msgid "Waiting ..."
-msgstr "Aspettando ... "
+#: glade/xcfa_win_treeview.glade:407 glade/xcfa_win_treeview.glade:825
+msgid "Ape"
+msgstr "Ape"
+
+#: glade/xcfa_win_treeview.glade:424 glade/xcfa_win_treeview.glade:842
+msgid "Wavpack"
+msgstr "Wavpack"
+
+#: glade/xcfa_win_treeview.glade:441 glade/xcfa_win_treeview.glade:859
+msgid "Ogg"
+msgstr "Ogg"
+
+#: glade/xcfa_win_treeview.glade:458 glade/xcfa_win_treeview.glade:876
+msgid "M4a"
+msgstr "M4a"
+
+#: glade/xcfa_win_treeview.glade:475 glade/xcfa_win_treeview.glade:893
+msgid "Aac"
+msgstr "Aac"
+
+#: glade/xcfa_win_treeview.glade:492 glade/xcfa_win_treeview.glade:910
+msgid "Musepack"
+msgstr "Musepack"
+
+#: glade/xcfa_win_treeview.glade:509 glade/xcfa_win_treeview.glade:927
+msgid "Mp3"
+msgstr "Mp3"
+
+#: glade/xcfa_win_treeview.glade:526
+msgid "Num"
+msgstr "Num"
+
+#: glade/xcfa_win_treeview.glade:709
+msgid "CD"
+msgstr "CD"
+
+#: glade/xcfa_win_treeview.glade:978
+msgid "Replaygain"
+msgstr "Replaygain"
+
+#: glade/xcfa_win_treeview.glade:1127
+msgid "CONVERSIONS"
+msgstr "CONVERSIONE"
+
+#: glade/xcfa_win_treeview.glade:1158
+msgid "Hertz"
+msgstr "Frequenza in Hertz"
+
+#: glade/xcfa_win_treeview.glade:1175
+msgid "New Hertz"
+msgstr "Nuova frequenza in Hertz"
+
+#: glade/xcfa_win_treeview.glade:1192
+msgid "Voie"
+msgstr "Modo"
+
+#: glade/xcfa_win_treeview.glade:1209
+msgid "New Voie"
+msgstr "Nuovo modo"
+
+#: glade/xcfa_win_treeview.glade:1226
+msgid "Bits"
+msgstr "Bits"
+
+#: glade/xcfa_win_treeview.glade:1243
+msgid "New Bits"
+msgstr "Nuovi Bits"
+
+#: glade/xcfa_win_treeview.glade:1392
+msgid "WAV"
+msgstr "WAV"
+
+#: glade/xcfa_win_treeview.glade:1440
+msgid "Bitrate"
+msgstr "Bitrate"
+
+#: glade/xcfa_win_treeview.glade:1457
+msgid "New Bitrate"
+msgstr "Nuovo Bitrate"
+
+#: glade/xcfa_win_treeview.glade:1641
+msgid "MP3-OGG"
+msgstr "MP3-OGG"
+
+#: glade/xcfa_win_treeview.glade:1842
+msgid "TAGS"
+msgstr "TAGS"
+
+#: glade/xcfa_win_treeview.glade:1894
+msgid "Selection globale"
+msgstr "Selezione globale"
+
+#: glade/xcfa_win_treeview.glade:1948
+msgid "Deselection globale"
+msgstr "Deselezione globale"
+
+#: glade/xcfa_win_treeview.glade:2009
+msgid "Retour"
+msgstr "Ritorno"

xcfa-4.2.8.tar.gz/po/nl.gmo -> xcfa-5.0.2.tar.gz/po/nl.gmo Changed

xcfa-4.2.8.tar.gz/po/nl.po -> xcfa-5.0.2.tar.gz/po/nl.po Changed

@@ -5,239 +5,184 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xcfa 4.2.8\n"
+"Project-Id-Version: xcfa 5.0.2\n"
 "Report-Msgid-Bugs-To: xcfa@tuxfamily.org\n"
-"POT-Creation-Date: 2012-02-03 13:22+0100\n"
-"PO-Revision-Date: 2010-08-21 18:45+0100\n"
+"POT-Creation-Date: 2015-05-16 14:03+0200\n"
+"PO-Revision-Date: 2015-02-07 10:44+0100\n"
 "Last-Translator: Gerry Butler <gdebuitleirATgmailDOTcom>\n"
 "Language-Team: English <en@li.org>\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.7.3\n"
 
-#: src/cd_audio.c:815 src/dvd.c:684 src/dvd.c:1327
-msgid "MPLAYER deja en action"
+#: src/cd_audio.c:814 src/dvd.c:686 src/dvd.c:1345
+msgid "MPLAYER already in action"
 msgstr "MPLAYER already in action"
 
-#: src/cd_audio.c:816 src/dvd.c:685 src/dvd.c:1328
-msgid "MPLAYER est deja utilise !!"
+#: src/cd_audio.c:815 src/dvd.c:687 src/dvd.c:1346
+msgid "MPLAYER is already in use !!"
 msgstr "MPLAYER is already in use !!"
 
-#: src/cd_audio.c:1227 src/cd_audio.c:1233 src/dvd.c:871 src/file.c:2830
-msgid "(Click Droit = Menu) / En attente de selection."
+#: src/cd_audio.c:1227 src/cd_audio.c:1233 src/file.c:2837
+msgid "(Right click = Menu) / Waiting for selection."
 msgstr "(Right click = Menu) / Waiting for selection."
 
-#: src/cd_audio.c:1230 src/file.c:2827
-msgid "Le programme externe d'extraction est absent."
-msgstr "The external ripping program is missing"
+#: src/cd_audio.c:1230
+msgid "The external ripping program is missing."
+msgstr "The external ripping program is missing."
 
-#: src/cd_audio.c:1236 src/file.c:2833
-msgid "(Click Droit = Menu) / En attente de selection. Le fichier existe."
-msgstr "(Right click = Menu) / Waiting for Selection. File exists."
+#: src/cd_audio.c:1236
+msgid "(Right click = Menu) / Waiting for Selection. File exists.."
+msgstr "(Right click = Menu) / Waiting for Selection. File exists.."
 
-#: src/cd_audio.c:1239 src/file.c:2836
-msgid "(Click Droit = Menu) / En selection."
-msgstr "(Right click = Menu) / Selected files"
+#: src/cd_audio.c:1239
+msgid "(Right click = Menu) / Selected files."
+msgstr "(Right click = Menu) / Selected files."
 
-#: src/cd_audio.c:1242 src/file.c:2842
-msgid "(Click Droit = Menu) / Selection avec options expert."
+#: src/cd_audio.c:1242 src/file.c:2849
+msgid "(Right click = Menu) / Selection - expert mode."
 msgstr "(Right click = Menu) / Selection - expert mode."
 
-#: src/cd_audio.c:1245 src/file.c:2839
-msgid "(Click Droit = Menu) / En selection. Le fichier existe."
+#: src/cd_audio.c:1245 src/file.c:2846
+msgid "(Right click = Menu) / Selected files. File exists."
 msgstr "(Right click = Menu) / Selected files. File exists."
 
-#: src/cd_audio.c:1248 src/file.c:2845
-msgid ""
-"(Click Droit = Menu) / Selection avec options expert. Le fichier existe."
+#: src/cd_audio.c:1248 src/file.c:2852
+msgid "(Right click = Menu) / Selection - expert mode. File exists."
 msgstr "(Right click = Menu) / Selection - expert mode. File exists."
 
 #: src/cd_audio.c:1257
 msgid ""
-"(Click Droit = Menu) / Possibilite d'ajustement INDIVIDUEL ou COLLECTIF "
-"maximal du volume"
+"(Right click = Menu) / Possibilities for individual adaptation or maximum "
+"collection volume"
 msgstr ""
 "(Right click = Menu) / Possibilities for individual adaptation or maximum "
 "collection volume"
 
 #: src/cd_audio.c:1262
-msgid "(Click Droit = Menu) / Ajustement INDIVIDUEL maximal du volume"
-msgstr "(Click Droit = Menu) / INDIVIDUAL maximum volume adjustment"
+msgid "(Right click = Menu) / INDIVIDUAL maximum volume adjustment"
+msgstr "(Right click = Menu) / INDIVIDUAL maximum volume adjustment"
 
 #: src/cd_audio.c:1265
-msgid "(Click Droit = Menu) / Ajustement COLLECTIF maximal du volume"
-msgstr "(Click Droit = Menu) / COLLECTIVE maximum volume adjustment"
-
-#: src/cd_audio.c:1505 src/dvd.c:1103 src/file.c:3139 src/translate.c:336
-#: src/translate.c:347 src/translate.c:366
-msgid "Play"
-msgstr "Play"
-
-#: src/cd_audio.c:1546 src/file.c:3204 src/translate.c:348 src/translate.c:369
-msgid "Wav"
-msgstr "Wav"
-
-#: src/cd_audio.c:1567 src/file.c:3223 src/translate.c:349 src/translate.c:370
-msgid "Flac"
-msgstr "Flac"
-
-#: src/cd_audio.c:1587 src/file.c:3242 src/translate.c:350 src/translate.c:371
-msgid "Ape"
-msgstr "Ape"
-
-#: src/cd_audio.c:1607 src/file.c:3261
-msgid "WavP"
-msgstr "WavP"
-
-#: src/cd_audio.c:1627 src/file.c:3280 src/translate.c:352 src/translate.c:373
-msgid "Ogg"
-msgstr "Ogg"
-
-#: src/cd_audio.c:1648 src/file.c:3299 src/translate.c:353 src/translate.c:374
-msgid "M4a"
-msgstr "M4a"
-
-#: src/cd_audio.c:1669 src/file.c:3318 src/translate.c:354 src/translate.c:375
-msgid "Aac"
-msgstr "Aac"
-
-#: src/cd_audio.c:1689 src/file.c:3337
-msgid "Mpc"
-msgstr "Mpc"
-
-#: src/cd_audio.c:1709 src/file.c:3356 src/translate.c:356 src/translate.c:377
-msgid "Mp3"
-msgstr "Mp3"
+msgid "(Right click = Menu) / COLLECTIVE maximum volume adjustment"
+msgstr "(Right click = Menu) / COLLECTIVE maximum volume adjustment"
 
-#: src/cd_audio.c:1730 src/translate.c:357
-msgid "Num"
-msgstr "Num"
-
-#: src/cd_audio.c:1745 src/translate.c:358 src/translate.c:378
-#: src/translate.c:403 src/translate.c:411
-msgid "Time"
-msgstr "Time"
-
-#: src/cd_audio.c:1760 src/dvd.c:1171 src/file.c:3392 src/translate.c:340
-#: src/translate.c:359 src/translate.c:379
+#: src/cd_audio.c:1764 src/dvd.c:1187 src/file.c:3403
+#: glade/xcfa_win_treeview.glade:180 glade/xcfa_win_treeview.glade:560
+#: glade/xcfa_win_treeview.glade:961
 msgid "Normalise"
 msgstr "Normalise"
 
-#: src/cd_audio.c:1785 src/dvd.c:1191 src/file.c:3434 src/file_mp3ogg.c:1287
-#: src/file_tags.c:1209 src/file_wav.c:952 src/prg_init.c:614
-#: src/translate.c:341 src/translate.c:360 src/translate.c:381
-#: src/translate.c:393 src/translate.c:404 src/translate.c:412
-msgid "Nom"
+#: src/cd_audio.c:1789 src/dvd.c:1207 src/file.c:3445 src/file_mp3ogg.c:964
+#: src/file_tags.c:1253 src/file_wav.c:830 src/prg_init.c:609
+msgid "Name"
 msgstr "Name"
 
-#: src/cd_audio.c:2507
-msgid " Parametrage CDDB: [ Nom du serveur ]"
+#: src/cd_audio.c:2517
+msgid " Setting up CDDB: [ Server name ]"
 msgstr " Setting up CDDB: [ Server name ]"
 
-#: src/cd_audio.c:2516
-msgid " Parametrage PROXY: [ serveur ] [ port ]"
+#: src/cd_audio.c:2526
+msgid " Proxy settings: [ server ] [ port ] "
 msgstr " Proxy settings: [ server ] [ port ] "
 
-#: src/cd_audio.c:2526 src/translate.c:99
-msgid " Serveur "
+#: src/cd_audio.c:2536 glade/xcfa.glade:1842
+msgid " Server "
 msgstr " Server "
 
-#: src/cd_audio_extract.c:661
+#: src/cd_audio_extract.c:673
 #, c-format
-msgid ""
-"[Erreur du segment numero: %d]\n"
-"%d) Lecture PASS 1/2\n"
-msgstr ""
-"[Error on segment #%d]\n"
-"%d) Playing PASS 1/2\n"
+msgid "[Error on segment #%d] %d) Playing PASS 1/2\n"
+msgstr "[Error on segment #%d] %d) Playing PASS 1/2\n"
 
-#: src/cd_audio_extract.c:668
+#: src/cd_audio_extract.c:680
 #, c-format
 msgid ""
-"--> Deja %d fois 2 lectures du segment %d!\n"
+"--> Segment %d already read two %d times!\n"
 " Abandon :/\n"
 msgstr ""
 "--> Segment %d already read two %d times!\n"
 " Abandon :/\n"
 
-#: src/cd_audio_extract.c:688
+#: src/cd_audio_extract.c:700
 #, c-format
-msgid "%d) Lecture PASS 2/2\n"
+msgid "%d) Read PASS 2/2\n"
 msgstr "%d) Read PASS 2/2\n"
 
-#: src/cd_audio_extract.c:769
+#: src/cd_audio_extract.c:780
 #, c-format
 msgid ""
 "\n"
-"[Piste: %d]\n"
+"[Track: %d]\n"
 msgstr ""
 "\n"
 "[Track: %d]\n"
 
-#: src/cd_audio_extract.c:773
-msgid "Extraction mode expert PASS 1/2\n"
+#: src/cd_audio_extract.c:784
+msgid "Ripping expert mode PASS 1/2\n"
 msgstr "Ripping expert mode PASS 1/2\n"
 
-#: src/cd_audio_extract.c:784
-msgid "Extraction mode expert PASS 2/2\n"
+#: src/cd_audio_extract.c:795
+msgid "Ripping expert mode PASS 2/2\n"
 msgstr "Ripping expert mode PASS 2/2\n"
 
-#: src/cd_audio_extract.c:792
-msgid "Controle du contenu des fichiers extraits\n"
+#: src/cd_audio_extract.c:803
+msgid "Control the content of the extracted files\n"
 msgstr "Control the content of the extracted files\n"
 
-#: src/cd_audio_extract.c:1678 src/cd_audio_extract.c:1680
+#: src/cd_audio_extract.c:1710 src/cd_audio_extract.c:1712
 msgid "XCFA: Extraction CD"
-msgstr "XCFA: CD Ripping"
+msgstr "XCFA: Extraction CD"
 
-#: src/cd_audio_extract.c:1678 src/dvd_extract.c:412 src/file_action.c:190
-#: src/file_mp3ogg_conv.c:300 src/file_wav_conv.c:349
+#: src/cd_audio_extract.c:1710 src/dvd_extract.c:412 src/file_action.c:183
+#: src/file_mp3ogg_conv.c:329 src/file_wav_conv.c:343
 msgid "Ok"
-msgstr "Okay"
+msgstr "Ok"
 
-#: src/cd_audio_extract.c:1680 src/dvd_extract.c:414 src/file_action.c:192
-#: src/file_mp3ogg_conv.c:302 src/file_wav_conv.c:351
-msgid "Arret par l'utilisateur"
-msgstr "Stopped by user"
+#: src/cd_audio_extract.c:1712 src/dvd_extract.c:414 src/file_action.c:185
+#: src/file_mp3ogg_conv.c:331 src/file_wav_conv.c:345
+msgid "Stop by user"
+msgstr "Stop by user"
 
-#: src/cd_audio_extract.c:1938
-msgid "Nom de fichier unique absent"
+#: src/cd_audio_extract.c:1983
+msgid "File name not found"
 msgstr "File name not found"
 
-#: src/cd_audio_extract.c:1939
-msgid "Veuillez saisir un nom pour le fichier unique"
+#: src/cd_audio_extract.c:1984
+msgid "Please enter a file name"
 msgstr "Please enter a file name"
 
-#: src/cd_audio_toc.c:160
+#: src/cd_audio_toc.c:156
 msgid "cdda2wav and icedax NOT FOUND"
 msgstr "cdda2wav and icedax NOT FOUND"
 
-#: src/cd_audio_toc.c:161
+#: src/cd_audio_toc.c:157
 msgid "Please, install packages [ icedax, cdda2wav ]"
 msgstr "Please, install packages [ icedax, cdda2wav ]"
 
-#: src/cd_audio_toc.c:166
+#: src/cd_audio_toc.c:163
 msgid "icedax NOT FOUND"
 msgstr "icedax NOT FOUND"
 
-#: src/cd_audio_toc.c:167
+#: src/cd_audio_toc.c:164
 msgid "Please, install package [ icedax ]"
 msgstr "Please, install package [ icedax ]"
 
-#: src/cd_audio_toc.c:172
+#: src/cd_audio_toc.c:170
 msgid "cdda2wav NOT FOUND"
 msgstr "cdda2wav NOT FOUND"
 
-#: src/cd_audio_toc.c:173
+#: src/cd_audio_toc.c:171
 msgid "Please, install package [ cdda2wav ]"
 msgstr "Please, install package [ cdda2wav ]"
 
-#: src/cd_audio_toc.c:181
+#: src/cd_audio_toc.c:180
 msgid "cdparanoia NOT FOUND"
 msgstr "cdparanoia NOT FOUND"
 
-#: src/cd_audio_toc.c:182
+#: src/cd_audio_toc.c:181
 msgid "Please, install package [ cdparanoia ]"
 msgstr "Please, install package [ cdparanoia ]"
 
@@ -247,1325 +192,1292 @@
 
 #: src/cd_audio_toc.c:189
 msgid "Please, install packages [ cd-discid ]"
-msgstr "Please, install package [ cd-discid ]"
+msgstr "Please, install packages [ cd-discid ]"
 
-#: src/cd_audio_toc.c:202
-msgid "ERREUR datas proxy"
+#: src/cd_audio_toc.c:203
+msgid "ERROR datas proxy"
 msgstr "ERROR datas proxy"
 
-#: src/cd_audio_toc.c:203
-msgid "Veuillez renseigner les champs du proxy"
+#: src/cd_audio_toc.c:204
+msgid "Please complete all fields proxy"
 msgstr "Please complete all fields proxy"
 
-#: src/cd_curl.c:718 src/web.c:160
-msgid "La liaison internet est absente"
+#: src/cd_curl.c:734 src/web.c:187
+msgid "A web connection is missing"
 msgstr "A web connection is missing"
 
-#: src/cd_curl.c:1122
+#: src/cd_curl.c:1204
 msgid "Couldn't find CD"
 msgstr "Couldn't find CD"
 
-#: src/cd_curl.c:1185
+#: src/cd_curl.c:1267
 msgid "No Audio CD"
 msgstr "No Audio CD"
 
-#: src/dvd.c:863
+#: src/dvd.c:877
 msgid ""
-"(Click Droit = Menu) / PEAK-ALBUM: Amplification maximale du volume pour un "
-"groupe de fichiers en respectant les ecarts de niveau entre chacun d'eux."
+"(Right click = Menu) / Maximum volume amplification of a group of files "
+"keeping the level difference between each of them."
 msgstr ""
 "(Right click = Menu) / Maximum volume amplification of a group of files "
-"keeping the level difference between each of them"
+"keeping the level difference between each of them."
 
-#: src/dvd.c:866
-msgid ""
-"(Click Droit = Menu) / PEAK: Amplification maximale du volume pour chaque de "
-"fichier."
-msgstr ""
-"(Right click = Menu) / PEAK: Maximum volume amplification for each file"
+#: src/dvd.c:882 src/file.c:2882
+msgid "PEAK: Maximum volume amplification of each file."
+msgstr "PEAK: Maximum volume amplification of each file."
+
+#: src/dvd.c:887
+msgid "(Right click = Menu) / ReplayGain: Waiting for selection."
+msgstr "(Right click = Menu) / ReplayGain: Waiting for selection."
 
-#: src/dvd.c:904 src/dvd.c:924
-msgid "En attente de selection. Un click activera la conversion vers 2 canaux."
+#: src/dvd.c:920 src/dvd.c:940
+msgid ""
+"Waiting for selection. A click will activate the conversion to 2 channels."
 msgstr ""
 "Waiting for selection. A click will activate the conversion to 2 channels."
 
-#: src/dvd.c:916
-msgid "Conversion vers 2 canaux."
+#: src/dvd.c:932
+msgid "Conversion to 2 channels."
 msgstr "Conversion to 2 channels."
 
-#: src/dvd.c:928
+#: src/dvd.c:944
 #, c-format
-msgid "Conversion vers %s canaux."
+msgid "Conversion to %s channels."
 msgstr "Conversion to %s channels."
 
-#: src/dvd.c:933
+#: src/dvd.c:949
 #, c-format
 msgid ""
-"Conversion vers 2 canaux. Un second click activera la conversion vers %s "
-"canaux."
+"Conversion to 2 channels. A second click will activate the conversion to %s "
+"channels."
 msgstr ""
 "Conversion to 2 channels. A second click will activate the conversion to %s "
 "channels."
 
-#: src/dvd.c:948
-msgid "Musique en ecoute."
+#: src/dvd.c:964
+msgid "Playing music."
 msgstr "Playing music."
 
-#: src/dvd.c:951
-msgid "Musique en attente."
+#: src/dvd.c:967
+msgid "Music paused."
 msgstr "Music paused."
 
-#: src/dvd.c:966
+#: src/dvd.c:982
 #, c-format
 msgid "Total selection%s: %d, 2ch: %d"
 msgstr "Total selection%s: %d, 2ch: %d"
 
-#: src/dvd.c:967
+#: src/dvd.c:983
 msgid "s"
 msgstr "s"
 
-#: src/dvd.c:973
-msgid "Ce fichier ne peut etre extrait !"
+#: src/dvd.c:989
+msgid "This file can not be ripped !"
 msgstr "This file can not be ripped !"
 
-#: src/dvd.c:1091
-msgid "Titres"
-msgstr "Titls"
+#: src/dvd.c:1107
+msgid "Titles"
+msgstr "Titles"
 
-#: src/dvd.c:1115 src/file.c:3375 src/file_mp3ogg.c:1272 src/file_tags.c:1193
-#: src/translate.c:337
-msgid "Temps"
+#: src/dvd.c:1119 glade/xcfa_win_treeview.glade:112
+#: glade/xcfa_win_treeview.glade:356 glade/xcfa_win_treeview.glade:740
+msgid "Play"
+msgstr "Play"
+
+#: src/dvd.c:1131 src/file.c:3386 src/file_mp3ogg.c:949 src/file_tags.c:1237
+#: glade/xcfa_win_treeview.glade:543 glade/xcfa_win_treeview.glade:944
+#: glade/xcfa_win_treeview.glade:1491 glade/xcfa_win_treeview.glade:1689
+msgid "Time"
 msgstr "Time"
 
-#: src/dvd.c:1127 src/translate.c:338
+#: src/dvd.c:1143 glade/xcfa_win_treeview.glade:146
 msgid "Format"
 msgstr "Format"
 
-#: src/dvd.c:1139 src/translate.c:339
-msgid "Choix"
+#: src/dvd.c:1155
+msgid "Choice"
 msgstr "Choice"
 
-#: src/dvd.c:1253
-msgid "Fichier structure DVD"
+#: src/dvd.c:1267
+msgid "DVD file structure"
 msgstr "DVD file structure"
 
-#: src/dvd.c:1303
-msgid "Le DVD est absent du lecteur."
+#: src/dvd.c:1320
+msgid "The DVD player is absent."
 msgstr "The DVD player is absent."
 
-#: src/dvd.c:1338
-msgid "Scan ..."
-msgstr "Scan ..."
-
-#: src/dvd.c:1387
-msgid "lsdvd est absent !"
+#: src/dvd.c:1410
+msgid "lsdvd is missing !"
 msgstr "lsdvd is missing !"
 
-#: src/dvd.c:1388
-msgid "Il faut installer le programme: lsdvd"
+#: src/dvd.c:1411
+msgid "You must install the program: lsdvd"
 msgstr "You must install the program: lsdvd"
 
 #: src/dvd_extract.c:412 src/dvd_extract.c:414
-msgid "XCFA: Extraction DVD"
+msgid "XCFA: DVD rip"
 msgstr "XCFA: DVD rip"
 
-#: src/dvd_read.c:267
+#: src/dvd_read.c:226
 #, c-format
-msgid "Titre [%02d ** ]"
+msgid "Title [%02d ** ]"
 msgstr "Title [%02d ** ]"
 
-#: src/dvd_read.c:270
+#: src/dvd_read.c:227
 #, c-format
-msgid "Titre [%02d]"
+msgid "Title [%02d]"
 msgstr "Title [%02d]"
 
-#: src/dvd_read.c:313
-#, c-format
-msgid "Fichier_complet_%02d_%s"
-msgstr "Completed_file_%02d_%s"
-
-#: src/dvd_read.c:357
+#: src/dvd_read.c:252
 #, c-format
-msgid "Chapitre: [%02d]"
+msgid "Chapter: [%02d]"
 msgstr "Chapter: [%02d]"
 
-#: src/dvd_read.c:402
-#, c-format
-msgid "Titre_%02d_Chapitre_%02d_audio_%02d_%s"
-msgstr "Title_%02d_Chapter_%02d_audio_%02d_%s"
-
-#: src/file_action.c:190 src/file_action.c:192
-msgid "XCFA: Traitement fichiers"
+#: src/file_action.c:183 src/file_action.c:185
+msgid "XCFA: Processing files"
 msgstr "XCFA: Processing files"
 
-#: src/file_analyze.c:624
+#: src/file_analyze.c:731
 msgid "Package checkmp3 (mp3check) NOT FOUND !"
 msgstr "Package checkmp3 (mp3check) NOT FOUND !"
 
-#: src/file_analyze.c:625
+#: src/file_analyze.c:732
 msgid ""
-"Veuillez installer checkmp3 ou mp3check pour\n"
-"la prise en compte des fichiers mp3"
+"Please install or checkmp3 mp3check for\n"
+"consideration of mp3 files"
 msgstr ""
 "Please install or checkmp3 mp3check for\n"
 "consideration of mp3 files"
 
-#: src/file.c:332
+#: src/file.c:327
 #, c-format
-msgid "Total fichiers: %d, Selections: %d"
-msgstr "Total files: %d, Selected: %d"
+msgid "Total files: %d, Selections: %d"
+msgstr "Total files: %d, Selections: %d"
 
-#: src/file.c:445
-msgid "CAPACITE DOSSIER TEMPORAIRE TROP FAIBLE"
+#: src/file.c:441
+msgid "TEMPORARY CAPACITY TOO LOW"
 msgstr "TEMPORARY CAPACITY TOO LOW"
 
-#: src/file.c:446
-msgid "Pas assez de place dans le dossier temporaire"
+#: src/file.c:442 src/file.c:2875
+msgid "WARNING: Not enough space available in the temp folder."
 msgstr "WARNING: Not enough space available in the temp folder."
 
-#: src/file.c:452
-msgid "Veuillez deselectionner des PeakGroup."
+#: src/file.c:448
+msgid "Please deselect PeakGroup."
 msgstr "Please deselect PeakGroup."
 
-#: src/file.c:1439
-msgid "Conversion(s) vers la source"
+#: src/file.c:1431
+msgid "Conversion(s) to source"
 msgstr "Conversion(s) to source"
 
-#: src/file.c:1440
-msgid "Choix d'une nouvelle destination"
+#: src/file.c:1432
+msgid "Select a new destination"
 msgstr "Select a new destination"
 
-#: src/file.c:1510
+#: src/file.c:1501
 msgid "Select type: --"
-msgstr "Select type: -"
+msgstr "Select type: --"
 
-#: src/file.c:1595
+#: src/file.c:1584
 msgid "Peak/album"
 msgstr "Peak/album"
 
-#: src/file.c:1596
+#: src/file.c:1585
 msgid "Peak"
 msgstr "Peak"
 
-#: src/file.c:1597
+#: src/file.c:1586
 msgid "Mix (scan)Rms/album"
 msgstr "Mix (scan)Rms/album"
 
-#: src/file.c:1598
+#: src/file.c:1587
 msgid "Fix (scan)Rms"
 msgstr "Fix (scan)Rms"
 
-#: src/file.c:2854
+#: src/file.c:2834
+msgid "The external ripping program is missing"
+msgstr "The external ripping program is missing"
+
+#: src/file.c:2840
+msgid "(Right click = Menu) / Waiting for Selection. File exists."
+msgstr "(Right click = Menu) / Waiting for Selection. File exists."
+
+#: src/file.c:2843
+msgid "(Right click = Menu) / Selected files"
+msgstr "(Right click = Menu) / Selected files"
+
+#: src/file.c:2861
 #, c-format
-msgid "MAX FICHIERS ATTEINT = %d"
+msgid "MAX FILES REACHED = %d"
 msgstr "MAX FILES REACHED = %d"
 
-#: src/file.c:2864
-msgid "Normalise: En attente de selection."
+#: src/file.c:2871
+msgid "Normalise: Waiting for selection."
 msgstr "Normalise: Waiting for selection."
 
-#: src/file.c:2868
-msgid "ATTENTION: Pas assez de place dans le dossier temporaire."
-msgstr "WARNING: Not enough space available in the temp folder."
-
-#: src/file.c:2871
+#: src/file.c:2878
 msgid ""
-"PEAK-ALBUM: Amplification maximale du volume pour un groupe de fichiers en "
-"respectant les ecarts de niveau entre chacun d'eux."
+"PEAK-ALBUM: Maximum volume amplification for a group of files according to "
+"the deviations in level between them"
 msgstr ""
 "PEAK-ALBUM: Maximum volume amplification for a group of files according to "
 "the deviations in level between them"
 
-#: src/file.c:2875
-msgid "PEAK: Amplification maximale du volume pour chaque de fichier."
-msgstr "PEAK: Maximum volume amplification of each file."
-
-#: src/file.c:2878
+#: src/file.c:2885
 msgid ""
-"RMS-ALBUM: Ajustement du volume moyen pour un groupe de fichiers en "
-"respectant les ecarts de niveau moyen entre chacun d'eux."
+"RMS-ALBUM: Adjusting the average volume for a group of files according to "
+"the average level of deviation between them."
 msgstr ""
 "RMS-ALBUM: Adjusting the average volume for a group of files according to "
 "the average level of deviation between them."
 
-#: src/file.c:2881
-msgid "RMS: Ajustement du volume moyen de chaque de fichier."
+#: src/file.c:2888
+msgid "RMS: Average volume amplification of each file."
 msgstr "RMS: Average volume amplification of each file."
 
-#: src/file.c:2895
-msgid "(Click Droit = Menu) / ReplayGain: En attente de selection."
-msgstr "(Click Droit = Menu) / ReplayGain: Waiting for selection."
+#: src/file.c:2902
+msgid "(Right Click = Menu) / ReplayGain: Waiting for selection."
+msgstr "(Right Click = Menu) / ReplayGain: Waiting for selection."
 
-#: src/file.c:2898
-msgid "(Click Droit = Menu) / Mode piste."
-msgstr "(Click Droit = Menu) / Track mode."
+#: src/file.c:2905
+msgid "(Right Click = Menu) / Track mode."
+msgstr "(Right Click = Menu) / Track mode."
 
-#: src/file.c:2901
-msgid "(Click Droit = Menu) / Mode album."
-msgstr "(Click Droit = Menu) / Album mode."
+#: src/file.c:2908
+msgid "(Right Click = Menu) / Album mode."
+msgstr "(Right Click = Menu) / Album mode."
 
-#: src/file.c:2904
-msgid "(Click Droit = Menu) / Mode effacer."
-msgstr "(Click Droit = Menu) / Erase mode."
+#: src/file.c:2911
+msgid "(Right Click = Menu) / Erase mode."
+msgstr "(Right Click = Menu) / Erase mode."
 
-#: src/file.c:3016
+#: src/file.c:3026
 msgid ""
-"(Click Droit = Menu) / Cliquez ici pour envoyer ce fichier apres traitement "
-"a la corbeille"
+"(Click Droit = Menu) / Click here to send the processed file to the trash"
 msgstr ""
 "(Click Droit = Menu) / Click here to send the processed file to the trash"
 
-#: src/file.c:3019
+#: src/file.c:3029
 msgid ""
-"(Click Droit = Menu) / Ce fichier sera dirige apres traitement vers la "
-"corbeille"
+"(Right Click = Menu) / This file will be sent to the trash after processing"
 msgstr ""
 "(Right Click = Menu) / This file will be sent to the trash after processing"
 
-#: src/file.c:3152 src/file_trash.c:367 src/translate.c:367
+#: src/file.c:3163 src/file_trash.c:208 glade/xcfa_win_treeview.glade:757
 msgid "Trash"
 msgstr "Trash"
 
-#: src/file.c:3172 src/file_mp3ogg.c:1212 src/file_tags.c:1178
-#: src/translate.c:368 src/translate.c:399 src/translate.c:410
+#: src/file.c:3183 src/file_mp3ogg.c:889 src/file_tags.c:1222
+#: glade/xcfa_win_treeview.glade:774 glade/xcfa_win_treeview.glade:1423
+#: glade/xcfa_win_treeview.glade:1672
 msgid "Type"
 msgstr "Type"
 
-#: src/file.c:3411
-msgid "ReplayGain"
-msgstr "ReplayGain"
-
-#: src/file_mp3ogg.c:771
-msgid "128 -defaut"
-msgstr "128 -default"
-
-#: src/file_mp3ogg.c:787
-msgid "V0 -meilleure qualite"
-msgstr "V0 -best quality"
-
-#: src/file_mp3ogg.c:791 src/file_mp3ogg.c:811
-msgid "V4 -defaut"
-msgstr "V4 -default"
+#: src/file_conv.c:1187
+msgid "Error since MPLAYER !"
+msgstr "Error since MPLAYER !"
 
-#: src/file_mp3ogg.c:796
-msgid "V9 -moins bonne qualite"
-msgstr "V9 -worst quality"
+#: src/file_conv.c:1188 src/file_conv.c:1200 src/file_mp3ogg_conv.c:337
+#: src/file_mp3ogg_conv.c:349
+msgid "You can enable XCFA command line with: "
+msgstr "You can enable XCFA command line with: "
 
-#: src/file_mp3ogg.c:849
-msgid "Defaut"
-msgstr "Default"
+#: src/file_conv.c:1190 src/file_conv.c:1202 src/file_mp3ogg_conv.c:339
+#: src/file_mp3ogg_conv.c:351
+msgid "$ xcfa -verbose"
+msgstr "$ xcfa -verbose"
 
-#: src/file_mp3ogg.c:884
-msgid "Qualite -1 -Moins bonne qualite"
-msgstr "Quality -1 -worst quality"
+#: src/file_conv.c:1192 src/file_mp3ogg_conv.c:341
+msgid "to see the type of error returned by mplayer."
+msgstr "to see the type of error returned by mplayer."
 
-#: src/file_mp3ogg.c:885 src/options_oggenc.c:149
-msgid "Qualite 0"
-msgstr "Quality 0"
-
-#: src/file_mp3ogg.c:886 src/options_oggenc.c:150
-msgid "Qualite 1"
-msgstr "Quality 1"
-
-#: src/file_mp3ogg.c:887 src/options_oggenc.c:151
-msgid "Qualite 2"
-msgstr "Quality 2"
-
-#: src/file_mp3ogg.c:888
-msgid "Qualite 3 -Defaut"
-msgstr "Quality 3 -Default"
-
-#: src/file_mp3ogg.c:889 src/options_oggenc.c:153
-msgid "Qualite 4"
-msgstr "Quality 4"
-
-#: src/file_mp3ogg.c:890 src/options_oggenc.c:154
-msgid "Qualite 5"
-msgstr "Quality 5"
-
-#: src/file_mp3ogg.c:891 src/options_oggenc.c:155
-msgid "Qualite 6"
-msgstr "Quality 6"
-
-#: src/file_mp3ogg.c:892 src/options_oggenc.c:156
-msgid "Qualite 7"
-msgstr "Quality 7"
-
-#: src/file_mp3ogg.c:893 src/options_oggenc.c:157
-msgid "Qualite 8"
-msgstr "Quality 8"
+#: src/file_conv.c:1199
+msgid "Error since SOX !"
+msgstr "Error since SOX !"
 
-#: src/file_mp3ogg.c:894 src/options_oggenc.c:158
-msgid "Qualite 9"
-msgstr "Quality 9"
-
-#: src/file_mp3ogg.c:895
-msgid "Qualite 10 -Meilleure qualite"
-msgstr "Quality 10 -Best quality"
-
-#: src/file_mp3ogg.c:926 src/options_oggenc.c:189 src/options_wavpack.c:186
-#: src/options_wavpack.c:209 src/options_wavpack.c:232
-msgid "Oui"
-msgstr "Yes"
-
-#: src/file_mp3ogg.c:927 src/options_oggenc.c:190 src/options_wavpack.c:153
-#: src/options_wavpack.c:185 src/options_wavpack.c:208
-#: src/options_wavpack.c:231 src/options_wavpack.c:252
-msgid "Non"
-msgstr "No"
-
-#: src/file_mp3ogg.c:949 src/options_oggenc.c:211
-msgid "Mono force"
-msgstr "Force mono"
+#: src/file_conv.c:1204 src/file_mp3ogg_conv.c:353
+msgid "to see the type of error returned by sox."
+msgstr "to see the type of error returned by sox."
 
-#: src/file_mp3ogg.c:950 src/options_oggenc.c:212
-msgid "Stereo"
-msgstr "Stereo"
-
-#: src/file_mp3ogg.c:1228 src/translate.c:400
-msgid "Bitrate"
-msgstr "Bitrate"
+#: src/file_mp3ogg.c:670
+msgid "Right click: access popup"
+msgstr "Right click: access popup"
 
-#: src/file_mp3ogg.c:1244
-msgid "Nouveau bitrate"
+#: src/file_mp3ogg.c:921
+msgid "New bitrate"
 msgstr "New bitrate"
 
-#: src/file_mp3ogg.c:1258
-msgid "Taille"
+#: src/file_mp3ogg.c:935 glade/xcfa_win_treeview.glade:1474
+msgid "Size"
 msgstr "Size"
 
-#: src/file_mp3ogg_conv.c:300 src/file_mp3ogg_conv.c:302
-msgid "XCFA: Modification bitrate"
+#: src/file_mp3ogg_conv.c:329 src/file_mp3ogg_conv.c:331
+msgid "XCFA: Bitrate change"
 msgstr "XCFA: Bitrate change"
 
-#: src/file_mp3ogg_conv.c:379
+#: src/file_mp3ogg_conv.c:336
+msgid "Error from MPLAYER !"
+msgstr "Error from MPLAYER !"
+
+#: src/file_mp3ogg_conv.c:348
+msgid "Error from SOX !"
+msgstr "Error from SOX !"
+
+#: src/file_mp3ogg_conv.c:432
 #, c-format
-msgid " ATTENTION: Il faut installer %s%s%s"
+msgid " WARNING : you need to install %s%s%s"
 msgstr " WARNING : you need to install %s%s%s"
 
-#: src/file_mp3ogg_conv.c:387
+#: src/file_mp3ogg_conv.c:440
 #, c-format
-msgid " ATTENTION: Il faut installer %s%s"
+msgid " WARNING : you need to install %s%s"
 msgstr " WARNING : you need to install %s%s"
 
-#: src/file_mp3ogg_conv.c:394
+#: src/file_mp3ogg_conv.c:447
 #, c-format
-msgid " ATTENTION: Il faut installer %s"
+msgid " WARNING : you need to install %s"
 msgstr " WARNING : you need to install %s"
 
-#: src/file_mp3ogg_conv.c:400
+#: src/file_mp3ogg_conv.c:454
 msgid "Package NOT FOUND !"
 msgstr "Package NOT FOUND !"
 
-#: src/fileselect.c:116
-msgid "Choix d'un dossier de destination"
-msgstr "Select a destination folder"
+#: src/fileselect.c:105
+msgid "Choosing a destination folder"
+msgstr "Choosing a destination folder"
 
-#: src/fileselect.c:117
-msgid "Choix d'un fichier CUE WAV FLAC OGG MP3 APE WMA"
-msgstr "Select CUE WAV FLAC OGG MP3 APE WMA files"
+#: src/fileselect.c:106
+msgid "Choosing a file CUE WAV FLAC OGG MP3 APE WMA"
+msgstr "Choosing a file CUE WAV FLAC OGG MP3 APE WMA"
 
-#: src/fileselect.c:118
-msgid "Choix d'un fichier musical"
-msgstr "Selecting a music file"
+#: src/fileselect.c:107
+msgid "Choosing a file musical"
+msgstr "Choosing a file musical"
 
-#: src/fileselect.c:119
-msgid "Choix d'un fichier"
-msgstr "Select a file"
+#: src/fileselect.c:108 src/fileselect.c:109
+msgid "Choosing a file"
+msgstr "Choosing a file"
 
-#: src/fileselect.c:120
-msgid "Choix de fichiers"
-msgstr "Select files"
+#: src/fileselect.c:110
+msgid "Choosing a WAV file"
+msgstr "Choosing a WAV file"
 
-#: src/fileselect.c:121
-msgid "Choix de fichiers WAV"
-msgstr "Select a WAV file"
+#: src/fileselect.c:111
+msgid "Choosing a MP3 OGG file"
+msgstr "Choosing a MP3 OGG file"
 
-#: src/fileselect.c:122
-msgid "Choix de fichiers MP3/OGG"
-msgstr "Select MP3/OGG file"
+#: src/fileselect.c:112
+msgid "Choosing a FLAC MPC OGG MP3 file"
+msgstr "Choosing a FLAC MPC OGG MP3 file"
 
-#: src/fileselect.c:123
-msgid "Choix de fichiers FLAC MPC OGG MP3"
-msgstr "Select FLAC MPC OGG MP3 files"
+#: src/fileselect.c:113
+msgid "Import pictures for the cover"
+msgstr "Import pictures for the cover"
 
-#: src/fileselect.c:124
-msgid "Importer des images pour la pochette"
-msgstr "Import images for the cover"
+#: src/fileselect.c:114
+msgid "Choosing an Image Storage path"
+msgstr "Choosing an Image Storage path"
 
-#: src/fileselect.c:125
-msgid "Choix d'un chemin de stockage des images"
-msgstr "Select location for image storage"
+#: src/fileselect.c:115
+msgid "Choosing a place for backup"
+msgstr "Choosing a place for backup"
 
-#: src/fileselect.c:126
-msgid "Choix d'un lieu de sauvegarde"
-msgstr "Select a backup location"
+#: src/fileselect.c:396 src/fileselect.c:415 src/fileselect.c:703
+msgid "Cancel"
+msgstr "Cancel"
 
-#: src/fileselect.c:475 src/fileselect.c:591 src/fileselect.c:599
-#: src/fileselect.c:622
+#: src/fileselect.c:398 src/fileselect.c:417 src/fileselect.c:705
+msgid "Open"
+msgstr "Open"
+
+#: src/fileselect.c:494 src/fileselect.c:617 src/fileselect.c:627
+#: src/fileselect.c:650
 msgid "All Files (*.*)"
 msgstr "All Files (*.*)"
 
-#: src/file_trash.c:368
+#: src/file_trash.c:211
 msgid "Trash files ..."
 msgstr "Trash files ..."
 
-#: src/file_wav.c:629
-msgid "(Click Droit = Menu) / Choix de la frequence"
+#: src/file_wav.c:485
+msgid "(Right Click = Menu) / Select frequency"
 msgstr "(Right Click = Menu) / Select frequency"
 
-#: src/file_wav.c:632
-msgid "(Click Droit = Menu) / Choix du nombre de pistes (voies)"
+#: src/file_wav.c:488
+msgid "(Right Click = Menu) / Select number of tracks (channels)"
 msgstr "(Right Click = Menu) / Select number of tracks (channels)"
 
-#: src/file_wav.c:635
-msgid "(Click Droit = Menu) / Choix du codage en nombre de bits"
+#: src/file_wav.c:491
+msgid "(Right Click = Menu) / Encoding selection in number of bits"
 msgstr "(Right Click = Menu) / Encoding selection in number of bits"
 
-#: src/file_wav.c:861
-msgid "Frequence"
+#: src/file_wav.c:739
+msgid "Frequency"
 msgstr "Frequency"
 
-#: src/file_wav.c:877
-msgid "FREQUENCE"
+#: src/file_wav.c:755
+msgid "FREQUENCY"
 msgstr "FREQUENCY"
 
-#: src/file_wav.c:891
-msgid "Piste"
+#: src/file_wav.c:769
+msgid "Track"
 msgstr "Track"
 
-#: src/file_wav.c:907
-msgid "PISTE"
+#: src/file_wav.c:785
+msgid "TRACK"
 msgstr "TRACK"
 
-#: src/file_wav.c:921
+#: src/file_wav.c:799
 msgid "Quantification"
 msgstr "Quantification"
 
-#: src/file_wav.c:937
+#: src/file_wav.c:815
 msgid "QUANTIFICATION"
 msgstr "QUANTIFICATION"
 
-#: src/file_wav_conv.c:265
+#: src/file_wav_conv.c:261
 #, c-format
-msgid "%s Copie fichier: %d%%"
+msgid "%s Copy file: %d%%"
 msgstr "%s Copy file: %d%%"
 
-#: src/file_wav_conv.c:275
+#: src/file_wav_conv.c:271
 #, c-format
-msgid "%s Restitution fichier: %d%%"
+msgid "%s Return file: %d%%"
 msgstr "%s Return file: %d%%"
 
-#: src/file_wav_conv.c:285
+#: src/file_wav_conv.c:281
 #, c-format
-msgid "%s Traitement Sox: %d%%"
+msgid "%s Use Sox: %d%%"
 msgstr "%s Use Sox: %d%%"
 
-#: src/file_wav_conv.c:302
+#: src/file_wav_conv.c:298
 #, c-format
-msgid "%s Traitement Mplayer: %d%%"
+msgid "%s Use Mplayer: %d%%"
 msgstr "%s Use Mplayer: %d%%"
 
-#: src/file_wav_conv.c:349 src/file_wav_conv.c:351
+#: src/file_wav_conv.c:343 src/file_wav_conv.c:345
 msgid "XCFA: Conversions WAV TO WAV"
 msgstr "XCFA: Conversions WAV TO WAV"
 
-#: src/main.c:372
-msgid "= Adressage memoire invalide\n"
-msgstr "= Invalid memory address\n"
-
-#: src/main.c:375
-msgid "= Vous avez probablement trouve un bug dans XCFA\n"
-msgstr "= You've probably found a bug in XCFA\n"
-
-#: src/main.c:676
-msgid "MODE ADMINISTRATEUR"
+#: src/main.c:644
+msgid "ADMINISTRATOR MODE"
 msgstr "ADMINISTRATOR MODE"
 
-#: src/main.c:678
-msgid " Vous ne devriez pas utiliser "
-msgstr " You should not use "
+#: src/main.c:646
+msgid " You should not use "
+msgstr " You should not use "
 
-#: src/main.c:680
-msgid " XCFA sous ROOT !"
+#: src/main.c:648
+msgid " XCFA under ROOT !"
 msgstr " XCFA under ROOT !"
 
-#: src/options.c:175
-msgid "ERREUR: Lieu de stockage non autorise !"
+#: src/options.c:169
+msgid "ERROR : storage location not permitted !"
 msgstr "ERROR : storage location not permitted !"
 
-#: src/options.c:176
-msgid "Veuillez recommencer."
+#: src/options.c:170
+msgid "Please start again."
 msgstr "Please start again."
 
-#: src/options_cd.c:120
-msgid "Pour evaluer les templates, vous devez activer une lecture de cdaudio"
+#: src/options_cd.c:122
+msgid "To assess the templates, you must enable a reading cdaudio"
 msgstr "To assess the templates, you must enable a reading cdaudio"
 
-#: src/options_faac.c:101
+#: src/options_faac.c:94
 msgid "Transport Stream (ADTS) - Extension .aac"
 msgstr "Transport Stream (ADTS) - Extension .aac"
 
-#: src/options_faac.c:102
+#: src/options_faac.c:95
 msgid "MPEG-4 File Format (MP4) - Extension .m4a"
 msgstr "MPEG-4 File Format (MP4) - Extension .m4a"
 
-#: src/options_flac.c:72
-msgid "0 (Rapide)"
+#: src/options_flac.c:65
+msgid "0 (Fast)"
 msgstr "0 (Fast)"
 
-#: src/options_flac.c:80
-msgid "8 (Lent)"
-msgstr "8 (Slow)"
+#: src/options_flac.c:73
+msgid "8 (Low)"
+msgstr "8 (Low)"
 
-#: src/options_mp3.c:298
-msgid "V0 (meilleure qualite)"
-msgstr "V0·····(Best quality)"
+#: src/options_mp3.c:276
+msgid "V0 (Best quality)"
+msgstr "V0 (Best quality)"
 
-#: src/options_mp3.c:307
-msgid "V9 (moins bonne qualite)"
-msgstr "V9·····(Poor quality)"
+#: src/options_mp3.c:285
+msgid "V9 (Poor quality)"
+msgstr "V9 (Poor quality)"
 
-#: src/options_musepack.c:75
+#: src/options_musepack.c:68
 msgid "telephone: lowest quality : 32 .. 48 kbit/s"
-msgstr "Phone: (Lowest quality) : 32 .. 48 kbit/s"
+msgstr "telephone: lowest quality : 32 .. 48 kbit/s"
 
-#: src/options_musepack.c:76
+#: src/options_musepack.c:69
 msgid "thumb : low quality/internet : 58 .. 86 kbit/s"
 msgstr "thumb : low quality/internet : 58 .. 86 kbit/s"
 
-#: src/options_musepack.c:77
+#: src/options_musepack.c:70
 msgid "radio : medium (MP3) quality : 112 .. 152 kbit/s"
 msgstr "radio : medium (MP3) quality : 112 .. 152 kbit/s"
 
-#: src/options_musepack.c:78
+#: src/options_musepack.c:71
 msgid "standard : high quality (dflt) : 142 .. 184 kbit/s"
 msgstr "standard : high quality (dflt) : 142 .. 184 kbit/s"
 
-#: src/options_musepack.c:79
+#: src/options_musepack.c:72
 msgid "xtreme : extreme high quality : 168 .. 212 kbit/s"
 msgstr "xtreme : extreme high quality : 168 .. 212 kbit/s"
 
-#: src/options_musepack.c:80
+#: src/options_musepack.c:73
 msgid "insane : extreme high quality : 232 .. 268 kbit/s"
 msgstr "insane : extreme high quality : 232 .. 268 kbit/s"
 
-#: src/options_musepack.c:81
+#: src/options_musepack.c:74
 msgid "braindead : extreme high quality : 232 .. 278 kbit/s"
 msgstr "braindead : extreme high quality : 232 .. 278 kbit/s"
 
-#: src/options_oggenc.c:148
-msgid "Qualite -1 (Moins bonne qualite)"
+#: src/options_oggenc.c:137
+msgid "Quality -1 (Poor quality)"
 msgstr "Quality -1 (Poor quality)"
 
-#: src/options_oggenc.c:152
-msgid "Qualite 3"
+#: src/options_oggenc.c:138 src/popup.c:1294
+msgid "Quality 0"
+msgstr "Quality 0"
+
+#: src/options_oggenc.c:139 src/popup.c:1294
+msgid "Quality 1"
+msgstr "Quality 1"
+
+#: src/options_oggenc.c:140 src/popup.c:1294
+msgid "Quality 2"
+msgstr "Quality 2"
+
+#: src/options_oggenc.c:141
+msgid "Quality 3"
 msgstr "Quality 3"
 
-#: src/options_oggenc.c:159
-msgid "Qualite 10 (Meilleure qualite)"
+#: src/options_oggenc.c:142 src/popup.c:1295
+msgid "Quality 4"
+msgstr "Quality 4"
+
+#: src/options_oggenc.c:143 src/popup.c:1295
+msgid "Quality 5"
+msgstr "Quality 5"
+
+#: src/options_oggenc.c:144 src/popup.c:1295
+msgid "Quality 6"
+msgstr "Quality 6"
+
+#: src/options_oggenc.c:145 src/popup.c:1295
+msgid "Quality 7"
+msgstr "Quality 7"
+
+#: src/options_oggenc.c:146 src/popup.c:1296
+msgid "Quality 8"
+msgstr "Quality 8"
+
+#: src/options_oggenc.c:147 src/popup.c:1296
+msgid "Quality 9"
+msgstr "Quality 9"
+
+#: src/options_oggenc.c:148
+msgid "Quality 10 (Best quality)"
 msgstr "Quality 10 (Best quality)"
 
-#: src/options_wavpack.c:105
-msgid "Mode normal"
+#: src/options_oggenc.c:176 src/options_wavpack.c:173
+#: src/options_wavpack.c:194 src/options_wavpack.c:215 src/popup.c:1298
+msgid "Yes"
+msgstr "Yes"
+
+#: src/options_oggenc.c:177 src/options_wavpack.c:142
+#: src/options_wavpack.c:172 src/options_wavpack.c:193
+#: src/options_wavpack.c:214 src/options_wavpack.c:233 src/popup.c:1298
+msgid "No"
+msgstr "No"
+
+#: src/options_oggenc.c:196
+msgid "Force mono"
+msgstr "Force mono"
+
+#: src/options_oggenc.c:197
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/options_wavpack.c:98
+msgid "Standard"
 msgstr "Standard"
 
-#: src/options_wavpack.c:106
-msgid "Mode rapide de compression"
+#: src/options_wavpack.c:99
+msgid "Fast (Faster encode and decode)"
 msgstr "Fast (Faster encode and decode)"
 
-#: src/options_wavpack.c:107
-msgid "Bonne qualite de compression"
+#: src/options_wavpack.c:100
+msgid "High quality (Better compression ratio)"
 msgstr "High quality (Better compression ratio)"
 
-#: src/options_wavpack.c:108
-msgid "Meilleure qualite de compression"
+#: src/options_wavpack.c:101
+msgid "Very high quality (Best compression but slowest)"
 msgstr "Very high quality (Best compression but slowest)"
 
-#: src/options_wavpack.c:134
+#: src/options_wavpack.c:125
 msgid "stereo left/right"
 msgstr "stereo left/right"
 
-#: src/options_wavpack.c:135
+#: src/options_wavpack.c:126
 msgid "stereo mid/side"
 msgstr "stereo mid/side"
 
-#: src/options_wavpack.c:253
+#: src/options_wavpack.c:234
 msgid "1 (fast / rapide)"
-msgstr "1 (fast)"
+msgstr "1 (fast / rapide)"
 
-#: src/options_wavpack.c:258
+#: src/options_wavpack.c:239
 msgid "6 (very slow / tres lent)"
-msgstr "6 (very slow)"
+msgstr "6 (very slow / tres lent)"
 
-#: src/play_file.c:112
-msgid "PAS de lecteur audio present"
+#: src/play_file.c:107
+msgid "NO audio player present"
 msgstr "NO audio player present"
 
-#: src/play_file.c:113
-msgid "Veuillez installez un lecteur audio."
-msgstr "Please install an audio player"
+#: src/play_file.c:108
+msgid "Please install an audio player."
+msgstr "Please install an audio player."
 
-#: src/poche_dir.c:436
+#: src/poche_dir.c:433
 msgid ""
 "Utilisez le glisser / deplacer - Effacer une image avec Ctrl + "
 "Click"
 msgstr ""
-"Use drag / drop - delete an image with Ctrl +Click"
+"Utilisez le glisser / deplacer - Effacer une image avec Ctrl + "
+"Click"
 
 #: src/poche_save.c:117
-msgid "Nom de fichier absent !!"
+msgid "File name not found !!"
 msgstr "File name not found !!"
 
-#: src/poche_save.c:118 src/poche_web.c:361 src/poche_web.c:382
-msgid "Pour resoudre ce probleme:"
+#: src/poche_save.c:118 src/poche_web.c:323 src/poche_web.c:345
+msgid "To solve this problem :"
 msgstr "To solve this problem :"
 
 #: src/poche_save.c:121
-msgid "Saisissez un nom de fichier sans extention"
+msgid "Enter a file name without extension"
 msgstr "Enter a file name without extension"
 
-#: src/poche_save.c:132
-msgid "Sauvegarde aux formats PDF et PostScript"
-msgstr "Saving to PDF and PostScript"
+#: src/poche_save.c:131
+msgid "Saving to PDF"
+msgstr "Saving to PDF"
 
-#: src/poche_save.c:157
-msgid "Sauvegarde au format PNG"
-msgstr "Saving as PNG"
-
-#: src/poche_web.c:360
-msgid "Aucun fichier trouve !"
+#: src/poche_web.c:322
+msgid "No file found !"
 msgstr "No file found !"
 
-#: src/poche_web.c:364
-msgid "Modifiez la chaine de recherche et"
+#: src/poche_web.c:326 src/poche_web.c:348
+msgid "Modify the search parameters and"
 msgstr "Modify the search parameters and"
 
-#: src/poche_web.c:366 src/poche_web.c:387
-msgid "recommencez."
-msgstr "start again"
+#: src/poche_web.c:328 src/poche_web.c:350
+msgid "start again."
+msgstr "start again."
 
-#: src/poche_web.c:381
-msgid "Critere de recherche absent !!"
+#: src/poche_web.c:344
+msgid "Search criteria away !!"
 msgstr "Search criteria away !!"
 
-#: src/poche_web.c:385
-msgid "Saisissez une chaine de recherche et"
-msgstr "Enter a search string and"
-
-#: src/poche_web.c:394
-msgid "[Recherche des fichiers images]"
+#: src/poche_web.c:362
+msgid "[Search images files]"
 msgstr "[Search images files]"
 
-#: src/popup.c:87 src/popup.c:106
+#: src/popup.c:81 src/popup.c:100
 msgid " Deselection globale"
-msgstr " Deselect all"
+msgstr " Deselection globale"
 
-#: src/popup.c:88 src/popup.c:107 src/popup.c:168
+#: src/popup.c:82 src/popup.c:101 src/popup.c:162
 msgid " Deselection verticale"
-msgstr " Vertically deselect"
+msgstr " Deselection verticale"
 
-#: src/popup.c:89 src/popup.c:108
+#: src/popup.c:83 src/popup.c:102
 msgid " Deselection horizontale"
-msgstr " Horizontally deselect"
+msgstr " Deselection horizontale"
 
-#: src/popup.c:90 src/popup.c:93 src/popup.c:109 src/popup.c:112
-#: src/popup.c:126 src/popup.c:139 src/popup.c:153
+#: src/popup.c:84 src/popup.c:87 src/popup.c:103 src/popup.c:106
+#: src/popup.c:120 src/popup.c:133 src/popup.c:147
 msgid " ---"
 msgstr " ---"
 
-#: src/popup.c:91 src/popup.c:110
+#: src/popup.c:85 src/popup.c:104
 msgid " Selection verticale"
-msgstr " Vertically select"
+msgstr " Selection verticale"
 
-#: src/popup.c:92 src/popup.c:111
+#: src/popup.c:86 src/popup.c:105
 msgid " Selection Expert verticale"
-msgstr " Vertical expert select"
+msgstr " Selection Expert verticale"
 
-#: src/popup.c:94 src/popup.c:113
+#: src/popup.c:88 src/popup.c:107
 msgid " Selection horizontale"
-msgstr " Horizontally select"
+msgstr " Selection horizontale"
 
-#: src/popup.c:95 src/popup.c:114
+#: src/popup.c:89 src/popup.c:108
 msgid " Selection Expert horizontale "
-msgstr " Horizontal expert select"
+msgstr " Selection Expert horizontale "
 
-#: src/popup.c:125 src/popup.c:138
+#: src/popup.c:119 src/popup.c:132
 msgid " Deselection verticale "
-msgstr " Vertically deselect "
+msgstr " Deselection verticale "
 
-#: src/popup.c:127 src/popup.c:140
+#: src/popup.c:121 src/popup.c:134
 msgid " Selection verticale "
-msgstr " Vertically select "
+msgstr " Selection verticale "
 
-#: src/popup.c:151
+#: src/popup.c:145
 msgid "---SELECTION VERTICALE-----"
-msgstr "---VERTICAL SELECTION------"
+msgstr "---SELECTION VERTICALE-----"
 
-#: src/popup.c:152
+#: src/popup.c:146
 msgid " Deselection verticale "
-msgstr " Vertically deselect "
+msgstr " Deselection verticale "
 
-#: src/popup.c:154
+#: src/popup.c:148
 msgid " Selection PISTE "
-msgstr " TRACK selection "
+msgstr " Selection PISTE "
 
-#: src/popup.c:155
+#: src/popup.c:149
 msgid " Selection ALBUM "
-msgstr " ALBUM selection "
+msgstr " Selection ALBUM "
 
-#: src/popup.c:156
+#: src/popup.c:150
 msgid " Selection NETTOYER "
-msgstr " ERASE selection "
+msgstr " Selection NETTOYER "
 
-#: src/popup.c:167
+#: src/popup.c:161
 msgid "---MENU TRASH--------------"
-msgstr "---TRASH MENU--------------"
+msgstr "---MENU TRASH--------------"
 
-#: src/popup.c:169
+#: src/popup.c:163
 msgid " Selection verticale "
-msgstr " Vertically select "
-
-#: src/popup.c:544 src/popup.c:752 src/popup.c:968
-msgid "Cellule"
-msgstr "Cell"
-
-#: src/popup.c:551 src/popup.c:577
-msgid "1 piste"
-msgstr "1 track"
+msgstr " Selection verticale "
 
-#: src/popup.c:554 src/popup.c:580
-msgid "2 pistes"
-msgstr "2 track"
-
-#: src/popup.c:557 src/popup.c:583
-msgid "4 pistes"
-msgstr "4 track"
-
-#: src/popup.c:560 src/popup.c:586
-msgid "6 pistes"
-msgstr "6 track"
-
-#: src/popup.c:566 src/popup.c:592 src/popup.c:786 src/popup.c:824
-#: src/popup.c:993 src/popup.c:1023
-msgid "Valeur d'origine"
+#: src/popup.c:504 src/popup.c:619 src/popup.c:715
+msgid "Original value"
 msgstr "Original value"
 
-#: src/popup.c:570 src/popup.c:790 src/popup.c:997
-msgid "Colonne"
-msgstr "Column"
-
-#: src/popup.c:759 src/popup.c:797
-msgid " 8000 Hertz"
-msgstr " 8000 Hertz"
-
-#: src/popup.c:762 src/popup.c:800
-msgid "22000 Hertz"
-msgstr "22000 Hertz"
-
-#: src/popup.c:765 src/popup.c:803
-msgid "32000 Hertz"
-msgstr "32000 Hertz"
-
-#: src/popup.c:768 src/popup.c:806
-msgid "44056 Hertz"
-msgstr "44056 Hertz"
-
-#: src/popup.c:771 src/popup.c:809
-msgid "44100 Hertz"
-msgstr "44100 Hertz"
+#: src/popup.c:765
+msgid "Next selector"
+msgstr "Next selector"
 
-#: src/popup.c:774 src/popup.c:812
-msgid "48000 Hertz"
-msgstr "48000 Hertz"
-
-#: src/popup.c:777 src/popup.c:815
-msgid "88200 Hertz"
-msgstr "88200 Hertz"
-
-#: src/popup.c:780 src/popup.c:818
-msgid "96000 Hertz"
-msgstr "96000 Hertz"
-
-#: src/popup.c:975 src/popup.c:1004
-msgid " 8 bits"
-msgstr " 8 bits"
-
-#: src/popup.c:978 src/popup.c:1008
-msgid "16 bits"
-msgstr "16 bits"
-
-#: src/popup.c:981 src/popup.c:1011
-msgid "24 bits"
-msgstr "24 bits"
-
-#: src/popup.c:984 src/popup.c:1014
-msgid "32 bits"
-msgstr "32 bits"
-
-#: src/popup.c:987 src/popup.c:1017
-msgid "64 bits"
-msgstr "64 bits"
-
-#: src/popup.c:1089
-msgid "Selecteur suivant"
-msgstr "Following selector"
-
-#: src/popup.c:1093
-msgid "Selecteur precedant"
+#: src/popup.c:769
+msgid "Previous selector"
 msgstr "Previous selector"
 
-#: src/popup.c:1101
-msgid "Supprimer la plage active"
+#: src/popup.c:777
+msgid "Delete the active range"
 msgstr "Delete the active range"
 
-#: src/popup.c:1173
-msgid "Retourner horizontalement"
+#: src/popup.c:850
+msgid "Flip Horizontal"
 msgstr "Flip Horizontal"
 
-#: src/popup.c:1177
-msgid "Retourner verticalement"
+#: src/popup.c:854
+msgid "Flip Vertical"
 msgstr "Flip Vertical"
 
-#: src/popup.c:1185
-msgid "Image au premier plan"
+#: src/popup.c:862
+msgid "Foreground image"
 msgstr "Foreground image"
 
-#: src/popup.c:1189
-msgid "Image au dessus"
+#: src/popup.c:866
+msgid "Image above"
 msgstr "Image above"
 
-#: src/popup.c:1193
-msgid "Image en dessous"
+#: src/popup.c:870
+msgid "Image below"
 msgstr "Image below"
 
-#: src/popup.c:1197
-msgid "Image au dernier plan"
+#: src/popup.c:874
+msgid "Image to the background"
 msgstr "Image to the background"
 
-#: src/popup.c:1205
-msgid "Effacer l'image"
+#: src/popup.c:882
+msgid "Clear image"
 msgstr "Clear image"
 
-#: src/popup.c:1242
-msgid "Supprimer l'image de la liste"
+#: src/popup.c:920
+msgid "Remove image from the list"
 msgstr "Remove image from the list"
 
-#: src/popup_systray.c:127
-msgid " Cacher Xcfa "
-msgstr " Hide Xcfa "
+#: src/popup.c:1111
+msgid "V0 [ best quality ]"
+msgstr "V0 [ best quality ]"
 
-#: src/popup_systray.c:130
-msgid " Montrer Xcfa "
-msgstr " Show Xcfa "
+#: src/popup.c:1111 src/popup.c:1114
+msgid "V4 [ default ]"
+msgstr "V4 [ default ]"
 
-#: src/popup_systray.c:150
-msgid " Quitter Xcfa "
-msgstr " Quit Xcfa "
+#: src/popup.c:1111
+msgid "V9 [ Lower quality ]"
+msgstr "V9 [ Lower quality ]"
 
-#: src/popup_systray.c:201
-msgid ""
-"XCFA\n"
-"Programme pour convertir les fichiers audio."
-msgstr ""
-"XCFA\n"
-"Program for converting audio files."
+#: src/popup.c:1294
+msgid "Quality -1 [ Lower quality ]"
+msgstr "Quality -1 [ Lower quality ]"
+
+#: src/popup.c:1295
+msgid "Quality 3 [ Defaut ]"
+msgstr "Quality 3 [ Defaut ]"
 
-#: src/prg_init.c:90
+#: src/popup.c:1296
+msgid "Quality 10 [ Best Quality ]"
+msgstr "Quality 10 [ Best Quality ]"
+
+#: src/prg_init.c:85
 msgid " Decode ATSC A/52 audio streams"
 msgstr " Decode ATSC A/52 audio streams"
 
-#: src/prg_init.c:101
+#: src/prg_init.c:96
 msgid " AAC+ encoder"
 msgstr " AAC+ encoder"
 
-#: src/prg_init.c:112 src/prg_init.c:178
+#: src/prg_init.c:107 src/prg_init.c:173
 msgid " Extracteur cd audio"
-msgstr " InCrEdible Digital Audio eXtractor"
+msgstr " Extracteur cd audio"
 
-#: src/prg_init.c:123
+#: src/prg_init.c:118
 msgid " Read CD and get CDDB discid information"
 msgstr " Read CD and get CDDB discid information"
 
-#: src/prg_init.c:134
+#: src/prg_init.c:129
 msgid " Cherche des renseignements sur les formats mp3"
-msgstr " Check validity of mp3s"
+msgstr " Cherche des renseignements sur les formats mp3"
 
-#: src/prg_init.c:145
+#: src/prg_init.c:140
 msgid " Audio Codeur freeware"
-msgstr " MPEG-4 and MPEG-2 AAC encoder"
+msgstr " Audio Codeur freeware"
 
-#: src/prg_init.c:156
+#: src/prg_init.c:151
 msgid " MPEG-4 AAC decodeur"
-msgstr " MPEG-4 AAC decoder"
+msgstr " MPEG-4 AAC decodeur"
 
-#: src/prg_init.c:167
+#: src/prg_init.c:162
 msgid " Conversion wav : flac"
-msgstr " Create wav to flac"
+msgstr " Conversion wav : flac"
 
-#: src/prg_init.c:189
+#: src/prg_init.c:184
 msgid " Conversion wav : mp3"
-msgstr " Create mp3 audio files"
+msgstr " Conversion wav : mp3"
 
-#: src/prg_init.c:200
+#: src/prg_init.c:195
 msgid " Cherche les informations d'un dvd"
-msgstr " Read the contents of a DVD"
+msgstr " Cherche les informations d'un dvd"
 
-#: src/prg_init.c:212
+#: src/prg_init.c:207
 msgid " Monkey's Audio Console Front End : APE"
 msgstr " Monkey's Audio Console Front End : APE"
 
-#: src/prg_init.c:224 src/prg_init.c:235
+#: src/prg_init.c:219 src/prg_init.c:230
 msgid " MusePack commandline utilities"
 msgstr " MusePack commandline utilities"
 
-#: src/prg_init.c:246
+#: src/prg_init.c:241
 msgid " Lecteur et extracteur"
-msgstr " Video and audio player"
+msgstr " Lecteur et extracteur"
 
-#: src/prg_init.c:257
+#: src/prg_init.c:252
 msgid " Normaliseur de fichier mp3"
-msgstr " Lossless mp3 normaliser"
+msgstr " Normaliseur de fichier mp3"
 
-#: src/prg_init.c:268
+#: src/prg_init.c:263
 msgid " Normaliseur de fichier wav"
-msgstr " wav file normaliser"
+msgstr " Normaliseur de fichier wav"
 
-#: src/prg_init.c:279
+#: src/prg_init.c:274
 msgid " A program to send desktop notifications"
 msgstr " A program to send desktop notifications"
 
-#: src/prg_init.c:290
+#: src/prg_init.c:285
 msgid " Forte compression au format wave"
-msgstr " High compression for waveform files"
+msgstr " Forte compression au format wave"
 
-#: src/prg_init.c:301
+#: src/prg_init.c:296
 msgid " Decoupage de fichiers sans decodage"
-msgstr " Split mp3/ogg without decoding"
+msgstr " Decoupage de fichiers sans decodage"
 
-#: src/prg_init.c:312
+#: src/prg_init.c:307
 msgid " Transformation universelle de fichiers son"
-msgstr " Sound eXchange, the Swiss Army knife of audio manipulation"
+msgstr " Transformation universelle de fichiers son"
 
-#: src/prg_init.c:323
+#: src/prg_init.c:318
 msgid " Conversion wav : ogg"
-msgstr " Convert wav : ogg"
+msgstr " Conversion wav : ogg"
 
-#: src/prg_init.c:334
+#: src/prg_init.c:329
 msgid " Normaliseur de fichier ogg"
-msgstr " ogg file normaliser"
+msgstr " Normaliseur de fichier ogg"
 
-#: src/prg_init.c:345
+#: src/prg_init.c:340
 msgid " WAVPACK Hybrid Lossless Audio Compressor"
-msgstr " Wavpack Hybrid Lossless Audio Compressor"
+msgstr " WAVPACK Hybrid Lossless Audio Compressor"
 
-#: src/prg_init.c:362
-msgid " ... les paquets: deb "
-msgstr " ... Packets: deb "
+#: src/prg_init.c:357
+msgid " ... Packets: deb "
+msgstr " ... Packets: deb "
 
-#: src/prg_init.c:368
-msgid " ... les paquets: tgz "
-msgstr " ... Packets: tgz "
+#: src/prg_init.c:363
+msgid " ... Packets: tgz "
+msgstr " ... Packets: tgz "
 
-#: src/prg_init.c:374
-msgid " ... les paquets: fpm "
-msgstr " ... Packets: fpm "
+#: src/prg_init.c:369
+msgid " ... Packets: fpm "
+msgstr " ... Packets: fpm "
 
-#: src/prg_init.c:380
-msgid " ... les paquets: rpm "
-msgstr " ... Packets: rpm "
+#: src/prg_init.c:375
+msgid " ... Packets: rpm "
+msgstr " ... Packets: rpm "
 
-#: src/prg_init.c:386
-msgid " ... les paquets: pkg.tar.xz "
+#: src/prg_init.c:381
+msgid " ... Packets: pkg.tar.xz "
 msgstr " ... Packets: pkg.tar.xz "
 
-#: src/prg_init.c:392
-msgid " ... les paquets: ? "
-msgstr " ... Packets: ?"
+#: src/prg_init.c:387
+msgid " ... Packets: ? "
+msgstr " ... Packets: ? "
 
-#: src/prg_init.c:628
+#: src/prg_init.c:623
 msgid "Status"
 msgstr "Status"
 
-#: src/prg_init.c:642
-msgid "Paquet"
+#: src/prg_init.c:637
+msgid "Packets"
 msgstr "Packets"
 
-#: src/prg_init.c:657
+#: src/prg_init.c:652
 msgid "Action"
 msgstr "Action"
 
-#: src/scan.c:260
-msgid "PACKAGE dvd+rw-tools ABSENT"
+#: src/scan.c:259
+msgid "PACKAGE dvd+rw-tools is missing"
 msgstr "PACKAGE dvd+rw-tools is missing"
 
-#: src/scan.c:261
-msgid "Le package 'dvd+rw-tools' est absent"
+#: src/scan.c:260
+msgid "The package 'imagemagick' is missing"
 msgstr "The package 'imagemagick' is missing"
 
-#: src/scan.c:263
-msgid "de votre systeme !"
+#: src/scan.c:262
+msgid "on your system !"
 msgstr "on your system !"
 
-#: src/scan.c:265
-msgid "Veuillez l'installer car j'ai besoin de"
+#: src/scan.c:264 src/split.c:438
+msgid "Please install it and resume"
 msgstr "Please install it and resume"
 
-#: src/scan.c:267
-msgid "'dvd+rw-mediainfo' pour identifier le(s)"
+#: src/scan.c:266
+msgid "'Dvd + rw-mediainfo' to identify the"
 msgstr "'Dvd + rw-mediainfo' to identify the"
 
-#: src/scan.c:269
-msgid "lecteur(s) de cd / dvd."
+#: src/scan.c:268
+msgid "reader of cd / dvd."
 msgstr "reader of cd / dvd."
 
-#: src/split.c:284
+#: src/split.c:297
 msgid ""
-"Menu: Click droit / Ajout plage: Click bouton centre / Zoom: Ctrl+Scroll"
+"Menu: right click / Adding track: Click the center button / Zoom: Ctrl"
+"+Scroll"
 msgstr ""
 "Menu: right click / Adding track: Click the center button / Zoom: Ctrl"
 "+Scroll"
 
-#: src/split.c:287
-msgid "Ajout plage: Click bouton centre / Zoom: Ctrl+Scroll"
+#: src/split.c:300
+msgid "Adding track: Click the center button / Zoom: Ctrl+Scroll"
 msgstr "Adding track: Click the center button / Zoom: Ctrl+Scroll"
 
-#: src/split.c:291
-msgid ""
-"Pret pour l'import d'un fichier CUE, WAV, FLAC, OGG, MP3, APE, WMA"
+#: src/split.c:304
+msgid "Ready for imports and a CUE file, WAV, FLAC, OGG, MP3, APE, WMA"
 msgstr "Ready for imports and a CUE file, WAV, FLAC, OGG, MP3, APE, WMA"
 
-#: src/split.c:360 src/split.c:387
-msgid "Ce fichier appartient a XCFA"
+#: src/split.c:378 src/split.c:407
+msgid "This file belongs XCFA"
 msgstr "This file belongs XCFA"
 
-#: src/split.c:361 src/split.c:388
-msgid "Selectionnez un autre fichier."
+#: src/split.c:379 src/split.c:408
+msgid "Select another file."
 msgstr "Select another file."
 
-#: src/split.c:368
-msgid "Fichier vide"
+#: src/split.c:387
+msgid "Empty file"
 msgstr "Empty file"
 
-#: src/split.c:369
-msgid "Le fichier ne contient aucune donnee !!!"
+#: src/split.c:388
+msgid "The file contains no data !!!"
 msgstr "The file contains no data !!!"
 
-#: src/split.c:412
-msgid "Sox et Mplayer absents"
-msgstr "Sox and Mplayer is missing"
+#: src/split.c:433
+msgid "Sox and Mplayer not found"
+msgstr "Sox and Mplayer not found"
 
-#: src/split.c:413
-msgid "Sox et Mplayer sont absents de votre"
-msgstr "Sox and Mplayer is missing"
+#: src/split.c:434
+msgid "Sox et Mplayer are not found"
+msgstr "Sox et Mplayer are not found"
 
-#: src/split.c:415
-msgid "configuration."
-msgstr "configuration."
-
-#: src/split.c:417
-msgid "Veuillez les installer pour pouvoir continuer."
-msgstr "Please install it and resume"
+#: src/split.c:436
+msgid "in your configuration."
+msgstr "in your configuration."
 
-#: src/split.c:467
-msgid "Erreur de choix de fichier"
+#: src/split.c:492
+msgid "Error file select"
 msgstr "Error file select"
 
-#: src/split.c:468
-msgid "Veuillez selectionner un fichier de type WAV FLAC MP3 OGG APE"
+#: src/split.c:493
+msgid "Please select a file type of MP3 WAV OGG FLAC APE"
 msgstr "Please select a file type of MP3 WAV OGG FLAC APE"
 
-#: src/split.c:504 src/split.c:577
-msgid "Mauvais type de fichier"
+#: src/split.c:531 src/split.c:603
+msgid "Wrong type of file"
 msgstr "Wrong type of file"
 
-#: src/split.c:505 src/split.c:578
+#: src/split.c:532 src/split.c:604
 msgid ""
-"Les types de fichiers acceptes\n"
-"sont: WAV FLAC MP3 OGG APE WMA CUE"
+"File types accepted\n"
+"sare: WAV FLAC MP3 OGG APE WMA CUE"
 msgstr ""
 "File types accepted\n"
-"are: WAV FLAC MP3 OGG APE WMA CUE"
+"sare: WAV FLAC MP3 OGG APE WMA CUE"
 
-#: src/split_conv.c:312 src/split_conv.c:328
-msgid "Erreur SOX"
+#: src/split_conv.c:316 src/split_conv.c:333
+msgid "SOX Error"
 msgstr "SOX Error"
 
-#: src/split_conv.c:313 src/split_conv.c:329
-msgid "Le programme SOX de votre distribution"
+#: src/split_conv.c:317 src/split_conv.c:334
+msgid "The SOX program on your distribution"
 msgstr "The SOX program on your distribution"
 
-#: src/split_conv.c:315 src/split_conv.c:331
-msgid "a generer une erreur pendant la conversion."
-msgstr "has generated an error during conversion"
+#: src/split_conv.c:319 src/split_conv.c:336
+msgid "has generated an error during conversion."
+msgstr "has generated an error during conversion."
 
-#: src/split_cue.c:121
-msgid "Erreur de lecture !"
+#: src/split_cue.c:116
+msgid "Misreading !"
 msgstr "Misreading !"
 
-#: src/split_cue.c:181 src/split_cue.c:190 src/split_cue.c:199
-msgid "Erreur"
+#: src/split_cue.c:177 src/split_cue.c:187 src/split_cue.c:196
+msgid "Error"
 msgstr "Error"
 
-#: src/split_cue.c:182
-msgid "Aucun fichier de musique associe au cue-file !"
+#: src/split_cue.c:178
+msgid "No music file associated with the cue-file"
 msgstr "No music file associated with the cue-file"
 
-#: src/split_cue.c:191
-msgid "Pas de fichier WAV dans le cue-file !"
+#: src/split_cue.c:188
+msgid "No WAV file in the cue-file"
 msgstr "No WAV file in the cue-file"
 
-#: src/split_cue.c:200
-msgid "Aucun fichier de musique associe dans le dossier"
+#: src/split_cue.c:197
+msgid "No music file in the folder associated"
 msgstr "No music file in the folder associated"
 
-#: src/split_cue.c:202
-msgid "du cue-file"
+#: src/split_cue.c:199
+msgid "of cue-file"
 msgstr "of cue-file"
 
-#: src/split_cue.c:288
-msgid "Erreur de donnees dans le fichier CUE"
+#: src/split_cue.c:293
+msgid "Data errors in the CUE file"
 msgstr "Data errors in the CUE file"
 
-#: src/split_cue.c:289
-msgid "La solution est d'importer le fichier de"
+#: src/split_cue.c:294
+msgid "The solution is to import the file"
 msgstr "The solution is to import the file"
 
-#: src/split_cue.c:291
-msgid "musique qui sera reconnu et pre-decoupe"
+#: src/split_cue.c:296
+msgid "music that will be recognized and pre-cutting"
 msgstr "music that will be recognized and pre-cutting"
 
-#: src/split_cue.c:293
-msgid "dans le module Split."
-msgstr "Split in the module."
+#: src/split_cue.c:298
+msgid "in the split module."
+msgstr "in the split module."
 
-#: src/split_cue.c:295
-msgid "Il ne restera qu'a ajuster les plages pour"
+#: src/split_cue.c:300
+msgid "We will just adjust to the beaches"
 msgstr "We will just adjust to the beaches"
 
-#: src/split_cue.c:297
-msgid "generer un nouveau cue-file ou des decoupes"
+#: src/split_cue.c:302
+msgid "generate a new cue-file or cuts"
 msgstr "generate a new cue-file or cuts"
 
-#: src/split_cue.c:299
-msgid "correspondant aux plages."
+#: src/split_cue.c:304
+msgid "corresponding to the beaches."
 msgstr "corresponding to the beaches."
 
-#: src/split_selector.c:141
-msgid "Suppression pendant la lecture impossible"
+#: src/split_selector.c:136
+msgid "Deleting not during playback"
 msgstr "Deleting not during playback"
 
-#: src/split_selector.c:234 src/split_selector.c:240 src/split_selector.c:294
-#: src/split_selector.c:300 src/split_selector.c:357 src/split_selector.c:364
-#: src/split_selector.c:434 src/split_selector.c:440
-msgid "Temps inferieur a 5 secondes entre marqueur et curseur !"
+#: src/split_selector.c:231 src/split_selector.c:237 src/split_selector.c:291
+#: src/split_selector.c:297 src/split_selector.c:354 src/split_selector.c:361
+#: src/split_selector.c:431 src/split_selector.c:437
+msgid "Time of less than 5 seconds between marker and cursor !"
 msgstr "Time of less than 5 seconds between marker and cursor !"
 
-#: src/translate.c:55
-msgid "Fichier"
+#: src/web.c:173 src/web.c:221
+msgid "No web browser"
+msgstr "No web browser"
+
+#: src/web.c:174 src/web.c:222
+msgid "No Web access: no web browser"
+msgstr "No Web access: no web browser"
+
+#: src/web.c:176 src/web.c:224
+msgid "found in your system."
+msgstr "found in your system."
+
+#: src/web.c:178 src/web.c:226
+msgid "Please install a web browser."
+msgstr "Please install a web browser."
+
+#: src/web.c:188
+msgid "You need to enable web access"
+msgstr "You need to enable web access"
+
+#: src/web.c:236
+msgid "Application is missing."
+msgstr "Application is missing."
+
+#: src/web.c:237
+msgid "Please install : "
+msgstr "Please install : "
+
+#: src/win_about.c:124
+msgid " Xcfa on the web"
+msgstr " Xcfa on the web"
+
+#: src/win_about.c:174
+msgid ""
+"\n"
+"Au tout debut:\n"
+"\n"
+"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
+"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
+"... ;-)\n"
+"\n"
+""
+msgstr ""
+"\n"
+"Au tout debut:\n"
+"\n"
+"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
+"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
+"... ;-)\n"
+"\n"
+""
+
+#: src/win_scan.c:170
+msgid "Waiting ..."
+msgstr "Waiting ..."
+
+#: glade/xcfa.glade:66 glade/xcfa.glade:2533
+msgid "File"
 msgstr "File"
 
-#: src/translate.c:56
-msgid "Quitter"
+#: glade/xcfa.glade:75
+msgid "Quit"
 msgstr "Quit"
 
-#: src/translate.c:57
-msgid "Outils"
+#: glade/xcfa.glade:89
+msgid "Tools"
 msgstr "Tools"
 
-#: src/translate.c:58
-msgid "Visibilite des champs"
-msgstr "Visible fields"
+#: glade/xcfa.glade:99
+msgid "Visibility fields"
+msgstr "Visibility fields"
 
-#: src/translate.c:59
-msgid "Aide"
+#: glade/xcfa.glade:112
+msgid "Help"
 msgstr "Help"
 
-#: src/translate.c:60
-msgid "A propos"
+#: glade/xcfa.glade:121
+msgid "About"
 msgstr "About"
 
-#: src/translate.c:61 src/translate.c:71
-msgid "Lecture"
-msgstr "Play"
+#: glade/xcfa.glade:224
+msgid "Read"
+msgstr "Read"
 
-#: src/translate.c:62
-msgid " Choix du peripherique / Lecture du DVD "
-msgstr " DVD player / Import files "
+#: glade/xcfa.glade:252
+msgid " Choosing the peripheral / DVD playback "
+msgstr " Choosing the peripheral / DVD playback "
 
-#: src/translate.c:63 src/translate.c:73 src/translate.c:134
-msgid " Destination des fichiers "
-msgstr " Save location: "
+#: glade/xcfa.glade:303 glade/xcfa.glade:921
+msgid " File Destination "
+msgstr " File Destination "
 
-#: src/translate.c:64 src/translate.c:74
+#: glade/xcfa.glade:359 glade/xcfa.glade:1009
 msgid " Eject "
 msgstr " Eject "
 
-#: src/translate.c:65 src/translate.c:96
-msgid " Normaliser "
-msgstr " Normalise "
+#: glade/xcfa.glade:434
+msgid " Normalize "
+msgstr " Normalize "
 
-#: src/translate.c:66
-msgid "Deplier"
+#: glade/xcfa.glade:494
+msgid "Unfold"
 msgstr "Unfold"
 
-#: src/translate.c:67
-msgid "Replier"
+#: glade/xcfa.glade:548
+msgid "Fold"
 msgstr "Fold"
 
-#: src/translate.c:68
+#: glade/xcfa.glade:649
 msgid " Vers 2CH: Sub / Ambiance "
-msgstr " 2CH: Sub / Ambiance "
+msgstr " Vers 2CH: Sub / Ambiance "
 
-#: src/translate.c:69 src/translate.c:102
-msgid "Extraire"
-msgstr "Rip"
+#: glade/xcfa.glade:705
+msgid "Extraction"
+msgstr "Extraction"
 
-#: src/translate.c:70
+#: glade/xcfa.glade:756
 msgid " DVD "
 msgstr " DVD "
 
-#: src/translate.c:72
-msgid " Choix du peripherique / Lecture du CD "
-msgstr " CD player "
+#: glade/xcfa.glade:842
+msgid "Lecture"
+msgstr "Lecture"
+
+#: glade/xcfa.glade:870
+msgid " Choosing the peripheral / CD playback "
+msgstr " Choosing the peripheral / CD playback "
 
-#: src/translate.c:75
-msgid "Titre:"
+#: glade/xcfa.glade:1065
+msgid "Title:"
 msgstr "Title:"
 
-#: src/translate.c:76
+#: glade/xcfa.glade:1077
 msgid "Album:"
 msgstr "Album:"
 
-#: src/translate.c:77
-msgid "Artiste:"
+#: glade/xcfa.glade:1089
+msgid "Artist:"
 msgstr "Artist:"
 
-#: src/translate.c:78
-msgid " Annee:"
-msgstr "Year :"
+#: glade/xcfa.glade:1101
+msgid "Comment:"
+msgstr "Comment:"
+
+#: glade/xcfa.glade:1113
+msgid " Year:"
+msgstr " Year:"
 
-#: src/translate.c:79
+#: glade/xcfa.glade:1125
 msgid " Genre:"
-msgstr "Genre :"
+msgstr " Genre:"
 
-#: src/translate.c:80
-msgid " Piste:"
-msgstr "Track:"
+#: glade/xcfa.glade:1137
+msgid " Track:"
+msgstr " Track:"
 
-#: src/translate.c:81
+#: glade/xcfa.glade:1149
 msgid " *.m3u et xspf: "
-msgstr "m3u and xspf: "
+msgstr " *.m3u et xspf: "
 
-#: src/translate.c:82
-msgid "Commentaire:"
-msgstr "Comment:"
-
-#: src/translate.c:83
-msgid " Modification des tags Freedb "
-msgstr " Freedb tags modification "
+#: glade/xcfa.glade:1287
+msgid "Editing tags Freedb"
+msgstr "Editing tags Freedb"
 
-#: src/translate.c:84
+#: glade/xcfa.glade:1302
 msgid ""
 "%a [ %a=\"Artist\" ]\n"
 "\n"
@@ -1583,14 +1495,15 @@
 "\n"
 "%b [ %b=\"Album\" ]\n"
 "\n"
-"TI% - Tetsumaki lower\n"
+"%Tl - Tetsumaki lower\n"
 "\n"
-"Converts the string to lowercase except for the first character\n"
+"Transforme la chaine en minuscule sauf le premier caractere.\n"
 "\n"
-"In the fields 'Title' since [Changing FreeDB tag]\n"
-"the character or characters to be retained must be preceded bycharacter %"
+"Dans le champs 'Titre' depuis [ Modification des tags FreeDB ],\n"
+"le ou les caracteres devant etre conserves doivent etre precedes par le "
+"caractere %"
 
-#: src/translate.c:85
+#: glade/xcfa.glade:1312
 msgid ""
 "%a - artiste %b - titre "
 "de l'album %c - numero de la piste\n"
@@ -1601,1056 +1514,945 @@
 "%u - remplacement de caracteres: %u(AB=C) %u( =_) %Tl</"
 "b> - Tetsumaki lower"
 msgstr ""
-"%a - artist %b - album "
-"title %c - track number\n"
-"%d - track title %e - "
-"year %g - genre\n"
-"%f - create an m3u and xspf file %na</"
-"b> - no accent\n"
-"%u - replace special characters: %u(AB=C) %u( =_) %Tl</"
-"b> - Tetsumaki lower"
+"%a - artiste %b - titre "
+"de l'album %c - numero de la piste\n"
+"%d - titre de la chanson %e - "
+"annee %g - genre\n"
+"%f - creation d'un fichier *.m3u et *."
+"xspf %na - no accent\n"
+"%u - remplacement de caracteres: %u(AB=C) %u( =_) %Tl</"
+"b> - Tetsumaki lower"
 
-#: src/translate.c:86
-msgid " Arrangement des titres du CD "
-msgstr " Arrangement of CD titles "
+#: glade/xcfa.glade:1346
+msgid " Arrangement of CD titles"
+msgstr " Arrangement of CD titles"
 
-#: src/translate.c:87
-msgid "Creation d'un fichier unique au format: "
-msgstr "Create a single file in the format: "
+#: glade/xcfa.glade:1382
+msgid "Creation of a single file format: "
+msgstr "Creation of a single file format: "
 
-#: src/translate.c:88
-msgid " et dont le nom sera: "
-msgstr " Named: "
+#: glade/xcfa.glade:1430
+msgid " and whose name will be: "
+msgstr " and whose name will be: "
 
-#: src/translate.c:89
-msgid "Ecriture du fichier cue"
-msgstr "Write cue file"
+#: glade/xcfa.glade:1461
+msgid "Writing the cue file"
+msgstr "Writing the cue file"
 
-#: src/translate.c:90
-msgid " Au moins deux selections colonne Wav "
-msgstr " Make at least two selections in the Wav column "
+#: glade/xcfa.glade:1484
+msgid " At least two selections column Wav "
+msgstr " At least two selections column Wav "
 
-#: src/translate.c:91
+#: glade/xcfa.glade:1514
 msgid ""
-"Creation d'un fichier cue\n"
-"unique depuis une lecture\n"
-"du cd audio"
+"\n"
+"Creating a cue file from a single\n"
+"reading audio cd\n"
 msgstr ""
-"Create a single cue\n"
-"file from an audio-CD"
+"\n"
+"Creating a cue file from a single\n"
+"reading audio cd\n"
 
-#: src/translate.c:92
-msgid "Creation fichier cue uniquement"
-msgstr "Create cue file"
+#: glade/xcfa.glade:1562
+msgid "File Creation cue only"
+msgstr "File Creation cue only"
 
-#: src/translate.c:93
+#: glade/xcfa.glade:1597
 msgid " Creation Cue cd "
-msgstr " CD cue file creation "
+msgstr " Creation Cue cd "
+
+#: glade/xcfa.glade:1625
+msgid "  Creation of a single file"
+msgstr "  Creation of a single file"
 
-#: src/translate.c:94
-msgid " Creation d'un fichier unique "
-msgstr " Creating a single file "
+#: glade/xcfa.glade:1638
+msgid "Management of tags, titles and cue files"
+msgstr "Management of tags, titles and cue files"
 
-#: src/translate.c:95
-msgid "Gestion des tags, titres et fichiers cue"
-msgstr "Tags, titles and cue files management"
+#: glade/xcfa.glade:1688
+msgid " normalize "
+msgstr " normalize "
 
-#: src/translate.c:97
+#: glade/xcfa.glade:1749
 msgid "definit le serveur a contacter pour les recherches titre"
-msgstr "Sets the server to be contacted for title lookups"
+msgstr "definit le serveur a contacter pour les recherches titre"
 
-#: src/translate.c:98
+#: glade/xcfa.glade:1788
 msgid "Parametres par defaut"
-msgstr "Default parameters"
+msgstr "Parametres par defaut"
 
-#: src/translate.c:100
-msgid "Choix parmis les differentes bases de donnees pour le CD."
-msgstr "Choice among different databases for the CD."
-
-#: src/translate.c:101
+#: glade/xcfa.glade:1887
 msgid "DiscId"
 msgstr "DiscId"
 
-#: src/translate.c:103
+#: glade/xcfa.glade:1946
+msgid "Extract"
+msgstr "Extract"
+
+#: glade/xcfa.glade:2053
 msgid " CD "
 msgstr " CD "
 
-#: src/translate.c:104 src/translate.c:133
-msgid " Importer "
+#: glade/xcfa.glade:2135 glade/xcfa.glade:3271
+msgid " Import "
 msgstr " Import "
 
-#: src/translate.c:105
-msgid " Destination des conversions "
-msgstr " Export converted files: "
+#: glade/xcfa.glade:2190
+msgid " Destination conversions "
+msgstr " Destination conversions "
 
-#: src/translate.c:106
-msgid " Nettoyer "
-msgstr " Clear "
+#: glade/xcfa.glade:2266
+msgid " Clean up "
+msgstr " Clean up "
 
-#: src/translate.c:107 src/translate.c:114
+#: glade/xcfa.glade:2389
 msgid "Appliquer les modifications"
-msgstr "Apply the changes"
-
-#: src/translate.c:108
-msgid " Normalise: "
-msgstr " Normalise: "
-
-#: src/translate.c:109
-msgid " Choix niveau dBFS: "
-msgstr " dBFS level: "
-
-#: src/translate.c:110 src/translate.c:132
-msgid " Fichiers "
-msgstr " Files "
+msgstr "Appliquer les modifications"
 
-#: src/translate.c:111
-msgid "Quantification"
-msgstr "Quantification"
+#: glade/xcfa.glade:2444
+msgid " Normalize: "
+msgstr " Normalize: "
 
-#: src/translate.c:112
-msgid "Voie"
-msgstr "Channel"
+#: glade/xcfa.glade:2477
+msgid " Level selection dBFS: "
+msgstr " Level selection dBFS: "
 
-#: src/translate.c:113
-msgid " Frequence - Hertz "
-msgstr " Frequency -Hertz "
+#: glade/xcfa.glade:2615
+msgid "Apply changes"
+msgstr "Apply changes"
 
-#: src/translate.c:115
+#: glade/xcfa.glade:2651
 msgid " Wav "
 msgstr " Wav "
 
-#: src/translate.c:116 src/translate.c:202
-msgid " Lame (fichier mp3): "
-msgstr " Lame (mp3 file): "
-
-#: src/translate.c:117 src/translate.c:218
-msgid " Oggenc (fichier ogg): "
-msgstr " Oggenc (ogg file): "
-
-#: src/translate.c:118 src/translate.c:130
-msgid "Appliquer"
+#: glade/xcfa.glade:2735
+msgid "Apply"
 msgstr "Apply"
 
-#: src/translate.c:119
-msgid "Effacer"
-msgstr "Clear"
+#: glade/xcfa.glade:2789
+msgid "Delete"
+msgstr "Delete"
 
-#: src/translate.c:120
+#: glade/xcfa.glade:2826
 msgid " Mp3-Ogg "
 msgstr " Mp3-Ogg "
 
-#: src/translate.c:121
-msgid "Titre:"
+#: glade/xcfa.glade:2875
+msgid "Title:"
 msgstr "Title:"
 
-#: src/translate.c:122
+#: glade/xcfa.glade:2886
 msgid "Album:"
 msgstr "Album:"
 
-#: src/translate.c:123
-msgid "Artiste:"
+#: glade/xcfa.glade:2897
+msgid "Artist:"
 msgstr "Artist:"
 
-#: src/translate.c:124
-msgid "Commentaire:"
+#: glade/xcfa.glade:2908
+msgid "Comment:"
 msgstr "Comment:"
 
-#: src/translate.c:125
-msgid " Annee:"
+#: glade/xcfa.glade:2919
+msgid " Year:"
 msgstr " Year:"
 
-#: src/translate.c:126
+#: glade/xcfa.glade:2930
 msgid " Genre:"
 msgstr " Genre:"
 
-#: src/translate.c:127
-msgid " Piste:"
+#: glade/xcfa.glade:2941
+msgid " Track:"
 msgstr " Track:"
 
-#: src/translate.c:128
+#: glade/xcfa.glade:2952
 msgid " Modif.:"
-msgstr " Edit:"
+msgstr " Modif.:"
 
-#: src/translate.c:129
+#: glade/xcfa.glade:3078
 msgid "0"
 msgstr "0"
 
-#: src/translate.c:131 src/translate.c:315
+#: glade/xcfa.glade:3102
+msgid "Apply "
+msgstr "Apply "
+
+#: glade/xcfa.glade:3160 glade/xcfa.glade:10210
 msgid " Tags "
 msgstr " Tags "
 
-#: src/translate.c:135
+#: glade/xcfa.glade:3190
+msgid " Files "
+msgstr " Files "
+
+#: glade/xcfa.glade:3322
+msgid "   File Destination "
+msgstr "   File Destination "
+
+#: glade/xcfa.glade:3494
 msgid "Lecture de 5 secondes apres le marqueur de debut"
-msgstr "Reading 5 seconds after the beginning marker"
+msgstr "Lecture de 5 secondes apres le marqueur de debut"
 
-#: src/translate.c:136
+#: glade/xcfa.glade:3546
 msgid "Index de debut"
-msgstr "Index start"
+msgstr "Index de debut"
 
-#: src/translate.c:137 src/translate.c:144 src/translate.c:147
+#: glade/xcfa.glade:3547 glade/xcfa.glade:3813 glade/xcfa.glade:3874
 msgid "00h00m00s"
 msgstr "00h00m00s"
 
-#: src/translate.c:138
+#: glade/xcfa.glade:3600
 msgid "lecture"
-msgstr "Play"
+msgstr "lecture"
 
-#: src/translate.c:139
+#: glade/xcfa.glade:3653
 msgid "Pause"
 msgstr "Pause"
 
-#: src/translate.c:140
+#: glade/xcfa.glade:3712
 msgid "Index de lecture"
-msgstr "Index reading"
+msgstr "Index de lecture"
 
-#: src/translate.c:141 src/translate.c:180
+#: glade/xcfa.glade:3713 glade/xcfa.glade:4767
 msgid "label"
 msgstr "label"
 
-#: src/translate.c:142
+#: glade/xcfa.glade:3760
 msgid "Lecture de 5 secondes avant le marqueur de fin"
-msgstr "Reading of 5 seconds before the end marker"
+msgstr "Lecture de 5 secondes avant le marqueur de fin"
 
-#: src/translate.c:143
+#: glade/xcfa.glade:3812
 msgid "Index de fin"
-msgstr "End index"
+msgstr "Index de fin"
 
-#: src/translate.c:145
+#: glade/xcfa.glade:3860
 msgid "Plage"
 msgstr "Plage"
 
-#: src/translate.c:146
+#: glade/xcfa.glade:3873
 msgid "Duree de la plage active"
-msgstr "Length of the active beach"
+msgstr "Duree de la plage active"
 
-#: src/translate.c:148
+#: glade/xcfa.glade:3955
 msgid "Suprimer tous les marqueurs pour les remplacer par un marqueur unique"
-msgstr "Wipe all markers and replace them with a single marker"
+msgstr "Suprimer tous les marqueurs pour les remplacer par un marqueur unique"
 
-#: src/translate.c:149
+#: glade/xcfa.glade:4044
 msgid "Le fichier CUE sera enregistre vers 'Destination des fichiers'."
-msgstr "CUE file to be recorded 'Destination file'."
+msgstr "Le fichier CUE sera enregistre vers 'Destination des fichiers'."
 
-#: src/translate.c:150
-msgid "Production fichier Cue"
-msgstr "Generate CUE file"
+#: glade/xcfa.glade:4073
+msgid "Production Cue file"
+msgstr "Production Cue file"
 
-#: src/translate.c:151
+#: glade/xcfa.glade:4098
 msgid "Le resultat du Split sera dirige vers 'Destination des fichiers'."
-msgstr "The result of the Split will be heading for 'Destination file'."
+msgstr "Le resultat du Split sera dirige vers 'Destination des fichiers'."
 
-#: src/translate.c:152
+#: glade/xcfa.glade:4127
 msgid "Split"
 msgstr "Split"
 
-#: src/translate.c:153
+#: glade/xcfa.glade:4188
 msgid " Split "
 msgstr " Split "
 
-#: src/translate.c:154
+#: glade/xcfa.glade:4253
 msgid "Importation du titre du CD."
-msgstr "Import the CD title."
+msgstr "Importation du titre du CD."
 
-#: src/translate.c:155
-msgid "Titre CD"
+#: glade/xcfa.glade:4276
+msgid "Title CD"
 msgstr "Title CD"
 
-#: src/translate.c:156
+#: glade/xcfa.glade:4296
 msgid "Choix d'une nouvelle police."
-msgstr "Choosing a new font."
+msgstr "Choix d'une nouvelle police."
 
-#: src/translate.c:157
+#: glade/xcfa.glade:4318
 msgid "Texte gras."
-msgstr "Bold text."
+msgstr "Texte gras."
 
-#: src/translate.c:158
+#: glade/xcfa.glade:4340
 msgid "Texte italique."
-msgstr "Italic text."
+msgstr "Texte italique."
 
-#: src/translate.c:159
-msgid ""
-"Apres une lecture de CD et un ajout d'etiquette, ce menu permet la mise en "
-"forme des titres, auteurs ..."
-msgstr ""
-"After reading a CD and add a label, this menu allows the formatting of "
-"titles, authors ..."
-
-#: src/translate.c:160
+#: glade/xcfa.glade:4375
 msgid "Ajouter du texte editable."
-msgstr "Add text editable."
+msgstr "Ajouter du texte editable."
 
-#: src/translate.c:161
-msgid "Texte"
+#: glade/xcfa.glade:4430
+msgid "Text"
 msgstr "Text"
 
-#: src/translate.c:162
+#: glade/xcfa.glade:4462
 msgid "Saisissez ici un critere de recherche d'images."
-msgstr "Enter here a search of images."
+msgstr "Saisissez ici un critere de recherche d'images."
 
-#: src/translate.c:163
+#: glade/xcfa.glade:4484
 msgid "Importation des images depuis le Web."
-msgstr "Importing images from the Web."
+msgstr "Importation des images depuis le Web."
 
-#: src/translate.c:164
-msgid "Import images web"
-msgstr "Import web images"
+#: glade/xcfa.glade:4509
+msgid "Import web images "
+msgstr "Import web images "
 
-#: src/translate.c:165
+#: glade/xcfa.glade:4578
 msgid "Supprimer l'image en selection"
-msgstr "Delete the image selection"
+msgstr "Supprimer l'image en selection"
 
-#: src/translate.c:166
+#: glade/xcfa.glade:4600
 msgid "AJouter de nouvelles images."
-msgstr "Add new images."
+msgstr "AJouter de nouvelles images."
 
-#: src/translate.c:167
+#: glade/xcfa.glade:4606
 msgid "Ouvre un fichier"
-msgstr "Open a file"
+msgstr "Ouvre un fichier"
 
-#: src/translate.c:168
+#: glade/xcfa.glade:4623
 msgid "Enregistrer la page au format png."
-msgstr "Save Page png."
+msgstr "Enregistrer la page au format png."
 
-#: src/translate.c:169
+#: glade/xcfa.glade:4629
 msgid "Sauvegarde le fichier"
-msgstr "Saving the file"
+msgstr "Sauvegarde le fichier"
 
-#: src/translate.c:170
+#: glade/xcfa.glade:4646
 msgid "Diminution de l'echelle."
-msgstr "Reduction in the scale."
+msgstr "Diminution de l'echelle."
 
-#: src/translate.c:171
+#: glade/xcfa.glade:4652
 msgid "Reduit l'agrandissement"
-msgstr "Reduced expansion"
+msgstr "Reduit l'agrandissement"
 
-#: src/translate.c:172
+#: glade/xcfa.glade:4669
 msgid "Echelle a 100%."
-msgstr "Scale 100%."
+msgstr "Echelle a 100%."
 
-#: src/translate.c:173
+#: glade/xcfa.glade:4675
 msgid "Remet l'echelle a 100%"
-msgstr "Gives the scale at 100%"
+msgstr "Remet l'echelle a 100%"
 
-#: src/translate.c:174
+#: glade/xcfa.glade:4692
 msgid "Augmentation de l'echelle."
-msgstr "Increase in scale."
+msgstr "Augmentation de l'echelle."
 
-#: src/translate.c:175
+#: glade/xcfa.glade:4698
 msgid "Augmente l'agrandissement"
-msgstr "Increasing expansion"
+msgstr "Augmente l'agrandissement"
 
-#: src/translate.c:176
+#: glade/xcfa.glade:4715
 msgid "Echelle compatible avec la taille de la fenetre."
-msgstr "Scale compatible with the size of the window."
+msgstr "Echelle compatible avec la taille de la fenetre."
 
-#: src/translate.c:177
+#: glade/xcfa.glade:4721
 msgid "Adapte l'echelle a la taille de la fenetre"
-msgstr "Adjusts the scale to the size of the window"
+msgstr "Adapte l'echelle a la taille de la fenetre"
 
-#: src/translate.c:178
+#: glade/xcfa.glade:4738
 msgid "Emplacement de sauvegarde des fichiers."
-msgstr "Backup location files."
+msgstr "Emplacement de sauvegarde des fichiers."
 
-#: src/translate.c:179
+#: glade/xcfa.glade:4752
 msgid "Nom (sans extention) du fichier a sauvegarder."
-msgstr "Name (without extension) file is saved."
+msgstr "Nom (sans extention) du fichier a sauvegarder."
 
-#: src/translate.c:181
+#: glade/xcfa.glade:4815
 msgid " Pochette "
-msgstr " CD Cover "
+msgstr " Pochette "
 
-#: src/translate.c:182
+#: glade/xcfa.glade:4861
 msgid "Nice"
 msgstr "Nice"
 
-#: src/translate.c:183
-msgid " Priorite systeme "
-msgstr " System priority "
+#: glade/xcfa.glade:4896
+msgid " Priority system "
+msgstr " Priority system "
 
-#: src/translate.c:184
+#: glade/xcfa.glade:4935
 msgid ""
-"Indiquez ici le dossier sur votre systeme qui servira de lieu\n"
-"de stockage provisoire pendant les differentes conversions.\n"
-msgstr "Enter the location of the temporary folder to be used by XCFA\n"
+"\n"
+"Enter here the folder on your system that will serve as\n"
+"temporary storage for the different conversions.\n"
+msgstr ""
+"\n"
+"Enter here the folder on your system that will serve as\n"
+"temporary storage for the different conversions.\n"
 
-#: src/translate.c:185
-msgid " Dossier provisoire des conversions "
-msgstr " Conversions temporary folder "
+#: glade/xcfa.glade:4971
+msgid " Provisional file conversions "
+msgstr " Provisional file conversions "
 
-#: src/translate.c:186
+#: glade/xcfa.glade:5017
 msgid "button"
 msgstr "button"
 
-#: src/translate.c:187
-msgid " Jouer une musique en fin de tache "
-msgstr " Play music at the end of task "
+#: glade/xcfa.glade:5038
+msgid " Playing a job end music "
+msgstr " Playing a job end music "
 
-#: src/translate.c:188
+#: glade/xcfa.glade:5058
 msgid " General "
 msgstr " General "
 
-#: src/translate.c:189
+#: glade/xcfa.glade:5100
 msgid "cdparanoia"
 msgstr "cdparanoia"
 
-#: src/translate.c:190
+#: glade/xcfa.glade:5120
+msgid "cdparanoia mode expert"
+msgstr "cdparanoia mode expert"
+
+#: glade/xcfa.glade:5140
+msgid "cdparanoia mode expert multi passes"
+msgstr "cdparanoia mode expert multi passes"
+
+#: glade/xcfa.glade:5168
 msgid "cdda2wav / icedax"
 msgstr "cdda2wav / icedax"
 
-#: src/translate.c:191
-msgid "cdparanoia mode expert"
-msgstr "cdparanoia expert mode"
-
-#: src/translate.c:192
+#: glade/xcfa.glade:5194
 msgid " Extraction cd-audio avec: "
-msgstr " Rip audio-CD with: "
+msgstr " Extraction cd-audio avec: "
 
-#: src/translate.c:193
+#: glade/xcfa.glade:5268
 msgid "HomePage"
-msgstr "Home Page"
+msgstr "HomePage"
 
-#: src/translate.c:194
+#: glade/xcfa.glade:5323
 msgid "ManPage "
-msgstr "Man Page "
+msgstr "ManPage "
 
-#: src/translate.c:195
+#: glade/xcfa.glade:5352
 msgid " Web cdparanoia "
 msgstr " Web cdparanoia "
 
-#: src/translate.c:196
+#: glade/xcfa.glade:5414
 msgid ""
-"%a - artiste %b - titre "
+"Le fichier LogExpertMode.txt sera cree dans le dossier des "
+"extractions"
+msgstr ""
+"Le fichier LogExpertMode.txt sera cree dans le dossier des "
+"extractions"
+
+#: glade/xcfa.glade:5431
+msgid "Generation of a report for: cdparanoia mode expert multi passes"
+msgstr "Generation of a report for: cdparanoia mode expert multi passes"
+
+#: glade/xcfa.glade:5467
+msgid ""
+"%a - artist %b - titre "
 "de l'album %c - numero de la piste\n"
 "%d - titre de la chanson %e - "
-"annee %g - genre\n"
+"year %g - genre\n"
 "%na - no accent %Tl "
 "- Tetsumaki lower\n"
-"%u - remplacement de caracteres: %u(AB=C) %u( =_)"
+"%u - replacement characters: %u(AB=C) %u( =_)"
 msgstr ""
-"%a - artist %b - album "
-"title %c - track number\n"
-"%d - track title %e - "
+"%a - artist %b - titre "
+"de l'album %c - numero de la piste\n"
+"%d - titre de la chanson %e - "
 "year %g - genre\n"
 "%na - no accent %Tl "
 "- Tetsumaki lower\n"
-"%u - replacing characters: %u(AB=C) %u( =_)"
+"%u - replacement characters: %u(AB=C) %u( =_)"
 
-#: src/translate.c:197
+#: glade/xcfa.glade:5536
 msgid " Dossier de stockage "
-msgstr " File storage "
+msgstr " Dossier de stockage "
 
-#: src/translate.c:198
+#: glade/xcfa.glade:5567
 msgid " CD "
 msgstr " CD "
 
-#: src/translate.c:199
+#: glade/xcfa.glade:5615
 msgid "ABR / CBR / VBR / VBR-NEW"
 msgstr "ABR / CBR / VBR / VBR-NEW"
 
-#: src/translate.c:200
+#: glade/xcfa.glade:5660 glade/xcfa.glade:6295
 msgid "Debit"
-msgstr "Bitrate"
+msgstr "Debit"
 
-#: src/translate.c:201
+#: glade/xcfa.glade:5705 glade/xcfa.glade:6317
 msgid "Mode"
 msgstr "Mode"
 
-#: src/translate.c:203 src/translate.c:219 src/translate.c:231
-#: src/translate.c:244 src/translate.c:261 src/translate.c:272
-#: src/translate.c:286 src/translate.c:300
+#: glade/xcfa.glade:5747
+msgid " Lame (fichier mp3): "
+msgstr " Lame (fichier mp3): "
+
+#: glade/xcfa.glade:5827 glade/xcfa.glade:6466 glade/xcfa.glade:6941
+#: glade/xcfa.glade:7469 glade/xcfa.glade:8200 glade/xcfa.glade:8659
+#: glade/xcfa.glade:9192 glade/xcfa.glade:9753
 msgid "Par defaut"
-msgstr "Default"
+msgstr "Par defaut"
 
-#: src/translate.c:204
+#: glade/xcfa.glade:5848
 msgid " Options LAME "
-msgstr " LAME Options "
+msgstr " Options LAME "
 
-#: src/translate.c:205 src/translate.c:233 src/translate.c:274
+#: glade/xcfa.glade:5909 glade/xcfa.glade:7023 glade/xcfa.glade:8741
 msgid "Site officiel"
-msgstr "Official website"
+msgstr "Site officiel"
 
-#: src/translate.c:206
+#: glade/xcfa.glade:5964
 msgid "Wiki mp3 "
-msgstr "mp3 wiki "
+msgstr "Wiki mp3 "
 
-#: src/translate.c:207
+#: glade/xcfa.glade:6020
 msgid "Wiki "
-msgstr "Lame wiki "
+msgstr "Wiki "
 
-#: src/translate.c:208
+#: glade/xcfa.glade:6076
 msgid "ManPage "
-msgstr "Man Page "
+msgstr "ManPage "
 
-#: src/translate.c:209
+#: glade/xcfa.glade:6105
 msgid " Web Lame "
-msgstr " Lame "
+msgstr " Web Lame "
 
-#: src/translate.c:210 src/translate.c:224 src/translate.c:237
-#: src/translate.c:248 src/translate.c:266 src/translate.c:277
-#: src/translate.c:292
+#: glade/xcfa.glade:6181 glade/xcfa.glade:6709 glade/xcfa.glade:7238
+#: glade/xcfa.glade:7644 glade/xcfa.glade:8442 glade/xcfa.glade:8901
+#: glade/xcfa.glade:9491
 msgid "["
 msgstr "["
 
-#: src/translate.c:211 src/translate.c:225 src/translate.c:238
-#: src/translate.c:249 src/translate.c:267 src/translate.c:278
-#: src/translate.c:293
+#: glade/xcfa.glade:6194 glade/xcfa.glade:6722 glade/xcfa.glade:7251
+#: glade/xcfa.glade:7657 glade/xcfa.glade:8455 glade/xcfa.glade:8914
+#: glade/xcfa.glade:9504
 msgid "string option interne"
-msgstr "internal string option"
+msgstr "string option interne"
 
-#: src/translate.c:212 src/translate.c:226 src/translate.c:239
-#: src/translate.c:250 src/translate.c:268 src/translate.c:279
-#: src/translate.c:294
+#: glade/xcfa.glade:6209 glade/xcfa.glade:6737 glade/xcfa.glade:7266
+#: glade/xcfa.glade:7672 glade/xcfa.glade:8470 glade/xcfa.glade:8929
+#: glade/xcfa.glade:9519
 msgid "]"
 msgstr "]"
 
-#: src/translate.c:213
-msgid ""
-" Options experts, definies par l'utilisateur - lame (wav -> mp3) "
-msgstr " User-defined expert options - lame (wav -> mp3) "
+#: glade/xcfa.glade:6234
+msgid " Experts options defined by the user- lame (wav -> mp3) "
+msgstr " Experts options defined by the user- lame (wav -> mp3) "
 
-#: src/translate.c:214
+#: glade/xcfa.glade:6254
 msgid " Mp3 "
 msgstr " Mp3 "
 
-#: src/translate.c:215
-msgid " Mode"
-msgstr " Mode"
+#: glade/xcfa.glade:6306
+msgid "Mode flux (streaming)"
+msgstr "Mode flux (streaming)"
 
-#: src/translate.c:216
-msgid " Mode flux (streaming)"
-msgstr " Streaming"
-
-#: src/translate.c:217
-msgid " Debit"
-msgstr "Bitrate"
+#: glade/xcfa.glade:6386
+msgid " Oggenc (fichier ogg): "
+msgstr " Oggenc (fichier ogg): "
 
-#: src/translate.c:220
+#: glade/xcfa.glade:6487
 msgid " Options OGGENC "
-msgstr " OGGENC Options "
+msgstr " Options OGGENC "
 
-#: src/translate.c:221
+#: glade/xcfa.glade:6548
 msgid "Wiki "
 msgstr "Wiki "
 
-#: src/translate.c:222 src/translate.c:264 src/translate.c:290
-#: src/translate.c:304
+#: glade/xcfa.glade:6604 glade/xcfa.glade:8337 glade/xcfa.glade:9386
+#: glade/xcfa.glade:9947
 msgid "ManPage"
-msgstr "Man Page"
+msgstr "ManPage"
 
-#: src/translate.c:223
+#: glade/xcfa.glade:6633
 msgid " Web Oggenc "
-msgstr " Oggenc "
+msgstr " Web Oggenc "
 
-#: src/translate.c:227
-msgid ""
-" Options experts, definies par l'utilisateur - oggenc (wav -> ogg) "
-msgstr " User-defined expert options - oggenc (wav -> ogg) "
+#: glade/xcfa.glade:6762
+msgid " Experts options defined by the user - oggenc (wav -> ogg) "
+msgstr " Experts options defined by the user - oggenc (wav -> ogg) "
 
-#: src/translate.c:228
+#: glade/xcfa.glade:6782
 msgid " Oggenc "
 msgstr " Oggenc "
 
-#: src/translate.c:229
+#: glade/xcfa.glade:6824
 msgid "Taux de compression"
-msgstr "Compression level"
+msgstr "Taux de compression"
 
-#: src/translate.c:230
+#: glade/xcfa.glade:6861
 msgid " Flac (fichier flac): "
-msgstr " Flac (flac file): "
+msgstr " Flac (fichier flac): "
 
-#: src/translate.c:232
+#: glade/xcfa.glade:6962
 msgid " Options FLAC "
-msgstr " FLAC Options "
+msgstr " Options FLAC "
 
-#: src/translate.c:234 src/translate.c:275
+#: glade/xcfa.glade:7078 glade/xcfa.glade:8796
 msgid "Framasoft "
 msgstr "Framasoft "
 
-#: src/translate.c:235
+#: glade/xcfa.glade:7133
 msgid "ManPage "
-msgstr "Man Page "
+msgstr "ManPage "
 
-#: src/translate.c:236
+#: glade/xcfa.glade:7162
 msgid " Web Flac "
-msgstr " Flac "
+msgstr " Web Flac "
 
-#: src/translate.c:240
-msgid ""
-" Options experts, definies par l'utilisateur - flac (wav -> flac) "
-msgstr " User-defined expert options - flac (wav -> flac) "
+#: glade/xcfa.glade:7291
+msgid " Experts options defined by the user- flac (wav -> flac) "
+msgstr " Experts options defined by the user- flac (wav -> flac) "
 
-#: src/translate.c:241
+#: glade/xcfa.glade:7311
 msgid " Flac "
 msgstr " Flac "
 
-#: src/translate.c:242
+#: glade/xcfa.glade:7353
 msgid " Qualite"
-msgstr " Quality"
+msgstr " Qualite"
 
-#: src/translate.c:243
+#: glade/xcfa.glade:7389
 msgid " Mac (fichier ape): "
-msgstr " Mac (ape file): "
+msgstr " Mac (fichier ape): "
 
-#: src/translate.c:245
+#: glade/xcfa.glade:7490
 msgid " Options MAC "
-msgstr " MAC Options "
+msgstr " Options MAC "
 
-#: src/translate.c:246
+#: glade/xcfa.glade:7546
 msgid "Wiki"
 msgstr "Wiki"
 
-#: src/translate.c:247
+#: glade/xcfa.glade:7568
 msgid " Web Mac "
-msgstr " Mac "
+msgstr " Web Mac "
 
-#: src/translate.c:251
-msgid " Options experts, definies par l'utilisateur - mac (wav -> ape) "
-msgstr " User-defined expert options - mac (wav -> ape) "
+#: glade/xcfa.glade:7697
+msgid " Experts options defined by the user - mac (wav -> ape) "
+msgstr " Experts options defined by the user - mac (wav -> ape) "
 
-#: src/translate.c:252
+#: glade/xcfa.glade:7717
 msgid " Mac "
 msgstr " Mac "
 
-#: src/translate.c:253
+#: glade/xcfa.glade:7765
 msgid "Compression"
 msgstr "Compression"
 
-#: src/translate.c:254
+#: glade/xcfa.glade:7817
 msgid "Son"
-msgstr "Channel mode"
+msgstr "Son"
 
-#: src/translate.c:255
+#: glade/xcfa.glade:7869
 msgid "Mode hybride"
-msgstr "Hybrid mode"
+msgstr "Mode hybride"
 
-#: src/translate.c:256
+#: glade/xcfa.glade:7921
 msgid "Fichier de correction"
-msgstr "Correction file"
+msgstr "Fichier de correction"
 
-#: src/translate.c:257
+#: glade/xcfa.glade:7973
 msgid "Compression maximum"
-msgstr "Maximum compression"
+msgstr "Compression maximum"
 
-#: src/translate.c:258
+#: glade/xcfa.glade:8025
 msgid "Signature MD5"
-msgstr "MD5 signature"
+msgstr "Signature MD5"
 
-#: src/translate.c:259
+#: glade/xcfa.glade:8077
 msgid "Extra encode processing"
 msgstr "Extra encode processing"
 
-#: src/translate.c:260
+#: glade/xcfa.glade:8120
 msgid " WavPack (fichier wv): "
-msgstr " WavPack (wv file): "
+msgstr " WavPack (fichier wv): "
 
-#: src/translate.c:262
+#: glade/xcfa.glade:8221
 msgid " Options WAVPACK "
-msgstr " WAVPACK Options "
+msgstr " Options WAVPACK "
 
-#: src/translate.c:263
+#: glade/xcfa.glade:8282
 msgid "Wiki "
 msgstr "Wiki "
 
-#: src/translate.c:265
+#: glade/xcfa.glade:8366
 msgid " Web Wavpack "
-msgstr " Wavpack "
+msgstr " Web Wavpack "
 
-#: src/translate.c:269
-msgid ""
-" Options experts, definies par l'utilisateur - wavpack (wav -> wv) "
-msgstr " User-defined expert options - wavpack (wav -> wv) "
+#: glade/xcfa.glade:8495
+msgid " Experts options defined by the user - wavpack (wav -> wv) "
+msgstr " Experts options defined by the user - wavpack (wav -> wv) "
 
-#: src/translate.c:270
+#: glade/xcfa.glade:8515
 msgid " Wavpack "
 msgstr " Wavpack "
 
-#: src/translate.c:271
+#: glade/xcfa.glade:8579
 msgid " MusePack (fichier mpc): "
-msgstr " MusePack (mpc file): "
+msgstr " MusePack (fichier mpc): "
 
-#: src/translate.c:273
+#: glade/xcfa.glade:8680
 msgid " Options MUSEPACK "
-msgstr " MUSEPACK Options "
+msgstr " Options MUSEPACK "
 
-#: src/translate.c:276
+#: glade/xcfa.glade:8825
 msgid " Web Musepack "
-msgstr " Musepack "
+msgstr " Web Musepack "
 
-#: src/translate.c:280
-msgid ""
-" Options experts, definies par l'utilisateur - musepack (wav -> mpc) "
-msgstr " User-defined expert options - musepack (wav -> mpc) "
+#: glade/xcfa.glade:8954
+msgid " Experts options defined by the user- musepack (wav -> mpc) "
+msgstr " Experts options defined by the user- musepack (wav -> mpc) "
 
-#: src/translate.c:281
+#: glade/xcfa.glade:8974
 msgid " Musepack "
 msgstr " Musepack "
 
-#: src/translate.c:282
-msgid " Qualite VBR / Debit ABR"
-msgstr "VBR Quality / ABR rate"
+#: glade/xcfa.glade:9016
+msgid "Conteneur"
+msgstr "Conteneur"
 
-#: src/translate.c:283
-msgid " VBR / ABR"
-msgstr " VBR / ABR"
+#: glade/xcfa.glade:9027
+msgid "VBR / ABR"
+msgstr "VBR / ABR"
 
-#: src/translate.c:284
-msgid " Conteneur"
-msgstr " Container"
+#: glade/xcfa.glade:9038
+msgid "Qualite VBR / Debit ABR"
+msgstr "Qualite VBR / Debit ABR"
 
-#: src/translate.c:285
+#: glade/xcfa.glade:9112
 msgid " Faac (fichier .m4a): "
-msgstr " Faac (file .m4a): "
+msgstr " Faac (fichier .m4a): "
 
-#: src/translate.c:287
+#: glade/xcfa.glade:9213
 msgid " Options FAAC "
-msgstr " FAAC Options "
+msgstr " Options FAAC "
 
-#: src/translate.c:288 src/translate.c:302
+#: glade/xcfa.glade:9274 glade/xcfa.glade:9835
 msgid "Site officiel "
-msgstr "Official website "
+msgstr "Site officiel "
 
-#: src/translate.c:289 src/translate.c:303
+#: glade/xcfa.glade:9330 glade/xcfa.glade:9891
 msgid "Web Info "
-msgstr "Info "
+msgstr "Web Info "
 
-#: src/translate.c:291
+#: glade/xcfa.glade:9415
 msgid " Web Faac "
-msgstr " Faac "
+msgstr " Web Faac "
 
-#: src/translate.c:295
-msgid ""
-" Options experts, definies par l'utilisateur - faac (wav -> m4a) "
-msgstr " User-defined expert options - faac (wav -> m4a) "
+#: glade/xcfa.glade:9544
+msgid " Experts options defined by the user - faac (wav -> m4a) "
+msgstr " Experts options defined by the user - faac (wav -> m4a) "
 
-#: src/translate.c:296
+#: glade/xcfa.glade:9564
 msgid " Faac "
 msgstr " Faac "
 
-#: src/translate.c:297
-msgid " Stereo: Qualite en kbit/s"
-msgstr " Stereo: Quality in kbit/s"
+#: glade/xcfa.glade:9606
+msgid "Mono: Qualite en kbit/s"
+msgstr "Mono: Qualite en kbit/s"
 
-#: src/translate.c:298
-msgid " Mono: Qualite en kbit/s"
-msgstr " Mono: Quality en kbit/s"
+#: glade/xcfa.glade:9617
+msgid "Stereo: Qualite en kbit/s"
+msgstr "Stereo: Qualite en kbit/s"
 
-#: src/translate.c:299
+#: glade/xcfa.glade:9673
 msgid " AacplusEnc (fichier .aac): "
-msgstr " AacplusEnc (file .aac): "
+msgstr " AacplusEnc (fichier .aac): "
 
-#: src/translate.c:301
+#: glade/xcfa.glade:9774
 msgid " Options AacPlusEnc "
-msgstr " AacPlusEnc Options "
+msgstr " Options AacPlusEnc "
 
-#: src/translate.c:305
+#: glade/xcfa.glade:9976
 msgid " Web AacPlusEnc "
-msgstr " AacPlusEnc "
+msgstr " Web AacPlusEnc "
 
-#: src/translate.c:306
+#: glade/xcfa.glade:10021
 msgid " AacplusEnc "
 msgstr " AacplusEnc "
 
-#: src/translate.c:307
+#: glade/xcfa.glade:10051
 msgid "Artiste"
-msgstr "Artist"
+msgstr "Artiste"
 
-#: src/translate.c:308 src/translate.c:335
+#: glade/xcfa.glade:10070 glade/xcfa_win_treeview.glade:95
 msgid "Titre"
-msgstr "Title"
+msgstr "Titre"
 
-#: src/translate.c:309
+#: glade/xcfa.glade:10089
 msgid "Album"
 msgstr "Album"
 
-#: src/translate.c:310
+#: glade/xcfa.glade:10108
 msgid "Numero"
-msgstr "Number"
+msgstr "Numero"
 
-#: src/translate.c:311
+#: glade/xcfa.glade:10127
 msgid "Genre"
 msgstr "Genre"
 
-#: src/translate.c:312
+#: glade/xcfa.glade:10146
 msgid "Annee"
-msgstr "Year"
+msgstr "Annee"
 
-#: src/translate.c:313
+#: glade/xcfa.glade:10165
 msgid "Commentaire"
-msgstr "Comment"
+msgstr "Commentaire"
 
-#: src/translate.c:314
+#: glade/xcfa.glade:10190
 msgid " Exportation de "
-msgstr " Export "
+msgstr " Exportation de "
 
-#: src/translate.c:316
+#: glade/xcfa.glade:10226
 msgid " Preferences "
 msgstr " Preferences "
 
-#: src/translate.c:317
+#: glade/xcfa.glade:10289
 msgid "SCAN"
 msgstr "SCAN"
 
-#: src/translate.c:318
+#: glade/xcfa.glade:10303
 msgid " Installation "
 msgstr " Installation "
 
-#: src/translate.c:319
-msgid " Votre systeme utilise ... "
-msgstr " Your system uses ... "
+#: glade/xcfa.glade:10338
+msgid " Your system use ... "
+msgstr " Your system use ... "
 
-#: src/translate.c:320
+#: glade/xcfa.glade:10375
 msgid ""
 "\n"
-"Pour installer les programmes externes requis,\n"
-"veuillez utiliser l'installateur de votre distribution Gnu/Linux.\n"
+"To install the required external programs\n"
+"Please use the installer to your distribution Gnu / Linux.\n"
 msgstr ""
 "\n"
-"To install the required external software,\n"
-"please use the package manager of your Gnu/Linux distribution.\n"
+"To install the required external programs\n"
+"Please use the installer to your distribution Gnu / Linux.\n"
 
-#: src/translate.c:321
+#: glade/xcfa.glade:10393
 msgid ""
 "Le programme XCFA_INSTALL_ALL ecrit en Perl vous sera utile en ligne de "
 "commande pour une installation des programmes complementaire."
 msgstr ""
-"The program XCFA_INSTALL_ALL written in Perl will be useful on the command "
-"line for installation of supplementary programs"
+"Le programme XCFA_INSTALL_ALL ecrit en Perl vous sera utile en ligne de "
+"commande pour une installation des programmes complementaire."
 
-#: src/translate.c:322
+#: glade/xcfa.glade:10419
 msgid " Informations "
 msgstr " Informations "
 
-#: src/translate.c:323
-msgid " Application externes "
-msgstr " External programs "
+#: glade/xcfa.glade:10443
+msgid " External application "
+msgstr " External application "
 
-#: src/translate.c:324 src/translate.c:326
+#: glade/xcfa.glade:10514 glade/xcfa.glade:10618
 msgid "parametres:"
-msgstr "parameters:"
+msgstr "parametres:"
 
-#: src/translate.c:325
-msgid "Navigateur"
-msgstr "browsers"
-
-#: src/translate.c:327
-msgid "Lecteurs audio"
-msgstr "Audio player"
-
-#: src/translate.c:328
-msgid " Navigateurs / Lecteurs audio "
-msgstr " Browsers / Audio player"
-
-#: src/translate.c:329
-msgid " Applications externes "
-msgstr " External programs "
-
-#: src/translate.c:330
-msgid "Scan en cours ..."
-msgstr "Scan in progress ..."
-
-#: src/translate.c:331
-msgid "Scan du support en cours ..."
-msgstr "Media scan in progress..."
-
-#: src/translate.c:332
-msgid "Detail extraction mode expert"
-msgstr "Rip details - expert mode"
-
-#: src/translate.c:333
-msgid "Modification des champs"
-msgstr "Modify fields"
-
-#: src/translate.c:334
+#: glade/xcfa.glade:10527
 msgid ""
 "\n"
-"Modification des champs\n"
+" konqueror : newTab\n"
+" iceweasel : -new-window -new-tab \n"
 msgstr ""
 "\n"
-"Modify fields\n"
+" konqueror : newTab\n"
+" iceweasel : -new-window -new-tab \n"
 
-#: src/translate.c:342 src/translate.c:361 src/translate.c:382
-#: src/translate.c:394 src/translate.c:405 src/translate.c:413
-msgid " Visibilite "
-msgstr " Visibility "
-
-#: src/translate.c:343 src/translate.c:362 src/translate.c:383
-#: src/translate.c:395 src/translate.c:406 src/translate.c:414
-msgid "Nom a gauche"
-msgstr "Name to left"
-
-#: src/translate.c:344 src/translate.c:363 src/translate.c:384
-#: src/translate.c:396 src/translate.c:407 src/translate.c:415
-msgid "Nom au centre"
-msgstr "Name centred"
-
-#: src/translate.c:345 src/translate.c:364 src/translate.c:385
-#: src/translate.c:397 src/translate.c:408 src/translate.c:416
-msgid "Nom a droite"
-msgstr "Name to right"
-
-#: src/translate.c:346
-msgid "DVD"
-msgstr "DVD"
-
-#: src/translate.c:351 src/translate.c:372
-msgid "Wavpack"
-msgstr "Wavpack"
-
-#: src/translate.c:355 src/translate.c:376
-msgid "Musepack"
-msgstr "Musepack"
-
-#: src/translate.c:365
-msgid "CD"
-msgstr "CD"
-
-#: src/translate.c:380
-msgid "Replaygain"
-msgstr "Replaygain"
-
-#: src/translate.c:386
-msgid "CONVERSIONS"
-msgstr "CONVERSIONS"
-
-#: src/translate.c:387
-msgid "Hertz"
-msgstr "Hertz"
-
-#: src/translate.c:388
-msgid "New Hertz"
-msgstr "New Hertz"
-
-#: src/translate.c:389
-msgid "Voie"
-msgstr "Voice"
-
-#: src/translate.c:390
-msgid "New Voie"
-msgstr "New Voice"
-
-#: src/translate.c:391
-msgid "Bits"
-msgstr "Bits"
-
-#: src/translate.c:392
-msgid "New Bits"
-msgstr "New Bits"
-
-#: src/translate.c:398
-msgid "WAV"
-msgstr "WAV"
-
-#: src/translate.c:401
-msgid "New Bitrate"
-msgstr "New Bitrat"
-
-#: src/translate.c:402
-msgid "Size"
-msgstr "Size"
-
-#: src/translate.c:409
-msgid "MP3-OGG"
-msgstr "MP3-OGG"
-
-#: src/translate.c:417
-msgid "TAGS"
-msgstr "TAGS"
+#: glade/xcfa.glade:10548
+msgid "Navigateur"
+msgstr "Navigateur"
 
-#: src/translate.c:418
-msgid "Selection globale"
-msgstr "Select all"
+#: glade/xcfa.glade:10648
+msgid "Lecteurs audio"
+msgstr "Lecteurs audio"
 
-#: src/translate.c:419
-msgid "Deselection globale"
-msgstr "Clear all"
+#: glade/xcfa.glade:10669
+msgid "  Browsers / Audio Players "
+msgstr "  Browsers / Audio Players "
 
-#: src/translate.c:420
-msgid "Retour"
-msgstr "Return"
+#: glade/xcfa.glade:10692
+msgid " Applications externes "
+msgstr " Applications externes "
 
-#: src/translate.c:421
+#: glade/xcfa_win_about.glade:7
 msgid "About X Convert File Audio"
 msgstr "About X Convert File Audio"
 
-#: src/translate.c:422
+#: glade/xcfa_win_about.glade:103
 msgid "Author"
 msgstr "Author"
 
-#: src/translate.c:423
+#: glade/xcfa_win_about.glade:139
 msgid "Licence"
-msgstr "License"
+msgstr "Licence"
 
-#: src/translate.c:424
+#: glade/xcfa_win_about.glade:163
 msgid " Informations "
 msgstr " Informations "
 
-#: src/translate.c:425
+#: glade/xcfa_win_about.glade:198
 msgid " Machine "
-msgstr " Computer "
+msgstr " Machine "
 
-#: src/translate.c:426
+#: glade/xcfa_win_about.glade:333
 msgid "Ingenieurs du son\n"
-msgstr "Sound engineers\n"
+msgstr "Ingenieurs du son\n"
 
-#: src/translate.c:427
+#: glade/xcfa_win_about.glade:350
 msgid ""
 "\n"
 "Graphisme\n"
 msgstr ""
 "\n"
-"Graphics\n"
+"Graphisme\n"
 
-#: src/translate.c:428
+#: glade/xcfa_win_about.glade:370
 msgid ""
 "Traduction Anglaise\n"
 "\n"
 "\n"
 msgstr ""
-"English translation\n"
+"Traduction Anglaise\n"
 "\n"
 "\n"
 
-#: src/translate.c:429
+#: glade/xcfa_win_about.glade:391
 msgid ""
 "\n"
 "Traduction Allemande"
 msgstr ""
 "\n"
-"German translation"
+"Traduction Allemande"
 
-#: src/translate.c:430
+#: glade/xcfa_win_about.glade:628
 msgid ""
 "\n"
 "Codeur Xcfa"
 msgstr ""
 "\n"
-"XCFA programmer"
+"Codeur Xcfa"
 
-#: src/translate.c:431
+#: glade/xcfa_win_about.glade:665
 msgid ""
 "\n"
 "ElementSpeak pour Xcfa "
 msgstr ""
 "\n"
-"ElementSpeak for XCFA··"
+"ElementSpeak pour Xcfa "
 
-#: src/translate.c:432
+#: glade/xcfa_win_about.glade:702
 msgid ""
 "\n"
 "Codeur pages Web"
 msgstr ""
 "\n"
-"Webmasters"
+"Codeur pages Web"
 
-#: src/translate.c:433
+#: glade/xcfa_win_about.glade:739
 msgid ""
 "\n"
 "Traduction Italienne"
 msgstr ""
 "\n"
-"Italian translation"
+"Traduction Italienne"
 
-#: src/translate.c:434
+#: glade/xcfa_win_about.glade:800
 msgid ""
 "\n"
 "\n"
@@ -2658,53 +2460,45 @@
 msgstr ""
 "\n"
 "\n"
-"Useful links\n"
+"Pages a visiter\n"
 
-#: src/translate.c:435
+#: glade/xcfa_win_about.glade:1123
 msgid "Linux On The Root"
 msgstr "Linux On The Root"
 
-#: src/translate.c:436
+#: glade/xcfa_win_about.glade:1180
 msgid "Frugalware"
 msgstr "Frugalware"
 
-#: src/translate.c:437
+#: glade/xcfa_win_about.glade:1237
 msgid "Road2Mayotte"
 msgstr "Road2Mayotte"
 
-#: src/translate.c:438
+#: glade/xcfa_win_about.glade:1294
 msgid "La Linuxerie"
 msgstr "La Linuxerie"
 
-#: src/translate.c:439
-msgid "Audioptimisation by Dzef"
-msgstr "Audioptimisation by Dzef"
-
-#: src/translate.c:440
+#: glade/xcfa_win_about.glade:1351
 msgid "Tuxfamily"
 msgstr "Tuxfamily"
 
-#: src/translate.c:441
+#: glade/xcfa_win_about.glade:1408
 msgid "Framasoft"
 msgstr "Framasoft"
 
-#: src/translate.c:442
+#: glade/xcfa_win_about.glade:1465
 msgid "Ekd (EnKoDeur-Mixeur)"
 msgstr "Ekd (EnKoDeur-Mixeur)"
 
-#: src/translate.c:443
-msgid "Bishop's page"
-msgstr "Bishop's page"
+#: glade/xcfa_win_about.glade:1544
+msgid "Debian Multimedia"
+msgstr "Debian Multimedia"
 
-#: src/translate.c:444
+#: glade/xcfa_win_about.glade:1598
 msgid "Je suis libre"
 msgstr "Je suis libre"
 
-#: src/translate.c:445
-msgid "Debian Multimedia"
-msgstr "Debian Multimedia"
-
-#: src/translate.c:446
+#: glade/xcfa_win_about.glade:1705
 msgid ""
 "\n"
 "Forum\n"
@@ -2712,19 +2506,15 @@
 "\n"
 "Forum\n"
 
-#: src/translate.c:447
-msgid "XCFA Vorstellung "
-msgstr "XCFA Vorstellung "
+#: glade/xcfa_win_about.glade:1825
+msgid "Forum Xcfa"
+msgstr "Forum Xcfa"
 
-#: src/translate.c:448
+#: glade/xcfa_win_about.glade:1879
 msgid "XCFA LinuxForen.de"
 msgstr "XCFA LinuxForen.de"
 
-#: src/translate.c:449
-msgid "Forum Xcfa"
-msgstr "Forum Xcfa"
-
-#: src/translate.c:450
+#: glade/xcfa_win_about.glade:1929
 msgid ""
 "\n"
 "Documentation\n"
@@ -2732,102 +2522,208 @@
 "\n"
 "Documentation\n"
 
-#: src/translate.c:451
+#: glade/xcfa_win_about.glade:2164
 msgid "Wiki Xcfa par Shankarius"
-msgstr "XCFA wiki by Shankarius"
+msgstr "Wiki Xcfa par Shankarius"
 
-#: src/translate.c:452
+#: glade/xcfa_win_about.glade:2219
 msgid "Doc Xcfa par Patachon"
-msgstr "XCFA doc. by Patachon"
+msgstr "Doc Xcfa par Patachon"
 
-#: src/translate.c:453
+#: glade/xcfa_win_about.glade:2276
 msgid "Ogg Vorbis explique par Shankarius"
-msgstr "Ogg Vorbis explained by Shankarius"
+msgstr "Ogg Vorbis explique par Shankarius"
 
-#: src/translate.c:454
+#: glade/xcfa_win_about.glade:2333
 msgid "La normalisation expliquee par Dzef"
-msgstr "Normalisation explained by Dzef"
+msgstr "La normalisation expliquee par Dzef"
 
-#: src/translate.c:455
+#: glade/xcfa_win_about.glade:2390
 msgid "Xcfa sur Linux On The Root"
-msgstr "XCFA on Linux On The Root"
+msgstr "Xcfa sur Linux On The Root"
 
-#: src/translate.c:456
+#: glade/xcfa_win_about.glade:2433
 msgid " Contributions "
 msgstr " Contributions "
 
-#: src/translate.c:457
+#: glade/xcfa_win_about.glade:2461
 msgid " License "
-msgstr " Licence "
+msgstr " License "
 
-#: src/translate.c:458
+#: glade/xcfa_win_about.glade:2482
 msgid "OK"
 msgstr "OK"
 
-#: src/web.c:147 src/web.c:207
-msgid "PAS de navigateur present"
-msgstr "No web browser"
+#: glade/xcfa_win_scan.glade:9
+msgid "Scan en cours ..."
+msgstr "Scan en cours ..."
 
-#: src/web.c:148
-msgid "L'acces au web est impossible car aucun navigateur"
-msgstr "No Web access: no web browser"
+#: glade/xcfa_win_scan.glade:77
+msgid "Scan du support en cours ..."
+msgstr "Scan du support en cours ..."
 
-#: src/web.c:150
-msgid "n'est present dans votre configuration."
-msgstr "found in your system"
+#: glade/xcfa_win_scan.glade:128
+msgid "Detail extraction mode expert"
+msgstr "Detail extraction mode expert"
 
-#: src/web.c:152
-msgid "Veuillez installez un navigateur."
-msgstr "Please install a web browser"
+#: glade/xcfa_win_treeview.glade:7
+msgid "Modification des champs"
+msgstr "Modification des champs"
 
-#: src/web.c:161
-msgid "Vous devez ouvrir l'acces internet"
-msgstr "You need to enable web access"
+#: glade/xcfa_win_treeview.glade:41
+msgid ""
+"\n"
+"Modification des champs\n"
+msgstr ""
+"\n"
+"Modification des champs\n"
 
-#: src/web.c:209
-msgid " L'acces au web est impossible car aucun navigateur"
-msgstr " No Web access: no web browser"
+#: glade/xcfa_win_treeview.glade:129
+msgid "Temps"
+msgstr "Temps"
 
-#: src/web.c:211
-msgid " n'est present dans votre configuration."
-msgstr " found in your system"
+#: glade/xcfa_win_treeview.glade:163
+msgid "Choix"
+msgstr "Choix"
 
-#: src/web.c:213
-msgid " Veuillez installez un navigateur."
-msgstr " Please install a web browser"
+#: glade/xcfa_win_treeview.glade:197 glade/xcfa_win_treeview.glade:577
+#: glade/xcfa_win_treeview.glade:995 glade/xcfa_win_treeview.glade:1260
+#: glade/xcfa_win_treeview.glade:1508 glade/xcfa_win_treeview.glade:1706
+msgid "Nom"
+msgstr "Nom"
 
-#: src/web.c:222
-msgid "L'application est absente."
-msgstr "Application is missing."
+#: glade/xcfa_win_treeview.glade:220 glade/xcfa_win_treeview.glade:600
+#: glade/xcfa_win_treeview.glade:1018 glade/xcfa_win_treeview.glade:1283
+#: glade/xcfa_win_treeview.glade:1531 glade/xcfa_win_treeview.glade:1732
+msgid " Visibilite "
+msgstr " Visibilite "
 
-#: src/web.c:223
-msgid "Veuillez installer : "
-msgstr "Please install : "
+#: glade/xcfa_win_treeview.glade:250 glade/xcfa_win_treeview.glade:630
+#: glade/xcfa_win_treeview.glade:1048 glade/xcfa_win_treeview.glade:1313
+#: glade/xcfa_win_treeview.glade:1562 glade/xcfa_win_treeview.glade:1763
+msgid "Nom a gauche"
+msgstr "Nom a gauche"
 
-#: src/win_about.c:138
-msgid " Xcfa sur le web"
-msgstr " XCFA on the web"
+#: glade/xcfa_win_treeview.glade:267 glade/xcfa_win_treeview.glade:647
+#: glade/xcfa_win_treeview.glade:1065 glade/xcfa_win_treeview.glade:1330
+#: glade/xcfa_win_treeview.glade:1579 glade/xcfa_win_treeview.glade:1780
+msgid "Nom au centre"
+msgstr "Nom au centre"
 
-#: src/win_about.c:188
-msgid ""
-"\n"
-"Au tout debut:\n"
-"\n"
-"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
-"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
-"... ;-)\n"
-"\n"
-""
-msgstr ""
-"\n"
-"In the beginning:\n"
-"\n"
-"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
-"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
-"... ;-)\n"
-"\n"
-""
+#: glade/xcfa_win_treeview.glade:286 glade/xcfa_win_treeview.glade:666
+#: glade/xcfa_win_treeview.glade:1084 glade/xcfa_win_treeview.glade:1349
+#: glade/xcfa_win_treeview.glade:1598 glade/xcfa_win_treeview.glade:1799
+msgid "Nom a droite"
+msgstr "Nom a droite"
 
-#: src/win_scan.c:166
-msgid "Waiting ..."
-msgstr "Waiting ..."
+#: glade/xcfa_win_treeview.glade:326
+msgid "DVD"
+msgstr "DVD"
+
+#: glade/xcfa_win_treeview.glade:373 glade/xcfa_win_treeview.glade:791
+msgid "Wav"
+msgstr "Wav"
+
+#: glade/xcfa_win_treeview.glade:390 glade/xcfa_win_treeview.glade:808
+msgid "Flac"
+msgstr "Flac"
+
+#: glade/xcfa_win_treeview.glade:407 glade/xcfa_win_treeview.glade:825
+msgid "Ape"
+msgstr "Ape"
+
+#: glade/xcfa_win_treeview.glade:424 glade/xcfa_win_treeview.glade:842
+msgid "Wavpack"
+msgstr "Wavpack"
+
+#: glade/xcfa_win_treeview.glade:441 glade/xcfa_win_treeview.glade:859
+msgid "Ogg"
+msgstr "Ogg"
+
+#: glade/xcfa_win_treeview.glade:458 glade/xcfa_win_treeview.glade:876
+msgid "M4a"
+msgstr "M4a"
+
+#: glade/xcfa_win_treeview.glade:475 glade/xcfa_win_treeview.glade:893
+msgid "Aac"
+msgstr "Aac"
+
+#: glade/xcfa_win_treeview.glade:492 glade/xcfa_win_treeview.glade:910
+msgid "Musepack"
+msgstr "Musepack"
+
+#: glade/xcfa_win_treeview.glade:509 glade/xcfa_win_treeview.glade:927
+msgid "Mp3"
+msgstr "Mp3"
+
+#: glade/xcfa_win_treeview.glade:526
+msgid "Num"
+msgstr "Num"
+
+#: glade/xcfa_win_treeview.glade:709
+msgid "CD"
+msgstr "CD"
+
+#: glade/xcfa_win_treeview.glade:978
+msgid "Replaygain"
+msgstr "Replaygain"
+
+#: glade/xcfa_win_treeview.glade:1127
+msgid "CONVERSIONS"
+msgstr "CONVERSIONS"
+
+#: glade/xcfa_win_treeview.glade:1158
+msgid "Hertz"
+msgstr "Hertz"
+
+#: glade/xcfa_win_treeview.glade:1175
+msgid "New Hertz"
+msgstr "New Hertz"
+
+#: glade/xcfa_win_treeview.glade:1192
+msgid "Voie"
+msgstr "Voie"
+
+#: glade/xcfa_win_treeview.glade:1209
+msgid "New Voie"
+msgstr "New Voie"
+
+#: glade/xcfa_win_treeview.glade:1226
+msgid "Bits"
+msgstr "Bits"
+
+#: glade/xcfa_win_treeview.glade:1243
+msgid "New Bits"
+msgstr "New Bits"
+
+#: glade/xcfa_win_treeview.glade:1392
+msgid "WAV"
+msgstr "WAV"
+
+#: glade/xcfa_win_treeview.glade:1440
+msgid "Bitrate"
+msgstr "Bitrate"
+
+#: glade/xcfa_win_treeview.glade:1457
+msgid "New Bitrate"
+msgstr "New Bitrate"
+
+#: glade/xcfa_win_treeview.glade:1641
+msgid "MP3-OGG"
+msgstr "MP3-OGG"
+
+#: glade/xcfa_win_treeview.glade:1842
+msgid "TAGS"
+msgstr "TAGS"
+
+#: glade/xcfa_win_treeview.glade:1894
+msgid "Selection globale"
+msgstr "Selection globale"
+
+#: glade/xcfa_win_treeview.glade:1948
+msgid "Deselection globale"
+msgstr "Deselection globale"
+
+#: glade/xcfa_win_treeview.glade:2009
+msgid "Retour"
+msgstr "Retour"

xcfa-4.2.8.tar.gz/po/xcfa.pot -> xcfa-5.0.2.tar.gz/po/xcfa.pot Changed

@@ -6,231 +6,177 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: xcfa 4.2.8\n"
+"Project-Id-Version: xcfa 5.0.2\n"
 "Report-Msgid-Bugs-To: xcfa@tuxfamily.org\n"
-"POT-Creation-Date: 2012-02-03 13:22+0100\n"
+"POT-Creation-Date: 2015-05-16 14:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/cd_audio.c:815 src/dvd.c:684 src/dvd.c:1327
-msgid "MPLAYER deja en action"
+#: src/cd_audio.c:814 src/dvd.c:686 src/dvd.c:1345
+msgid "MPLAYER already in action"
 msgstr ""
 
-#: src/cd_audio.c:816 src/dvd.c:685 src/dvd.c:1328
-msgid "MPLAYER est deja utilise !!"
+#: src/cd_audio.c:815 src/dvd.c:687 src/dvd.c:1346
+msgid "MPLAYER is already in use !!"
 msgstr ""
 
-#: src/cd_audio.c:1227 src/cd_audio.c:1233 src/dvd.c:871 src/file.c:2830
-msgid "(Click Droit = Menu) / En attente de selection."
+#: src/cd_audio.c:1227 src/cd_audio.c:1233 src/file.c:2837
+msgid "(Right click = Menu) / Waiting for selection."
 msgstr ""
 
-#: src/cd_audio.c:1230 src/file.c:2827
-msgid "Le programme externe d'extraction est absent."
+#: src/cd_audio.c:1230
+msgid "The external ripping program is missing."
 msgstr ""
 
-#: src/cd_audio.c:1236 src/file.c:2833
-msgid "(Click Droit = Menu) / En attente de selection. Le fichier existe."
+#: src/cd_audio.c:1236
+msgid "(Right click = Menu) / Waiting for Selection. File exists.."
 msgstr ""
 
-#: src/cd_audio.c:1239 src/file.c:2836
-msgid "(Click Droit = Menu) / En selection."
+#: src/cd_audio.c:1239
+msgid "(Right click = Menu) / Selected files."
 msgstr ""
 
-#: src/cd_audio.c:1242 src/file.c:2842
-msgid "(Click Droit = Menu) / Selection avec options expert."
+#: src/cd_audio.c:1242 src/file.c:2849
+msgid "(Right click = Menu) / Selection - expert mode."
 msgstr ""
 
-#: src/cd_audio.c:1245 src/file.c:2839
-msgid "(Click Droit = Menu) / En selection. Le fichier existe."
+#: src/cd_audio.c:1245 src/file.c:2846
+msgid "(Right click = Menu) / Selected files. File exists."
 msgstr ""
 
-#: src/cd_audio.c:1248 src/file.c:2845
-msgid ""
-"(Click Droit = Menu) / Selection avec options expert. Le fichier existe."
+#: src/cd_audio.c:1248 src/file.c:2852
+msgid "(Right click = Menu) / Selection - expert mode. File exists."
 msgstr ""
 
 #: src/cd_audio.c:1257
 msgid ""
-"(Click Droit = Menu) / Possibilite d'ajustement INDIVIDUEL ou COLLECTIF "
-"maximal du volume"
+"(Right click = Menu) / Possibilities for individual adaptation or maximum "
+"collection volume"
 msgstr ""
 
 #: src/cd_audio.c:1262
-msgid "(Click Droit = Menu) / Ajustement INDIVIDUEL maximal du volume"
+msgid "(Right click = Menu) / INDIVIDUAL maximum volume adjustment"
 msgstr ""
 
 #: src/cd_audio.c:1265
-msgid "(Click Droit = Menu) / Ajustement COLLECTIF maximal du volume"
-msgstr ""
-
-#: src/cd_audio.c:1505 src/dvd.c:1103 src/file.c:3139 src/translate.c:336
-#: src/translate.c:347 src/translate.c:366
-msgid "Play"
-msgstr ""
-
-#: src/cd_audio.c:1546 src/file.c:3204 src/translate.c:348 src/translate.c:369
-msgid "Wav"
-msgstr ""
-
-#: src/cd_audio.c:1567 src/file.c:3223 src/translate.c:349 src/translate.c:370
-msgid "Flac"
-msgstr ""
-
-#: src/cd_audio.c:1587 src/file.c:3242 src/translate.c:350 src/translate.c:371
-msgid "Ape"
-msgstr ""
-
-#: src/cd_audio.c:1607 src/file.c:3261
-msgid "WavP"
+msgid "(Right click = Menu) / COLLECTIVE maximum volume adjustment"
 msgstr ""
 
-#: src/cd_audio.c:1627 src/file.c:3280 src/translate.c:352 src/translate.c:373
-msgid "Ogg"
-msgstr ""
-
-#: src/cd_audio.c:1648 src/file.c:3299 src/translate.c:353 src/translate.c:374
-msgid "M4a"
-msgstr ""
-
-#: src/cd_audio.c:1669 src/file.c:3318 src/translate.c:354 src/translate.c:375
-msgid "Aac"
-msgstr ""
-
-#: src/cd_audio.c:1689 src/file.c:3337
-msgid "Mpc"
-msgstr ""
-
-#: src/cd_audio.c:1709 src/file.c:3356 src/translate.c:356 src/translate.c:377
-msgid "Mp3"
-msgstr ""
-
-#: src/cd_audio.c:1730 src/translate.c:357
-msgid "Num"
-msgstr ""
-
-#: src/cd_audio.c:1745 src/translate.c:358 src/translate.c:378
-#: src/translate.c:403 src/translate.c:411
-msgid "Time"
-msgstr ""
-
-#: src/cd_audio.c:1760 src/dvd.c:1171 src/file.c:3392 src/translate.c:340
-#: src/translate.c:359 src/translate.c:379
+#: src/cd_audio.c:1764 src/dvd.c:1187 src/file.c:3403
+#: glade/xcfa_win_treeview.glade:180 glade/xcfa_win_treeview.glade:560
+#: glade/xcfa_win_treeview.glade:961
 msgid "Normalise"
 msgstr ""
 
-#: src/cd_audio.c:1785 src/dvd.c:1191 src/file.c:3434 src/file_mp3ogg.c:1287
-#: src/file_tags.c:1209 src/file_wav.c:952 src/prg_init.c:614
-#: src/translate.c:341 src/translate.c:360 src/translate.c:381
-#: src/translate.c:393 src/translate.c:404 src/translate.c:412
-msgid "Nom"
+#: src/cd_audio.c:1789 src/dvd.c:1207 src/file.c:3445 src/file_mp3ogg.c:964
+#: src/file_tags.c:1253 src/file_wav.c:830 src/prg_init.c:609
+msgid "Name"
 msgstr ""
 
-#: src/cd_audio.c:2507
-msgid " Parametrage CDDB: [ Nom du serveur ]"
+#: src/cd_audio.c:2517
+msgid " Setting up CDDB: [ Server name ]"
 msgstr ""
 
-#: src/cd_audio.c:2516
-msgid " Parametrage PROXY: [ serveur ] [ port ]"
+#: src/cd_audio.c:2526
+msgid " Proxy settings: [ server ] [ port ] "
 msgstr ""
 
-#: src/cd_audio.c:2526 src/translate.c:99
-msgid " Serveur "
+#: src/cd_audio.c:2536 glade/xcfa.glade:1842
+msgid " Server "
 msgstr ""
 
-#: src/cd_audio_extract.c:661
+#: src/cd_audio_extract.c:673
 #, c-format
-msgid ""
-"[Erreur du segment numero: %d]\n"
-"%d) Lecture PASS 1/2\n"
+msgid "[Error on segment #%d] %d) Playing PASS 1/2\n"
 msgstr ""
 
-#: src/cd_audio_extract.c:668
+#: src/cd_audio_extract.c:680
 #, c-format
 msgid ""
-"--> Deja %d fois 2 lectures du segment %d!\n"
+"--> Segment %d already read two %d times!\n"
 " Abandon :/\n"
 msgstr ""
 
-#: src/cd_audio_extract.c:688
+#: src/cd_audio_extract.c:700
 #, c-format
-msgid "%d) Lecture PASS 2/2\n"
+msgid "%d) Read PASS 2/2\n"
 msgstr ""
 
-#: src/cd_audio_extract.c:769
+#: src/cd_audio_extract.c:780
 #, c-format
 msgid ""
 "\n"
-"[Piste: %d]\n"
+"[Track: %d]\n"
 msgstr ""
 
-#: src/cd_audio_extract.c:773
-msgid "Extraction mode expert PASS 1/2\n"
+#: src/cd_audio_extract.c:784
+msgid "Ripping expert mode PASS 1/2\n"
 msgstr ""
 
-#: src/cd_audio_extract.c:784
-msgid "Extraction mode expert PASS 2/2\n"
+#: src/cd_audio_extract.c:795
+msgid "Ripping expert mode PASS 2/2\n"
 msgstr ""
 
-#: src/cd_audio_extract.c:792
-msgid "Controle du contenu des fichiers extraits\n"
+#: src/cd_audio_extract.c:803
+msgid "Control the content of the extracted files\n"
 msgstr ""
 
-#: src/cd_audio_extract.c:1678 src/cd_audio_extract.c:1680
+#: src/cd_audio_extract.c:1710 src/cd_audio_extract.c:1712
 msgid "XCFA: Extraction CD"
 msgstr ""
 
-#: src/cd_audio_extract.c:1678 src/dvd_extract.c:412 src/file_action.c:190
-#: src/file_mp3ogg_conv.c:300 src/file_wav_conv.c:349
+#: src/cd_audio_extract.c:1710 src/dvd_extract.c:412 src/file_action.c:183
+#: src/file_mp3ogg_conv.c:329 src/file_wav_conv.c:343
 msgid "Ok"
 msgstr ""
 
-#: src/cd_audio_extract.c:1680 src/dvd_extract.c:414 src/file_action.c:192
-#: src/file_mp3ogg_conv.c:302 src/file_wav_conv.c:351
-msgid "Arret par l'utilisateur"
+#: src/cd_audio_extract.c:1712 src/dvd_extract.c:414 src/file_action.c:185
+#: src/file_mp3ogg_conv.c:331 src/file_wav_conv.c:345
+msgid "Stop by user"
 msgstr ""
 
-#: src/cd_audio_extract.c:1938
-msgid "Nom de fichier unique absent"
+#: src/cd_audio_extract.c:1983
+msgid "File name not found"
 msgstr ""
 
-#: src/cd_audio_extract.c:1939
-msgid "Veuillez saisir un nom pour le fichier unique"
+#: src/cd_audio_extract.c:1984
+msgid "Please enter a file name"
 msgstr ""
 
-#: src/cd_audio_toc.c:160
+#: src/cd_audio_toc.c:156
 msgid "cdda2wav and icedax NOT FOUND"
 msgstr ""
 
-#: src/cd_audio_toc.c:161
+#: src/cd_audio_toc.c:157
 msgid "Please, install packages [ icedax, cdda2wav ]"
 msgstr ""
 
-#: src/cd_audio_toc.c:166
+#: src/cd_audio_toc.c:163
 msgid "icedax NOT FOUND"
 msgstr ""
 
-#: src/cd_audio_toc.c:167
+#: src/cd_audio_toc.c:164
 msgid "Please, install package [ icedax ]"
 msgstr ""
 
-#: src/cd_audio_toc.c:172
+#: src/cd_audio_toc.c:170
 msgid "cdda2wav NOT FOUND"
 msgstr ""
 
-#: src/cd_audio_toc.c:173
+#: src/cd_audio_toc.c:171
 msgid "Please, install package [ cdda2wav ]"
 msgstr ""
 
-#: src/cd_audio_toc.c:181
+#: src/cd_audio_toc.c:180
 msgid "cdparanoia NOT FOUND"
 msgstr ""
 
-#: src/cd_audio_toc.c:182
+#: src/cd_audio_toc.c:181
 msgid "Please, install package [ cdparanoia ]"
 msgstr ""
 
@@ -242,1302 +188,1263 @@
 msgid "Please, install packages [ cd-discid ]"
 msgstr ""
 
-#: src/cd_audio_toc.c:202
-msgid "ERREUR datas proxy"
+#: src/cd_audio_toc.c:203
+msgid "ERROR datas proxy"
 msgstr ""
 
-#: src/cd_audio_toc.c:203
-msgid "Veuillez renseigner les champs du proxy"
+#: src/cd_audio_toc.c:204
+msgid "Please complete all fields proxy"
 msgstr ""
 
-#: src/cd_curl.c:718 src/web.c:160
-msgid "La liaison internet est absente"
+#: src/cd_curl.c:734 src/web.c:187
+msgid "A web connection is missing"
 msgstr ""
 
-#: src/cd_curl.c:1122
+#: src/cd_curl.c:1204
 msgid "Couldn't find CD"
 msgstr ""
 
-#: src/cd_curl.c:1185
+#: src/cd_curl.c:1267
 msgid "No Audio CD"
 msgstr ""
 
-#: src/dvd.c:863
+#: src/dvd.c:877
 msgid ""
-"(Click Droit = Menu) / PEAK-ALBUM: Amplification maximale du volume pour un "
-"groupe de fichiers en respectant les ecarts de niveau entre chacun d'eux."
+"(Right click = Menu) / Maximum volume amplification of a group of files "
+"keeping the level difference between each of them."
 msgstr ""
 
-#: src/dvd.c:866
-msgid ""
-"(Click Droit = Menu) / PEAK: Amplification maximale du volume pour chaque de "
-"fichier."
+#: src/dvd.c:882 src/file.c:2882
+msgid "PEAK: Maximum volume amplification of each file."
 msgstr ""
 
-#: src/dvd.c:904 src/dvd.c:924
-msgid "En attente de selection. Un click activera la conversion vers 2 canaux."
+#: src/dvd.c:887
+msgid "(Right click = Menu) / ReplayGain: Waiting for selection."
 msgstr ""
 
-#: src/dvd.c:916
-msgid "Conversion vers 2 canaux."
+#: src/dvd.c:920 src/dvd.c:940
+msgid ""
+"Waiting for selection. A click will activate the conversion to 2 channels."
 msgstr ""
 
-#: src/dvd.c:928
+#: src/dvd.c:932
+msgid "Conversion to 2 channels."
+msgstr ""
+
+#: src/dvd.c:944
 #, c-format
-msgid "Conversion vers %s canaux."
+msgid "Conversion to %s channels."
 msgstr ""
 
-#: src/dvd.c:933
+#: src/dvd.c:949
 #, c-format
 msgid ""
-"Conversion vers 2 canaux. Un second click activera la conversion vers %s "
-"canaux."
+"Conversion to 2 channels. A second click will activate the conversion to %s "
+"channels."
 msgstr ""
 
-#: src/dvd.c:948
-msgid "Musique en ecoute."
+#: src/dvd.c:964
+msgid "Playing music."
 msgstr ""
 
-#: src/dvd.c:951
-msgid "Musique en attente."
+#: src/dvd.c:967
+msgid "Music paused."
 msgstr ""
 
-#: src/dvd.c:966
+#: src/dvd.c:982
 #, c-format
 msgid "Total selection%s: %d, 2ch: %d"
 msgstr ""
 
-#: src/dvd.c:967
+#: src/dvd.c:983
 msgid "s"
 msgstr ""
 
-#: src/dvd.c:973
-msgid "Ce fichier ne peut etre extrait !"
+#: src/dvd.c:989
+msgid "This file can not be ripped !"
 msgstr ""
 
-#: src/dvd.c:1091
-msgid "Titres"
+#: src/dvd.c:1107
+msgid "Titles"
 msgstr ""
 
-#: src/dvd.c:1115 src/file.c:3375 src/file_mp3ogg.c:1272 src/file_tags.c:1193
-#: src/translate.c:337
-msgid "Temps"
+#: src/dvd.c:1119 glade/xcfa_win_treeview.glade:112
+#: glade/xcfa_win_treeview.glade:356 glade/xcfa_win_treeview.glade:740
+msgid "Play"
 msgstr ""
 
-#: src/dvd.c:1127 src/translate.c:338
-msgid "Format"
+#: src/dvd.c:1131 src/file.c:3386 src/file_mp3ogg.c:949 src/file_tags.c:1237
+#: glade/xcfa_win_treeview.glade:543 glade/xcfa_win_treeview.glade:944
+#: glade/xcfa_win_treeview.glade:1491 glade/xcfa_win_treeview.glade:1689
+msgid "Time"
 msgstr ""
 
-#: src/dvd.c:1139 src/translate.c:339
-msgid "Choix"
+#: src/dvd.c:1143 glade/xcfa_win_treeview.glade:146
+msgid "Format"
 msgstr ""
 
-#: src/dvd.c:1253
-msgid "Fichier structure DVD"
+#: src/dvd.c:1155
+msgid "Choice"
 msgstr ""
 
-#: src/dvd.c:1303
-msgid "Le DVD est absent du lecteur."
+#: src/dvd.c:1267
+msgid "DVD file structure"
 msgstr ""
 
-#: src/dvd.c:1338
-msgid "Scan ..."
+#: src/dvd.c:1320
+msgid "The DVD player is absent."
 msgstr ""
 
-#: src/dvd.c:1387
-msgid "lsdvd est absent !"
+#: src/dvd.c:1410
+msgid "lsdvd is missing !"
 msgstr ""
 
-#: src/dvd.c:1388
-msgid "Il faut installer le programme: lsdvd"
+#: src/dvd.c:1411
+msgid "You must install the program: lsdvd"
 msgstr ""
 
 #: src/dvd_extract.c:412 src/dvd_extract.c:414
-msgid "XCFA: Extraction DVD"
+msgid "XCFA: DVD rip"
 msgstr ""
 
-#: src/dvd_read.c:267
+#: src/dvd_read.c:226
 #, c-format
-msgid "Titre [%02d ** ]"
+msgid "Title [%02d ** ]"
 msgstr ""
 
-#: src/dvd_read.c:270
+#: src/dvd_read.c:227
 #, c-format
-msgid "Titre [%02d]"
+msgid "Title [%02d]"
 msgstr ""
 
-#: src/dvd_read.c:313
+#: src/dvd_read.c:252
 #, c-format
-msgid "Fichier_complet_%02d_%s"
+msgid "Chapter: [%02d]"
 msgstr ""
 
-#: src/dvd_read.c:357
-#, c-format
-msgid "Chapitre: [%02d]"
-msgstr ""
-
-#: src/dvd_read.c:402
-#, c-format
-msgid "Titre_%02d_Chapitre_%02d_audio_%02d_%s"
+#: src/file_action.c:183 src/file_action.c:185
+msgid "XCFA: Processing files"
 msgstr ""
 
-#: src/file_action.c:190 src/file_action.c:192
-msgid "XCFA: Traitement fichiers"
-msgstr ""
-
-#: src/file_analyze.c:624
+#: src/file_analyze.c:731
 msgid "Package checkmp3 (mp3check) NOT FOUND !"
 msgstr ""
 
-#: src/file_analyze.c:625
+#: src/file_analyze.c:732
 msgid ""
-"Veuillez installer checkmp3 ou mp3check pour\n"
-"la prise en compte des fichiers mp3"
+"Please install or checkmp3 mp3check for\n"
+"consideration of mp3 files"
 msgstr ""
 
-#: src/file.c:332
+#: src/file.c:327
 #, c-format
-msgid "Total fichiers: %d, Selections: %d"
+msgid "Total files: %d, Selections: %d"
 msgstr ""
 
-#: src/file.c:445
-msgid "CAPACITE DOSSIER TEMPORAIRE TROP FAIBLE"
+#: src/file.c:441
+msgid "TEMPORARY CAPACITY TOO LOW"
 msgstr ""
 
-#: src/file.c:446
-msgid "Pas assez de place dans le dossier temporaire"
+#: src/file.c:442 src/file.c:2875
+msgid "WARNING: Not enough space available in the temp folder."
 msgstr ""
 
-#: src/file.c:452
-msgid "Veuillez deselectionner des PeakGroup."
+#: src/file.c:448
+msgid "Please deselect PeakGroup."
 msgstr ""
 
-#: src/file.c:1439
-msgid "Conversion(s) vers la source"
+#: src/file.c:1431
+msgid "Conversion(s) to source"
 msgstr ""
 
-#: src/file.c:1440
-msgid "Choix d'une nouvelle destination"
+#: src/file.c:1432
+msgid "Select a new destination"
 msgstr ""
 
-#: src/file.c:1510
+#: src/file.c:1501
 msgid "Select type: --"
 msgstr ""
 
-#: src/file.c:1595
+#: src/file.c:1584
 msgid "Peak/album"
 msgstr ""
 
-#: src/file.c:1596
+#: src/file.c:1585
 msgid "Peak"
 msgstr ""
 
-#: src/file.c:1597
+#: src/file.c:1586
 msgid "Mix (scan)Rms/album"
 msgstr ""
 
-#: src/file.c:1598
+#: src/file.c:1587
 msgid "Fix (scan)Rms"
 msgstr ""
 
-#: src/file.c:2854
-#, c-format
-msgid "MAX FICHIERS ATTEINT = %d"
+#: src/file.c:2834
+msgid "The external ripping program is missing"
 msgstr ""
 
-#: src/file.c:2864
-msgid "Normalise: En attente de selection."
+#: src/file.c:2840
+msgid "(Right click = Menu) / Waiting for Selection. File exists."
 msgstr ""
 
-#: src/file.c:2868
-msgid "ATTENTION: Pas assez de place dans le dossier temporaire."
+#: src/file.c:2843
+msgid "(Right click = Menu) / Selected files"
 msgstr ""
 
-#: src/file.c:2871
-msgid ""
-"PEAK-ALBUM: Amplification maximale du volume pour un groupe de fichiers en "
-"respectant les ecarts de niveau entre chacun d'eux."
+#: src/file.c:2861
+#, c-format
+msgid "MAX FILES REACHED = %d"
 msgstr ""
 
-#: src/file.c:2875
-msgid "PEAK: Amplification maximale du volume pour chaque de fichier."
+#: src/file.c:2871
+msgid "Normalise: Waiting for selection."
 msgstr ""
 
 #: src/file.c:2878
 msgid ""
-"RMS-ALBUM: Ajustement du volume moyen pour un groupe de fichiers en "
-"respectant les ecarts de niveau moyen entre chacun d'eux."
+"PEAK-ALBUM: Maximum volume amplification for a group of files according to "
+"the deviations in level between them"
 msgstr ""
 
-#: src/file.c:2881
-msgid "RMS: Ajustement du volume moyen de chaque de fichier."
+#: src/file.c:2885
+msgid ""
+"RMS-ALBUM: Adjusting the average volume for a group of files according to "
+"the average level of deviation between them."
 msgstr ""
 
-#: src/file.c:2895
-msgid "(Click Droit = Menu) / ReplayGain: En attente de selection."
+#: src/file.c:2888
+msgid "RMS: Average volume amplification of each file."
 msgstr ""
 
-#: src/file.c:2898
-msgid "(Click Droit = Menu) / Mode piste."
+#: src/file.c:2902
+msgid "(Right Click = Menu) / ReplayGain: Waiting for selection."
 msgstr ""
 
-#: src/file.c:2901
-msgid "(Click Droit = Menu) / Mode album."
+#: src/file.c:2905
+msgid "(Right Click = Menu) / Track mode."
 msgstr ""
 
-#: src/file.c:2904
-msgid "(Click Droit = Menu) / Mode effacer."
+#: src/file.c:2908
+msgid "(Right Click = Menu) / Album mode."
 msgstr ""
 
-#: src/file.c:3016
+#: src/file.c:2911
+msgid "(Right Click = Menu) / Erase mode."
+msgstr ""
+
+#: src/file.c:3026
 msgid ""
-"(Click Droit = Menu) / Cliquez ici pour envoyer ce fichier apres traitement "
-"a la corbeille"
+"(Click Droit = Menu) / Click here to send the processed file to the trash"
 msgstr ""
 
-#: src/file.c:3019
+#: src/file.c:3029
 msgid ""
-"(Click Droit = Menu) / Ce fichier sera dirige apres traitement vers la "
-"corbeille"
+"(Right Click = Menu) / This file will be sent to the trash after processing"
 msgstr ""
 
-#: src/file.c:3152 src/file_trash.c:367 src/translate.c:367
+#: src/file.c:3163 src/file_trash.c:208 glade/xcfa_win_treeview.glade:757
 msgid "Trash"
 msgstr ""
 
-#: src/file.c:3172 src/file_mp3ogg.c:1212 src/file_tags.c:1178
-#: src/translate.c:368 src/translate.c:399 src/translate.c:410
+#: src/file.c:3183 src/file_mp3ogg.c:889 src/file_tags.c:1222
+#: glade/xcfa_win_treeview.glade:774 glade/xcfa_win_treeview.glade:1423
+#: glade/xcfa_win_treeview.glade:1672
 msgid "Type"
 msgstr ""
 
-#: src/file.c:3411
-msgid "ReplayGain"
-msgstr ""
-
-#: src/file_mp3ogg.c:771
-msgid "128 -defaut"
+#: src/file_conv.c:1187
+msgid "Error since MPLAYER !"
 msgstr ""
 
-#: src/file_mp3ogg.c:787
-msgid "V0 -meilleure qualite"
+#: src/file_conv.c:1188 src/file_conv.c:1200 src/file_mp3ogg_conv.c:337
+#: src/file_mp3ogg_conv.c:349
+msgid "You can enable XCFA command line with: "
 msgstr ""
 
-#: src/file_mp3ogg.c:791 src/file_mp3ogg.c:811
-msgid "V4 -defaut"
+#: src/file_conv.c:1190 src/file_conv.c:1202 src/file_mp3ogg_conv.c:339
+#: src/file_mp3ogg_conv.c:351
+msgid "$ xcfa -verbose"
 msgstr ""
 
-#: src/file_mp3ogg.c:796
-msgid "V9 -moins bonne qualite"
+#: src/file_conv.c:1192 src/file_mp3ogg_conv.c:341
+msgid "to see the type of error returned by mplayer."
 msgstr ""
 
-#: src/file_mp3ogg.c:849
-msgid "Defaut"
+#: src/file_conv.c:1199
+msgid "Error since SOX !"
 msgstr ""
 
-#: src/file_mp3ogg.c:884
-msgid "Qualite -1 -Moins bonne qualite"
+#: src/file_conv.c:1204 src/file_mp3ogg_conv.c:353
+msgid "to see the type of error returned by sox."
 msgstr ""
 
-#: src/file_mp3ogg.c:885 src/options_oggenc.c:149
-msgid "Qualite 0"
+#: src/file_mp3ogg.c:670
+msgid "Right click: access popup"
 msgstr ""
 
-#: src/file_mp3ogg.c:886 src/options_oggenc.c:150
-msgid "Qualite 1"
+#: src/file_mp3ogg.c:921
+msgid "New bitrate"
 msgstr ""
 
-#: src/file_mp3ogg.c:887 src/options_oggenc.c:151
-msgid "Qualite 2"
+#: src/file_mp3ogg.c:935 glade/xcfa_win_treeview.glade:1474
+msgid "Size"
 msgstr ""
 
-#: src/file_mp3ogg.c:888
-msgid "Qualite 3 -Defaut"
+#: src/file_mp3ogg_conv.c:329 src/file_mp3ogg_conv.c:331
+msgid "XCFA: Bitrate change"
 msgstr ""
 
-#: src/file_mp3ogg.c:889 src/options_oggenc.c:153
-msgid "Qualite 4"
+#: src/file_mp3ogg_conv.c:336
+msgid "Error from MPLAYER !"
 msgstr ""
 
-#: src/file_mp3ogg.c:890 src/options_oggenc.c:154
-msgid "Qualite 5"
+#: src/file_mp3ogg_conv.c:348
+msgid "Error from SOX !"
 msgstr ""
 
-#: src/file_mp3ogg.c:891 src/options_oggenc.c:155
-msgid "Qualite 6"
+#: src/file_mp3ogg_conv.c:432
+#, c-format
+msgid " WARNING : you need to install %s%s%s"
 msgstr ""
 
-#: src/file_mp3ogg.c:892 src/options_oggenc.c:156
-msgid "Qualite 7"
+#: src/file_mp3ogg_conv.c:440
+#, c-format
+msgid " WARNING : you need to install %s%s"
 msgstr ""
 
-#: src/file_mp3ogg.c:893 src/options_oggenc.c:157
-msgid "Qualite 8"
+#: src/file_mp3ogg_conv.c:447
+#, c-format
+msgid " WARNING : you need to install %s"
 msgstr ""
 
-#: src/file_mp3ogg.c:894 src/options_oggenc.c:158
-msgid "Qualite 9"
+#: src/file_mp3ogg_conv.c:454
+msgid "Package NOT FOUND !"
 msgstr ""
 
-#: src/file_mp3ogg.c:895
-msgid "Qualite 10 -Meilleure qualite"
+#: src/fileselect.c:105
+msgid "Choosing a destination folder"
 msgstr ""
 
-#: src/file_mp3ogg.c:926 src/options_oggenc.c:189 src/options_wavpack.c:186
-#: src/options_wavpack.c:209 src/options_wavpack.c:232
-msgid "Oui"
+#: src/fileselect.c:106
+msgid "Choosing a file CUE WAV FLAC OGG MP3 APE WMA"
 msgstr ""
 
-#: src/file_mp3ogg.c:927 src/options_oggenc.c:190 src/options_wavpack.c:153
-#: src/options_wavpack.c:185 src/options_wavpack.c:208
-#: src/options_wavpack.c:231 src/options_wavpack.c:252
-msgid "Non"
+#: src/fileselect.c:107
+msgid "Choosing a file musical"
 msgstr ""
 
-#: src/file_mp3ogg.c:949 src/options_oggenc.c:211
-msgid "Mono force"
+#: src/fileselect.c:108 src/fileselect.c:109
+msgid "Choosing a file"
 msgstr ""
 
-#: src/file_mp3ogg.c:950 src/options_oggenc.c:212
-msgid "Stereo"
+#: src/fileselect.c:110
+msgid "Choosing a WAV file"
 msgstr ""
 
-#: src/file_mp3ogg.c:1228 src/translate.c:400
-msgid "Bitrate"
+#: src/fileselect.c:111
+msgid "Choosing a MP3 OGG file"
 msgstr ""
 
-#: src/file_mp3ogg.c:1244
-msgid "Nouveau bitrate"
+#: src/fileselect.c:112
+msgid "Choosing a FLAC MPC OGG MP3 file"
 msgstr ""
 
-#: src/file_mp3ogg.c:1258
-msgid "Taille"
+#: src/fileselect.c:113
+msgid "Import pictures for the cover"
 msgstr ""
 
-#: src/file_mp3ogg_conv.c:300 src/file_mp3ogg_conv.c:302
-msgid "XCFA: Modification bitrate"
+#: src/fileselect.c:114
+msgid "Choosing an Image Storage path"
 msgstr ""
 
-#: src/file_mp3ogg_conv.c:379
-#, c-format
-msgid " ATTENTION: Il faut installer %s%s%s"
+#: src/fileselect.c:115
+msgid "Choosing a place for backup"
 msgstr ""
 
-#: src/file_mp3ogg_conv.c:387
-#, c-format
-msgid " ATTENTION: Il faut installer %s%s"
+#: src/fileselect.c:396 src/fileselect.c:415 src/fileselect.c:703
+msgid "Cancel"
 msgstr ""
 
-#: src/file_mp3ogg_conv.c:394
-#, c-format
-msgid " ATTENTION: Il faut installer %s"
+#: src/fileselect.c:398 src/fileselect.c:417 src/fileselect.c:705
+msgid "Open"
 msgstr ""
 
-#: src/file_mp3ogg_conv.c:400
-msgid "Package NOT FOUND !"
+#: src/fileselect.c:494 src/fileselect.c:617 src/fileselect.c:627
+#: src/fileselect.c:650
+msgid "All Files (*.*)"
 msgstr ""
 
-#: src/fileselect.c:116
-msgid "Choix d'un dossier de destination"
+#: src/file_trash.c:211
+msgid "Trash files ..."
 msgstr ""
 
-#: src/fileselect.c:117
-msgid "Choix d'un fichier CUE WAV FLAC OGG MP3 APE WMA"
+#: src/file_wav.c:485
+msgid "(Right Click = Menu) / Select frequency"
 msgstr ""
 
-#: src/fileselect.c:118
-msgid "Choix d'un fichier musical"
+#: src/file_wav.c:488
+msgid "(Right Click = Menu) / Select number of tracks (channels)"
 msgstr ""
 
-#: src/fileselect.c:119
-msgid "Choix d'un fichier"
+#: src/file_wav.c:491
+msgid "(Right Click = Menu) / Encoding selection in number of bits"
 msgstr ""
 
-#: src/fileselect.c:120
-msgid "Choix de fichiers"
+#: src/file_wav.c:739
+msgid "Frequency"
 msgstr ""
 
-#: src/fileselect.c:121
-msgid "Choix de fichiers WAV"
+#: src/file_wav.c:755
+msgid "FREQUENCY"
 msgstr ""
 
-#: src/fileselect.c:122
-msgid "Choix de fichiers MP3/OGG"
+#: src/file_wav.c:769
+msgid "Track"
 msgstr ""
 
-#: src/fileselect.c:123
-msgid "Choix de fichiers FLAC MPC OGG MP3"
+#: src/file_wav.c:785
+msgid "TRACK"
 msgstr ""
 
-#: src/fileselect.c:124
-msgid "Importer des images pour la pochette"
+#: src/file_wav.c:799
+msgid "Quantification"
 msgstr ""
 
-#: src/fileselect.c:125
-msgid "Choix d'un chemin de stockage des images"
+#: src/file_wav.c:815
+msgid "QUANTIFICATION"
 msgstr ""
 
-#: src/fileselect.c:126
-msgid "Choix d'un lieu de sauvegarde"
+#: src/file_wav_conv.c:261
+#, c-format
+msgid "%s Copy file: %d%%"
 msgstr ""
 
-#: src/fileselect.c:475 src/fileselect.c:591 src/fileselect.c:599
-#: src/fileselect.c:622
-msgid "All Files (*.*)"
+#: src/file_wav_conv.c:271
+#, c-format
+msgid "%s Return file: %d%%"
 msgstr ""
 
-#: src/file_trash.c:368
-msgid "Trash files ..."
+#: src/file_wav_conv.c:281
+#, c-format
+msgid "%s Use Sox: %d%%"
 msgstr ""
 
-#: src/file_wav.c:629
-msgid "(Click Droit = Menu) / Choix de la frequence"
+#: src/file_wav_conv.c:298
+#, c-format
+msgid "%s Use Mplayer: %d%%"
 msgstr ""
 
-#: src/file_wav.c:632
-msgid "(Click Droit = Menu) / Choix du nombre de pistes (voies)"
+#: src/file_wav_conv.c:343 src/file_wav_conv.c:345
+msgid "XCFA: Conversions WAV TO WAV"
 msgstr ""
 
-#: src/file_wav.c:635
-msgid "(Click Droit = Menu) / Choix du codage en nombre de bits"
+#: src/main.c:644
+msgid "ADMINISTRATOR MODE"
 msgstr ""
 
-#: src/file_wav.c:861
-msgid "Frequence"
+#: src/main.c:646
+msgid " You should not use "
 msgstr ""
 
-#: src/file_wav.c:877
-msgid "FREQUENCE"
+#: src/main.c:648
+msgid " XCFA under ROOT !"
 msgstr ""
 
-#: src/file_wav.c:891
-msgid "Piste"
+#: src/options.c:169
+msgid "ERROR : storage location not permitted !"
 msgstr ""
 
-#: src/file_wav.c:907
-msgid "PISTE"
+#: src/options.c:170
+msgid "Please start again."
 msgstr ""
 
-#: src/file_wav.c:921
-msgid "Quantification"
+#: src/options_cd.c:122
+msgid "To assess the templates, you must enable a reading cdaudio"
 msgstr ""
 
-#: src/file_wav.c:937
-msgid "QUANTIFICATION"
+#: src/options_faac.c:94
+msgid "Transport Stream (ADTS) - Extension .aac"
 msgstr ""
 
-#: src/file_wav_conv.c:265
-#, c-format
-msgid "%s Copie fichier: %d%%"
+#: src/options_faac.c:95
+msgid "MPEG-4 File Format (MP4) - Extension .m4a"
 msgstr ""
 
-#: src/file_wav_conv.c:275
-#, c-format
-msgid "%s Restitution fichier: %d%%"
+#: src/options_flac.c:65
+msgid "0 (Fast)"
 msgstr ""
 
-#: src/file_wav_conv.c:285
-#, c-format
-msgid "%s Traitement Sox: %d%%"
+#: src/options_flac.c:73
+msgid "8 (Low)"
 msgstr ""
 
-#: src/file_wav_conv.c:302
-#, c-format
-msgid "%s Traitement Mplayer: %d%%"
+#: src/options_mp3.c:276
+msgid "V0 (Best quality)"
 msgstr ""
 
-#: src/file_wav_conv.c:349 src/file_wav_conv.c:351
-msgid "XCFA: Conversions WAV TO WAV"
+#: src/options_mp3.c:285
+msgid "V9 (Poor quality)"
 msgstr ""
 
-#: src/main.c:372
-msgid "= Adressage memoire invalide\n"
+#: src/options_musepack.c:68
+msgid "telephone: lowest quality : 32 .. 48 kbit/s"
 msgstr ""
 
-#: src/main.c:375
-msgid "= Vous avez probablement trouve un bug dans XCFA\n"
+#: src/options_musepack.c:69
+msgid "thumb : low quality/internet : 58 .. 86 kbit/s"
 msgstr ""
 
-#: src/main.c:676
-msgid "MODE ADMINISTRATEUR"
+#: src/options_musepack.c:70
+msgid "radio : medium (MP3) quality : 112 .. 152 kbit/s"
 msgstr ""
 
-#: src/main.c:678
-msgid " Vous ne devriez pas utiliser "
+#: src/options_musepack.c:71
+msgid "standard : high quality (dflt) : 142 .. 184 kbit/s"
 msgstr ""
 
-#: src/main.c:680
-msgid " XCFA sous ROOT !"
+#: src/options_musepack.c:72
+msgid "xtreme : extreme high quality : 168 .. 212 kbit/s"
 msgstr ""
 
-#: src/options.c:175
-msgid "ERREUR: Lieu de stockage non autorise !"
+#: src/options_musepack.c:73
+msgid "insane : extreme high quality : 232 .. 268 kbit/s"
 msgstr ""
 
-#: src/options.c:176
-msgid "Veuillez recommencer."
+#: src/options_musepack.c:74
+msgid "braindead : extreme high quality : 232 .. 278 kbit/s"
 msgstr ""
 
-#: src/options_cd.c:120
-msgid "Pour evaluer les templates, vous devez activer une lecture de cdaudio"
+#: src/options_oggenc.c:137
+msgid "Quality -1 (Poor quality)"
 msgstr ""
 
-#: src/options_faac.c:101
-msgid "Transport Stream (ADTS) - Extension .aac"
+#: src/options_oggenc.c:138 src/popup.c:1294
+msgid "Quality 0"
 msgstr ""
 
-#: src/options_faac.c:102
-msgid "MPEG-4 File Format (MP4) - Extension .m4a"
+#: src/options_oggenc.c:139 src/popup.c:1294
+msgid "Quality 1"
 msgstr ""
 
-#: src/options_flac.c:72
-msgid "0 (Rapide)"
+#: src/options_oggenc.c:140 src/popup.c:1294
+msgid "Quality 2"
 msgstr ""
 
-#: src/options_flac.c:80
-msgid "8 (Lent)"
+#: src/options_oggenc.c:141
+msgid "Quality 3"
 msgstr ""
 
-#: src/options_mp3.c:298
-msgid "V0 (meilleure qualite)"
+#: src/options_oggenc.c:142 src/popup.c:1295
+msgid "Quality 4"
 msgstr ""
 
-#: src/options_mp3.c:307
-msgid "V9 (moins bonne qualite)"
+#: src/options_oggenc.c:143 src/popup.c:1295
+msgid "Quality 5"
 msgstr ""
 
-#: src/options_musepack.c:75
-msgid "telephone: lowest quality : 32 .. 48 kbit/s"
+#: src/options_oggenc.c:144 src/popup.c:1295
+msgid "Quality 6"
 msgstr ""
 
-#: src/options_musepack.c:76
-msgid "thumb : low quality/internet : 58 .. 86 kbit/s"
+#: src/options_oggenc.c:145 src/popup.c:1295
+msgid "Quality 7"
 msgstr ""
 
-#: src/options_musepack.c:77
-msgid "radio : medium (MP3) quality : 112 .. 152 kbit/s"
+#: src/options_oggenc.c:146 src/popup.c:1296
+msgid "Quality 8"
 msgstr ""
 
-#: src/options_musepack.c:78
-msgid "standard : high quality (dflt) : 142 .. 184 kbit/s"
+#: src/options_oggenc.c:147 src/popup.c:1296
+msgid "Quality 9"
 msgstr ""
 
-#: src/options_musepack.c:79
-msgid "xtreme : extreme high quality : 168 .. 212 kbit/s"
-msgstr ""
-
-#: src/options_musepack.c:80
-msgid "insane : extreme high quality : 232 .. 268 kbit/s"
+#: src/options_oggenc.c:148
+msgid "Quality 10 (Best quality)"
 msgstr ""
 
-#: src/options_musepack.c:81
-msgid "braindead : extreme high quality : 232 .. 278 kbit/s"
+#: src/options_oggenc.c:176 src/options_wavpack.c:173
+#: src/options_wavpack.c:194 src/options_wavpack.c:215 src/popup.c:1298
+msgid "Yes"
 msgstr ""
 
-#: src/options_oggenc.c:148
-msgid "Qualite -1 (Moins bonne qualite)"
+#: src/options_oggenc.c:177 src/options_wavpack.c:142
+#: src/options_wavpack.c:172 src/options_wavpack.c:193
+#: src/options_wavpack.c:214 src/options_wavpack.c:233 src/popup.c:1298
+msgid "No"
 msgstr ""
 
-#: src/options_oggenc.c:152
-msgid "Qualite 3"
+#: src/options_oggenc.c:196
+msgid "Force mono"
 msgstr ""
 
-#: src/options_oggenc.c:159
-msgid "Qualite 10 (Meilleure qualite)"
+#: src/options_oggenc.c:197
+msgid "Stereo"
 msgstr ""
 
-#: src/options_wavpack.c:105
-msgid "Mode normal"
+#: src/options_wavpack.c:98
+msgid "Standard"
 msgstr ""
 
-#: src/options_wavpack.c:106
-msgid "Mode rapide de compression"
+#: src/options_wavpack.c:99
+msgid "Fast (Faster encode and decode)"
 msgstr ""
 
-#: src/options_wavpack.c:107
-msgid "Bonne qualite de compression"
+#: src/options_wavpack.c:100
+msgid "High quality (Better compression ratio)"
 msgstr ""
 
-#: src/options_wavpack.c:108
-msgid "Meilleure qualite de compression"
+#: src/options_wavpack.c:101
+msgid "Very high quality (Best compression but slowest)"
 msgstr ""
 
-#: src/options_wavpack.c:134
+#: src/options_wavpack.c:125
 msgid "stereo left/right"
 msgstr ""
 
-#: src/options_wavpack.c:135
+#: src/options_wavpack.c:126
 msgid "stereo mid/side"
 msgstr ""
 
-#: src/options_wavpack.c:253
+#: src/options_wavpack.c:234
 msgid "1 (fast / rapide)"
 msgstr ""
 
-#: src/options_wavpack.c:258
+#: src/options_wavpack.c:239
 msgid "6 (very slow / tres lent)"
 msgstr ""
 
-#: src/play_file.c:112
-msgid "PAS de lecteur audio present"
+#: src/play_file.c:107
+msgid "NO audio player present"
 msgstr ""
 
-#: src/play_file.c:113
-msgid "Veuillez installez un lecteur audio."
+#: src/play_file.c:108
+msgid "Please install an audio player."
 msgstr ""
 
-#: src/poche_dir.c:436
+#: src/poche_dir.c:433
 msgid ""
 "Utilisez le glisser / deplacer - Effacer une image avec Ctrl + "
 "Click"
 msgstr ""
 
 #: src/poche_save.c:117
-msgid "Nom de fichier absent !!"
+msgid "File name not found !!"
 msgstr ""
 
-#: src/poche_save.c:118 src/poche_web.c:361 src/poche_web.c:382
-msgid "Pour resoudre ce probleme:"
+#: src/poche_save.c:118 src/poche_web.c:323 src/poche_web.c:345
+msgid "To solve this problem :"
 msgstr ""
 
 #: src/poche_save.c:121
-msgid "Saisissez un nom de fichier sans extention"
-msgstr ""
-
-#: src/poche_save.c:132
-msgid "Sauvegarde aux formats PDF et PostScript"
+msgid "Enter a file name without extension"
 msgstr ""
 
-#: src/poche_save.c:157
-msgid "Sauvegarde au format PNG"
+#: src/poche_save.c:131
+msgid "Saving to PDF"
 msgstr ""
 
-#: src/poche_web.c:360
-msgid "Aucun fichier trouve !"
+#: src/poche_web.c:322
+msgid "No file found !"
 msgstr ""
 
-#: src/poche_web.c:364
-msgid "Modifiez la chaine de recherche et"
+#: src/poche_web.c:326 src/poche_web.c:348
+msgid "Modify the search parameters and"
 msgstr ""
 
-#: src/poche_web.c:366 src/poche_web.c:387
-msgid "recommencez."
+#: src/poche_web.c:328 src/poche_web.c:350
+msgid "start again."
 msgstr ""
 
-#: src/poche_web.c:381
-msgid "Critere de recherche absent !!"
+#: src/poche_web.c:344
+msgid "Search criteria away !!"
 msgstr ""
 
-#: src/poche_web.c:385
-msgid "Saisissez une chaine de recherche et"
+#: src/poche_web.c:362
+msgid "[Search images files]"
 msgstr ""
 
-#: src/poche_web.c:394
-msgid "[Recherche des fichiers images]"
-msgstr ""
-
-#: src/popup.c:87 src/popup.c:106
+#: src/popup.c:81 src/popup.c:100
 msgid " Deselection globale"
 msgstr ""
 
-#: src/popup.c:88 src/popup.c:107 src/popup.c:168
+#: src/popup.c:82 src/popup.c:101 src/popup.c:162
 msgid " Deselection verticale"
 msgstr ""
 
-#: src/popup.c:89 src/popup.c:108
+#: src/popup.c:83 src/popup.c:102
 msgid " Deselection horizontale"
 msgstr ""
 
-#: src/popup.c:90 src/popup.c:93 src/popup.c:109 src/popup.c:112
-#: src/popup.c:126 src/popup.c:139 src/popup.c:153
+#: src/popup.c:84 src/popup.c:87 src/popup.c:103 src/popup.c:106
+#: src/popup.c:120 src/popup.c:133 src/popup.c:147
 msgid " ---"
 msgstr ""
 
-#: src/popup.c:91 src/popup.c:110
+#: src/popup.c:85 src/popup.c:104
 msgid " Selection verticale"
 msgstr ""
 
-#: src/popup.c:92 src/popup.c:111
+#: src/popup.c:86 src/popup.c:105
 msgid " Selection Expert verticale"
 msgstr ""
 
-#: src/popup.c:94 src/popup.c:113
+#: src/popup.c:88 src/popup.c:107
 msgid " Selection horizontale"
 msgstr ""
 
-#: src/popup.c:95 src/popup.c:114
+#: src/popup.c:89 src/popup.c:108
 msgid " Selection Expert horizontale "
 msgstr ""
 
-#: src/popup.c:125 src/popup.c:138
+#: src/popup.c:119 src/popup.c:132
 msgid " Deselection verticale "
 msgstr ""
 
-#: src/popup.c:127 src/popup.c:140
+#: src/popup.c:121 src/popup.c:134
 msgid " Selection verticale "
 msgstr ""
 
-#: src/popup.c:151
+#: src/popup.c:145
 msgid "---SELECTION VERTICALE-----"
 msgstr ""
 
-#: src/popup.c:152
+#: src/popup.c:146
 msgid " Deselection verticale "
 msgstr ""
 
-#: src/popup.c:154
+#: src/popup.c:148
 msgid " Selection PISTE "
 msgstr ""
 
-#: src/popup.c:155
+#: src/popup.c:149
 msgid " Selection ALBUM "
 msgstr ""
 
-#: src/popup.c:156
+#: src/popup.c:150
 msgid " Selection NETTOYER "
 msgstr ""
 
-#: src/popup.c:167
+#: src/popup.c:161
 msgid "---MENU TRASH--------------"
 msgstr ""
 
-#: src/popup.c:169
+#: src/popup.c:163
 msgid " Selection verticale "
 msgstr ""
 
-#: src/popup.c:544 src/popup.c:752 src/popup.c:968
-msgid "Cellule"
-msgstr ""
-
-#: src/popup.c:551 src/popup.c:577
-msgid "1 piste"
-msgstr ""
-
-#: src/popup.c:554 src/popup.c:580
-msgid "2 pistes"
-msgstr ""
-
-#: src/popup.c:557 src/popup.c:583
-msgid "4 pistes"
-msgstr ""
-
-#: src/popup.c:560 src/popup.c:586
-msgid "6 pistes"
-msgstr ""
-
-#: src/popup.c:566 src/popup.c:592 src/popup.c:786 src/popup.c:824
-#: src/popup.c:993 src/popup.c:1023
-msgid "Valeur d'origine"
-msgstr ""
-
-#: src/popup.c:570 src/popup.c:790 src/popup.c:997
-msgid "Colonne"
-msgstr ""
-
-#: src/popup.c:759 src/popup.c:797
-msgid " 8000 Hertz"
-msgstr ""
-
-#: src/popup.c:762 src/popup.c:800
-msgid "22000 Hertz"
-msgstr ""
-
-#: src/popup.c:765 src/popup.c:803
-msgid "32000 Hertz"
-msgstr ""
-
-#: src/popup.c:768 src/popup.c:806
-msgid "44056 Hertz"
-msgstr ""
-
-#: src/popup.c:771 src/popup.c:809
-msgid "44100 Hertz"
-msgstr ""
-
-#: src/popup.c:774 src/popup.c:812
-msgid "48000 Hertz"
-msgstr ""
-
-#: src/popup.c:777 src/popup.c:815
-msgid "88200 Hertz"
-msgstr ""
-
-#: src/popup.c:780 src/popup.c:818
-msgid "96000 Hertz"
-msgstr ""
-
-#: src/popup.c:975 src/popup.c:1004
-msgid " 8 bits"
-msgstr ""
-
-#: src/popup.c:978 src/popup.c:1008
-msgid "16 bits"
+#: src/popup.c:504 src/popup.c:619 src/popup.c:715
+msgid "Original value"
 msgstr ""
 
-#: src/popup.c:981 src/popup.c:1011
-msgid "24 bits"
+#: src/popup.c:765
+msgid "Next selector"
 msgstr ""
 
-#: src/popup.c:984 src/popup.c:1014
-msgid "32 bits"
+#: src/popup.c:769
+msgid "Previous selector"
 msgstr ""
 
-#: src/popup.c:987 src/popup.c:1017
-msgid "64 bits"
+#: src/popup.c:777
+msgid "Delete the active range"
 msgstr ""
 
-#: src/popup.c:1089
-msgid "Selecteur suivant"
+#: src/popup.c:850
+msgid "Flip Horizontal"
 msgstr ""
 
-#: src/popup.c:1093
-msgid "Selecteur precedant"
+#: src/popup.c:854
+msgid "Flip Vertical"
 msgstr ""
 
-#: src/popup.c:1101
-msgid "Supprimer la plage active"
+#: src/popup.c:862
+msgid "Foreground image"
 msgstr ""
 
-#: src/popup.c:1173
-msgid "Retourner horizontalement"
+#: src/popup.c:866
+msgid "Image above"
 msgstr ""
 
-#: src/popup.c:1177
-msgid "Retourner verticalement"
+#: src/popup.c:870
+msgid "Image below"
 msgstr ""
 
-#: src/popup.c:1185
-msgid "Image au premier plan"
+#: src/popup.c:874
+msgid "Image to the background"
 msgstr ""
 
-#: src/popup.c:1189
-msgid "Image au dessus"
+#: src/popup.c:882
+msgid "Clear image"
 msgstr ""
 
-#: src/popup.c:1193
-msgid "Image en dessous"
+#: src/popup.c:920
+msgid "Remove image from the list"
 msgstr ""
 
-#: src/popup.c:1197
-msgid "Image au dernier plan"
+#: src/popup.c:1111
+msgid "V0 [ best quality ]"
 msgstr ""
 
-#: src/popup.c:1205
-msgid "Effacer l'image"
+#: src/popup.c:1111 src/popup.c:1114
+msgid "V4 [ default ]"
 msgstr ""
 
-#: src/popup.c:1242
-msgid "Supprimer l'image de la liste"
+#: src/popup.c:1111
+msgid "V9 [ Lower quality ]"
 msgstr ""
 
-#: src/popup_systray.c:127
-msgid " Cacher Xcfa "
+#: src/popup.c:1294
+msgid "Quality -1 [ Lower quality ]"
 msgstr ""
 
-#: src/popup_systray.c:130
-msgid " Montrer Xcfa "
+#: src/popup.c:1295
+msgid "Quality 3 [ Defaut ]"
 msgstr ""
 
-#: src/popup_systray.c:150
-msgid " Quitter Xcfa "
+#: src/popup.c:1296
+msgid "Quality 10 [ Best Quality ]"
 msgstr ""
 
-#: src/popup_systray.c:201
-msgid ""
-"XCFA\n"
-"Programme pour convertir les fichiers audio."
-msgstr ""
-
-#: src/prg_init.c:90
+#: src/prg_init.c:85
 msgid " Decode ATSC A/52 audio streams"
 msgstr ""
 
-#: src/prg_init.c:101
+#: src/prg_init.c:96
 msgid " AAC+ encoder"
 msgstr ""
 
-#: src/prg_init.c:112 src/prg_init.c:178
+#: src/prg_init.c:107 src/prg_init.c:173
 msgid " Extracteur cd audio"
 msgstr ""
 
-#: src/prg_init.c:123
+#: src/prg_init.c:118
 msgid " Read CD and get CDDB discid information"
 msgstr ""
 
-#: src/prg_init.c:134
+#: src/prg_init.c:129
 msgid " Cherche des renseignements sur les formats mp3"
 msgstr ""
 
-#: src/prg_init.c:145
+#: src/prg_init.c:140
 msgid " Audio Codeur freeware"
 msgstr ""
 
-#: src/prg_init.c:156
+#: src/prg_init.c:151
 msgid " MPEG-4 AAC decodeur"
 msgstr ""
 
-#: src/prg_init.c:167
+#: src/prg_init.c:162
 msgid " Conversion wav : flac"
 msgstr ""
 
-#: src/prg_init.c:189
+#: src/prg_init.c:184
 msgid " Conversion wav : mp3"
 msgstr ""
 
-#: src/prg_init.c:200
+#: src/prg_init.c:195
 msgid " Cherche les informations d'un dvd"
 msgstr ""
 
-#: src/prg_init.c:212
+#: src/prg_init.c:207
 msgid " Monkey's Audio Console Front End : APE"
 msgstr ""
 
-#: src/prg_init.c:224 src/prg_init.c:235
+#: src/prg_init.c:219 src/prg_init.c:230
 msgid " MusePack commandline utilities"
 msgstr ""
 
-#: src/prg_init.c:246
+#: src/prg_init.c:241
 msgid " Lecteur et extracteur"
 msgstr ""
 
-#: src/prg_init.c:257
+#: src/prg_init.c:252
 msgid " Normaliseur de fichier mp3"
 msgstr ""
 
-#: src/prg_init.c:268
+#: src/prg_init.c:263
 msgid " Normaliseur de fichier wav"
 msgstr ""
 
-#: src/prg_init.c:279
+#: src/prg_init.c:274
 msgid " A program to send desktop notifications"
 msgstr ""
 
-#: src/prg_init.c:290
+#: src/prg_init.c:285
 msgid " Forte compression au format wave"
 msgstr ""
 
-#: src/prg_init.c:301
+#: src/prg_init.c:296
 msgid " Decoupage de fichiers sans decodage"
 msgstr ""
 
-#: src/prg_init.c:312
+#: src/prg_init.c:307
 msgid " Transformation universelle de fichiers son"
 msgstr ""
 
-#: src/prg_init.c:323
+#: src/prg_init.c:318
 msgid " Conversion wav : ogg"
 msgstr ""
 
-#: src/prg_init.c:334
+#: src/prg_init.c:329
 msgid " Normaliseur de fichier ogg"
 msgstr ""
 
-#: src/prg_init.c:345
+#: src/prg_init.c:340
 msgid " WAVPACK Hybrid Lossless Audio Compressor"
 msgstr ""
 
-#: src/prg_init.c:362
-msgid " ... les paquets: deb "
+#: src/prg_init.c:357
+msgid " ... Packets: deb "
 msgstr ""
 
-#: src/prg_init.c:368
-msgid " ... les paquets: tgz "
+#: src/prg_init.c:363
+msgid " ... Packets: tgz "
 msgstr ""
 
-#: src/prg_init.c:374
-msgid " ... les paquets: fpm "
+#: src/prg_init.c:369
+msgid " ... Packets: fpm "
 msgstr ""
 
-#: src/prg_init.c:380
-msgid " ... les paquets: rpm "
+#: src/prg_init.c:375
+msgid " ... Packets: rpm "
 msgstr ""
 
-#: src/prg_init.c:386
-msgid " ... les paquets: pkg.tar.xz "
+#: src/prg_init.c:381
+msgid " ... Packets: pkg.tar.xz "
 msgstr ""
 
-#: src/prg_init.c:392
-msgid " ... les paquets: ? "
+#: src/prg_init.c:387
+msgid " ... Packets: ? "
 msgstr ""
 
-#: src/prg_init.c:628
+#: src/prg_init.c:623
 msgid "Status"
 msgstr ""
 
-#: src/prg_init.c:642
-msgid "Paquet"
+#: src/prg_init.c:637
+msgid "Packets"
 msgstr ""
 
-#: src/prg_init.c:657
+#: src/prg_init.c:652
 msgid "Action"
 msgstr ""
 
-#: src/scan.c:260
-msgid "PACKAGE dvd+rw-tools ABSENT"
+#: src/scan.c:259
+msgid "PACKAGE dvd+rw-tools is missing"
 msgstr ""
 
-#: src/scan.c:261
-msgid "Le package 'dvd+rw-tools' est absent"
+#: src/scan.c:260
+msgid "The package 'imagemagick' is missing"
 msgstr ""
 
-#: src/scan.c:263
-msgid "de votre systeme !"
+#: src/scan.c:262
+msgid "on your system !"
 msgstr ""
 
-#: src/scan.c:265
-msgid "Veuillez l'installer car j'ai besoin de"
+#: src/scan.c:264 src/split.c:438
+msgid "Please install it and resume"
 msgstr ""
 
-#: src/scan.c:267
-msgid "'dvd+rw-mediainfo' pour identifier le(s)"
+#: src/scan.c:266
+msgid "'Dvd + rw-mediainfo' to identify the"
 msgstr ""
 
-#: src/scan.c:269
-msgid "lecteur(s) de cd / dvd."
+#: src/scan.c:268
+msgid "reader of cd / dvd."
 msgstr ""
 
-#: src/split.c:284
+#: src/split.c:297
 msgid ""
-"Menu: Click droit / Ajout plage: Click bouton centre / Zoom: Ctrl+Scroll"
+"Menu: right click / Adding track: Click the center button / Zoom: Ctrl"
+"+Scroll"
 msgstr ""
 
-#: src/split.c:287
-msgid "Ajout plage: Click bouton centre / Zoom: Ctrl+Scroll"
+#: src/split.c:300
+msgid "Adding track: Click the center button / Zoom: Ctrl+Scroll"
 msgstr ""
 
-#: src/split.c:291
-msgid ""
-"Pret pour l'import d'un fichier CUE, WAV, FLAC, OGG, MP3, APE, WMA"
+#: src/split.c:304
+msgid "Ready for imports and a CUE file, WAV, FLAC, OGG, MP3, APE, WMA"
+msgstr ""
+
+#: src/split.c:378 src/split.c:407
+msgid "This file belongs XCFA"
 msgstr ""
 
-#: src/split.c:360 src/split.c:387
-msgid "Ce fichier appartient a XCFA"
+#: src/split.c:379 src/split.c:408
+msgid "Select another file."
 msgstr ""
 
-#: src/split.c:361 src/split.c:388
-msgid "Selectionnez un autre fichier."
+#: src/split.c:387
+msgid "Empty file"
 msgstr ""
 
-#: src/split.c:368
-msgid "Fichier vide"
+#: src/split.c:388
+msgid "The file contains no data !!!"
 msgstr ""
 
-#: src/split.c:369
-msgid "Le fichier ne contient aucune donnee !!!"
+#: src/split.c:433
+msgid "Sox and Mplayer not found"
 msgstr ""
 
-#: src/split.c:412
-msgid "Sox et Mplayer absents"
+#: src/split.c:434
+msgid "Sox et Mplayer are not found"
 msgstr ""
 
-#: src/split.c:413
-msgid "Sox et Mplayer sont absents de votre"
+#: src/split.c:436
+msgid "in your configuration."
 msgstr ""
 
-#: src/split.c:415
-msgid "configuration."
+#: src/split.c:492
+msgid "Error file select"
 msgstr ""
 
-#: src/split.c:417
-msgid "Veuillez les installer pour pouvoir continuer."
+#: src/split.c:493
+msgid "Please select a file type of MP3 WAV OGG FLAC APE"
 msgstr ""
 
-#: src/split.c:467
-msgid "Erreur de choix de fichier"
+#: src/split.c:531 src/split.c:603
+msgid "Wrong type of file"
 msgstr ""
 
-#: src/split.c:468
-msgid "Veuillez selectionner un fichier de type WAV FLAC MP3 OGG APE"
+#: src/split.c:532 src/split.c:604
+msgid ""
+"File types accepted\n"
+"sare: WAV FLAC MP3 OGG APE WMA CUE"
 msgstr ""
 
-#: src/split.c:504 src/split.c:577
-msgid "Mauvais type de fichier"
+#: src/split_conv.c:316 src/split_conv.c:333
+msgid "SOX Error"
 msgstr ""
 
-#: src/split.c:505 src/split.c:578
-msgid ""
-"Les types de fichiers acceptes\n"
-"sont: WAV FLAC MP3 OGG APE WMA CUE"
+#: src/split_conv.c:317 src/split_conv.c:334
+msgid "The SOX program on your distribution"
 msgstr ""
 
-#: src/split_conv.c:312 src/split_conv.c:328
-msgid "Erreur SOX"
+#: src/split_conv.c:319 src/split_conv.c:336
+msgid "has generated an error during conversion."
 msgstr ""
 
-#: src/split_conv.c:313 src/split_conv.c:329
-msgid "Le programme SOX de votre distribution"
+#: src/split_cue.c:116
+msgid "Misreading !"
 msgstr ""
 
-#: src/split_conv.c:315 src/split_conv.c:331
-msgid "a generer une erreur pendant la conversion."
+#: src/split_cue.c:177 src/split_cue.c:187 src/split_cue.c:196
+msgid "Error"
 msgstr ""
 
-#: src/split_cue.c:121
-msgid "Erreur de lecture !"
+#: src/split_cue.c:178
+msgid "No music file associated with the cue-file"
 msgstr ""
 
-#: src/split_cue.c:181 src/split_cue.c:190 src/split_cue.c:199
-msgid "Erreur"
+#: src/split_cue.c:188
+msgid "No WAV file in the cue-file"
 msgstr ""
 
-#: src/split_cue.c:182
-msgid "Aucun fichier de musique associe au cue-file !"
+#: src/split_cue.c:197
+msgid "No music file in the folder associated"
 msgstr ""
 
-#: src/split_cue.c:191
-msgid "Pas de fichier WAV dans le cue-file !"
+#: src/split_cue.c:199
+msgid "of cue-file"
 msgstr ""
 
-#: src/split_cue.c:200
-msgid "Aucun fichier de musique associe dans le dossier"
+#: src/split_cue.c:293
+msgid "Data errors in the CUE file"
 msgstr ""
 
-#: src/split_cue.c:202
-msgid "du cue-file"
+#: src/split_cue.c:294
+msgid "The solution is to import the file"
 msgstr ""
 
-#: src/split_cue.c:288
-msgid "Erreur de donnees dans le fichier CUE"
+#: src/split_cue.c:296
+msgid "music that will be recognized and pre-cutting"
 msgstr ""
 
-#: src/split_cue.c:289
-msgid "La solution est d'importer le fichier de"
+#: src/split_cue.c:298
+msgid "in the split module."
 msgstr ""
 
-#: src/split_cue.c:291
-msgid "musique qui sera reconnu et pre-decoupe"
+#: src/split_cue.c:300
+msgid "We will just adjust to the beaches"
 msgstr ""
 
-#: src/split_cue.c:293
-msgid "dans le module Split."
+#: src/split_cue.c:302
+msgid "generate a new cue-file or cuts"
 msgstr ""
 
-#: src/split_cue.c:295
-msgid "Il ne restera qu'a ajuster les plages pour"
+#: src/split_cue.c:304
+msgid "corresponding to the beaches."
 msgstr ""
 
-#: src/split_cue.c:297
-msgid "generer un nouveau cue-file ou des decoupes"
+#: src/split_selector.c:136
+msgid "Deleting not during playback"
 msgstr ""
 
-#: src/split_cue.c:299
-msgid "correspondant aux plages."
+#: src/split_selector.c:231 src/split_selector.c:237 src/split_selector.c:291
+#: src/split_selector.c:297 src/split_selector.c:354 src/split_selector.c:361
+#: src/split_selector.c:431 src/split_selector.c:437
+msgid "Time of less than 5 seconds between marker and cursor !"
 msgstr ""
 
-#: src/split_selector.c:141
-msgid "Suppression pendant la lecture impossible"
+#: src/web.c:173 src/web.c:221
+msgid "No web browser"
 msgstr ""
 
-#: src/split_selector.c:234 src/split_selector.c:240 src/split_selector.c:294
-#: src/split_selector.c:300 src/split_selector.c:357 src/split_selector.c:364
-#: src/split_selector.c:434 src/split_selector.c:440
-msgid "Temps inferieur a 5 secondes entre marqueur et curseur !"
+#: src/web.c:174 src/web.c:222
+msgid "No Web access: no web browser"
 msgstr ""
 
-#: src/translate.c:55
-msgid "Fichier"
+#: src/web.c:176 src/web.c:224
+msgid "found in your system."
 msgstr ""
 
-#: src/translate.c:56
-msgid "Quitter"
+#: src/web.c:178 src/web.c:226
+msgid "Please install a web browser."
 msgstr ""
 
-#: src/translate.c:57
-msgid "Outils"
+#: src/web.c:188
+msgid "You need to enable web access"
 msgstr ""
 
-#: src/translate.c:58
-msgid "Visibilite des champs"
+#: src/web.c:236
+msgid "Application is missing."
 msgstr ""
 
-#: src/translate.c:59
-msgid "Aide"
+#: src/web.c:237
+msgid "Please install : "
 msgstr ""
 
-#: src/translate.c:60
-msgid "A propos"
+#: src/win_about.c:124
+msgid " Xcfa on the web"
 msgstr ""
 
-#: src/translate.c:61 src/translate.c:71
-msgid "Lecture"
+#: src/win_about.c:174
+msgid ""
+"\n"
+"Au tout debut:\n"
+"\n"
+"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
+"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
+"... ;-)\n"
+"\n"
+""
+msgstr ""
+
+#: src/win_scan.c:170
+msgid "Waiting ..."
+msgstr ""
+
+#: glade/xcfa.glade:66 glade/xcfa.glade:2533
+msgid "File"
+msgstr ""
+
+#: glade/xcfa.glade:75
+msgid "Quit"
 msgstr ""
 
-#: src/translate.c:62
-msgid " Choix du peripherique / Lecture du DVD "
+#: glade/xcfa.glade:89
+msgid "Tools"
 msgstr ""
 
-#: src/translate.c:63 src/translate.c:73 src/translate.c:134
-msgid " Destination des fichiers "
+#: glade/xcfa.glade:99
+msgid "Visibility fields"
 msgstr ""
 
-#: src/translate.c:64 src/translate.c:74
+#: glade/xcfa.glade:112
+msgid "Help"
+msgstr ""
+
+#: glade/xcfa.glade:121
+msgid "About"
+msgstr ""
+
+#: glade/xcfa.glade:224
+msgid "Read"
+msgstr ""
+
+#: glade/xcfa.glade:252
+msgid " Choosing the peripheral / DVD playback "
+msgstr ""
+
+#: glade/xcfa.glade:303 glade/xcfa.glade:921
+msgid " File Destination "
+msgstr ""
+
+#: glade/xcfa.glade:359 glade/xcfa.glade:1009
 msgid " Eject "
 msgstr ""
 
-#: src/translate.c:65 src/translate.c:96
-msgid " Normaliser "
+#: glade/xcfa.glade:434
+msgid " Normalize "
 msgstr ""
 
-#: src/translate.c:66
-msgid "Deplier"
+#: glade/xcfa.glade:494
+msgid "Unfold"
 msgstr ""
 
-#: src/translate.c:67
-msgid "Replier"
+#: glade/xcfa.glade:548
+msgid "Fold"
 msgstr ""
 
-#: src/translate.c:68
+#: glade/xcfa.glade:649
 msgid " Vers 2CH: Sub / Ambiance "
 msgstr ""
 
-#: src/translate.c:69 src/translate.c:102
-msgid "Extraire"
+#: glade/xcfa.glade:705
+msgid "Extraction"
 msgstr ""
 
-#: src/translate.c:70
+#: glade/xcfa.glade:756
 msgid " DVD "
 msgstr ""
 
-#: src/translate.c:72
-msgid " Choix du peripherique / Lecture du CD "
+#: glade/xcfa.glade:842
+msgid "Lecture"
 msgstr ""
 
-#: src/translate.c:75
-msgid "Titre:"
+#: glade/xcfa.glade:870
+msgid " Choosing the peripheral / CD playback "
 msgstr ""
 
-#: src/translate.c:76
+#: glade/xcfa.glade:1065
+msgid "Title:"
+msgstr ""
+
+#: glade/xcfa.glade:1077
 msgid "Album:"
 msgstr ""
 
-#: src/translate.c:77
-msgid "Artiste:"
+#: glade/xcfa.glade:1089
+msgid "Artist:"
 msgstr ""
 
-#: src/translate.c:78
-msgid " Annee:"
+#: glade/xcfa.glade:1101
+msgid "Comment:"
 msgstr ""
 
-#: src/translate.c:79
-msgid " Genre:"
+#: glade/xcfa.glade:1113
+msgid " Year:"
 msgstr ""
 
-#: src/translate.c:80
-msgid " Piste:"
+#: glade/xcfa.glade:1125
+msgid " Genre:"
 msgstr ""
 
-#: src/translate.c:81
-msgid " *.m3u et xspf: "
+#: glade/xcfa.glade:1137
+msgid " Track:"
 msgstr ""
 
-#: src/translate.c:82
-msgid "Commentaire:"
+#: glade/xcfa.glade:1149
+msgid " *.m3u et xspf: "
 msgstr ""
 
-#: src/translate.c:83
-msgid " Modification des tags Freedb "
+#: glade/xcfa.glade:1287
+msgid "Editing tags Freedb"
 msgstr ""
 
-#: src/translate.c:84
+#: glade/xcfa.glade:1302
 msgid ""
 "%a [ %a=\"Artist\" ]\n"
 "\n"
@@ -1552,7 +1459,7 @@
 "caractere %"
 msgstr ""
 
-#: src/translate.c:85
+#: glade/xcfa.glade:1312
 msgid ""
 "%a - artiste %b - titre "
 "de l'album %c - numero de la piste\n"
@@ -1564,1176 +1471,1160 @@
 "b> - Tetsumaki lower"
 msgstr ""
 
-#: src/translate.c:86
-msgid " Arrangement des titres du CD "
+#: glade/xcfa.glade:1346
+msgid " Arrangement of CD titles"
 msgstr ""
 
-#: src/translate.c:87
-msgid "Creation d'un fichier unique au format: "
+#: glade/xcfa.glade:1382
+msgid "Creation of a single file format: "
 msgstr ""
 
-#: src/translate.c:88
-msgid " et dont le nom sera: "
+#: glade/xcfa.glade:1430
+msgid " and whose name will be: "
 msgstr ""
 
-#: src/translate.c:89
-msgid "Ecriture du fichier cue"
+#: glade/xcfa.glade:1461
+msgid "Writing the cue file"
 msgstr ""
 
-#: src/translate.c:90
-msgid " Au moins deux selections colonne Wav "
+#: glade/xcfa.glade:1484
+msgid " At least two selections column Wav "
 msgstr ""
 
-#: src/translate.c:91
+#: glade/xcfa.glade:1514
 msgid ""
-"Creation d'un fichier cue\n"
-"unique depuis une lecture\n"
-"du cd audio"
+"\n"
+"Creating a cue file from a single\n"
+"reading audio cd\n"
 msgstr ""
 
-#: src/translate.c:92
-msgid "Creation fichier cue uniquement"
+#: glade/xcfa.glade:1562
+msgid "File Creation cue only"
 msgstr ""
 
-#: src/translate.c:93
+#: glade/xcfa.glade:1597
 msgid " Creation Cue cd "
 msgstr ""
 
-#: src/translate.c:94
-msgid " Creation d'un fichier unique "
+#: glade/xcfa.glade:1625
+msgid "  Creation of a single file"
 msgstr ""
 
-#: src/translate.c:95
-msgid "Gestion des tags, titres et fichiers cue"
+#: glade/xcfa.glade:1638
+msgid "Management of tags, titles and cue files"
 msgstr ""
 
-#: src/translate.c:97
+#: glade/xcfa.glade:1688
+msgid " normalize "
+msgstr ""
+
+#: glade/xcfa.glade:1749
 msgid "definit le serveur a contacter pour les recherches titre"
 msgstr ""
 
-#: src/translate.c:98
+#: glade/xcfa.glade:1788
 msgid "Parametres par defaut"
 msgstr ""
 
-#: src/translate.c:100
-msgid "Choix parmis les differentes bases de donnees pour le CD."
+#: glade/xcfa.glade:1887
+msgid "DiscId"
 msgstr ""
 
-#: src/translate.c:101
-msgid "DiscId"
+#: glade/xcfa.glade:1946
+msgid "Extract"
 msgstr ""
 
-#: src/translate.c:103
+#: glade/xcfa.glade:2053
 msgid " CD "
 msgstr ""
 
-#: src/translate.c:104 src/translate.c:133
-msgid " Importer "
+#: glade/xcfa.glade:2135 glade/xcfa.glade:3271
+msgid " Import "
 msgstr ""
 
-#: src/translate.c:105
-msgid " Destination des conversions "
+#: glade/xcfa.glade:2190
+msgid " Destination conversions "
 msgstr ""
 
-#: src/translate.c:106
-msgid " Nettoyer "
+#: glade/xcfa.glade:2266
+msgid " Clean up "
 msgstr ""
 
-#: src/translate.c:107 src/translate.c:114
+#: glade/xcfa.glade:2389
 msgid "Appliquer les modifications"
 msgstr ""
 
-#: src/translate.c:108
-msgid " Normalise: "
+#: glade/xcfa.glade:2444
+msgid " Normalize: "
 msgstr ""
 
-#: src/translate.c:109
-msgid " Choix niveau dBFS: "
+#: glade/xcfa.glade:2477
+msgid " Level selection dBFS: "
 msgstr ""
 
-#: src/translate.c:110 src/translate.c:132
-msgid " Fichiers "
+#: glade/xcfa.glade:2615
+msgid "Apply changes"
 msgstr ""
 
-#: src/translate.c:111
-msgid "Quantification"
-msgstr ""
-
-#: src/translate.c:112
-msgid "Voie"
-msgstr ""
-
-#: src/translate.c:113
-msgid " Frequence - Hertz "
-msgstr ""
-
-#: src/translate.c:115
+#: glade/xcfa.glade:2651
 msgid " Wav "
 msgstr ""
 
-#: src/translate.c:116 src/translate.c:202
-msgid " Lame (fichier mp3): "
+#: glade/xcfa.glade:2735
+msgid "Apply"
 msgstr ""
 
-#: src/translate.c:117 src/translate.c:218
-msgid " Oggenc (fichier ogg): "
-msgstr ""
-
-#: src/translate.c:118 src/translate.c:130
-msgid "Appliquer"
+#: glade/xcfa.glade:2789
+msgid "Delete"
 msgstr ""
 
-#: src/translate.c:119
-msgid "Effacer"
-msgstr ""
-
-#: src/translate.c:120
+#: glade/xcfa.glade:2826
 msgid " Mp3-Ogg "
 msgstr ""
 
-#: src/translate.c:121
-msgid "Titre:"
+#: glade/xcfa.glade:2875
+msgid "Title:"
 msgstr ""
 
-#: src/translate.c:122
+#: glade/xcfa.glade:2886
 msgid "Album:"
 msgstr ""
 
-#: src/translate.c:123
-msgid "Artiste:"
+#: glade/xcfa.glade:2897
+msgid "Artist:"
 msgstr ""
 
-#: src/translate.c:124
-msgid "Commentaire:"
+#: glade/xcfa.glade:2908
+msgid "Comment:"
 msgstr ""
 
-#: src/translate.c:125
-msgid " Annee:"
+#: glade/xcfa.glade:2919
+msgid " Year:"
 msgstr ""
 
-#: src/translate.c:126
+#: glade/xcfa.glade:2930
 msgid " Genre:"
 msgstr ""
 
-#: src/translate.c:127
-msgid " Piste:"
+#: glade/xcfa.glade:2941
+msgid " Track:"
 msgstr ""
 
-#: src/translate.c:128
+#: glade/xcfa.glade:2952
 msgid " Modif.:"
 msgstr ""
 
-#: src/translate.c:129
+#: glade/xcfa.glade:3078
 msgid "0"
 msgstr ""
 
-#: src/translate.c:131 src/translate.c:315
+#: glade/xcfa.glade:3102
+msgid "Apply "
+msgstr ""
+
+#: glade/xcfa.glade:3160 glade/xcfa.glade:10210
 msgid " Tags "
 msgstr ""
 
-#: src/translate.c:135
+#: glade/xcfa.glade:3190
+msgid " Files "
+msgstr ""
+
+#: glade/xcfa.glade:3322
+msgid "   File Destination "
+msgstr ""
+
+#: glade/xcfa.glade:3494
 msgid "Lecture de 5 secondes apres le marqueur de debut"
 msgstr ""
 
-#: src/translate.c:136
+#: glade/xcfa.glade:3546
 msgid "Index de debut"
 msgstr ""
 
-#: src/translate.c:137 src/translate.c:144 src/translate.c:147
+#: glade/xcfa.glade:3547 glade/xcfa.glade:3813 glade/xcfa.glade:3874
 msgid "00h00m00s"
 msgstr ""
 
-#: src/translate.c:138
+#: glade/xcfa.glade:3600
 msgid "lecture"
 msgstr ""
 
-#: src/translate.c:139
+#: glade/xcfa.glade:3653
 msgid "Pause"
 msgstr ""
 
-#: src/translate.c:140
+#: glade/xcfa.glade:3712
 msgid "Index de lecture"
 msgstr ""
 
-#: src/translate.c:141 src/translate.c:180
+#: glade/xcfa.glade:3713 glade/xcfa.glade:4767
 msgid "label"
 msgstr ""
 
-#: src/translate.c:142
+#: glade/xcfa.glade:3760
 msgid "Lecture de 5 secondes avant le marqueur de fin"
 msgstr ""
 
-#: src/translate.c:143
+#: glade/xcfa.glade:3812
 msgid "Index de fin"
 msgstr ""
 
-#: src/translate.c:145
+#: glade/xcfa.glade:3860
 msgid "Plage"
 msgstr ""
 
-#: src/translate.c:146
+#: glade/xcfa.glade:3873
 msgid "Duree de la plage active"
 msgstr ""
 
-#: src/translate.c:148
+#: glade/xcfa.glade:3955
 msgid "Suprimer tous les marqueurs pour les remplacer par un marqueur unique"
 msgstr ""
 
-#: src/translate.c:149
+#: glade/xcfa.glade:4044
 msgid "Le fichier CUE sera enregistre vers 'Destination des fichiers'."
 msgstr ""
 
-#: src/translate.c:150
-msgid "Production fichier Cue"
+#: glade/xcfa.glade:4073
+msgid "Production Cue file"
 msgstr ""
 
-#: src/translate.c:151
+#: glade/xcfa.glade:4098
 msgid "Le resultat du Split sera dirige vers 'Destination des fichiers'."
 msgstr ""
 
-#: src/translate.c:152
+#: glade/xcfa.glade:4127
 msgid "Split"
 msgstr ""
 
-#: src/translate.c:153
+#: glade/xcfa.glade:4188
 msgid " Split "
 msgstr ""
 
-#: src/translate.c:154
+#: glade/xcfa.glade:4253
 msgid "Importation du titre du CD."
 msgstr ""
 
-#: src/translate.c:155
-msgid "Titre CD"
+#: glade/xcfa.glade:4276
+msgid "Title CD"
 msgstr ""
 
-#: src/translate.c:156
+#: glade/xcfa.glade:4296
 msgid "Choix d'une nouvelle police."
 msgstr ""
 
-#: src/translate.c:157
+#: glade/xcfa.glade:4318
 msgid "Texte gras."
 msgstr ""
 
-#: src/translate.c:158
+#: glade/xcfa.glade:4340
 msgid "Texte italique."
 msgstr ""
 
-#: src/translate.c:159
-msgid ""
-"Apres une lecture de CD et un ajout d'etiquette, ce menu permet la mise en "
-"forme des titres, auteurs ..."
-msgstr ""
-
-#: src/translate.c:160
+#: glade/xcfa.glade:4375
 msgid "Ajouter du texte editable."
 msgstr ""
 
-#: src/translate.c:161
-msgid "Texte"
+#: glade/xcfa.glade:4430
+msgid "Text"
 msgstr ""
 
-#: src/translate.c:162
+#: glade/xcfa.glade:4462
 msgid "Saisissez ici un critere de recherche d'images."
 msgstr ""
 
-#: src/translate.c:163
+#: glade/xcfa.glade:4484
 msgid "Importation des images depuis le Web."
 msgstr ""
 
-#: src/translate.c:164
-msgid "Import images web"
+#: glade/xcfa.glade:4509
+msgid "Import web images "
 msgstr ""
 
-#: src/translate.c:165
+#: glade/xcfa.glade:4578
 msgid "Supprimer l'image en selection"
 msgstr ""
 
-#: src/translate.c:166
+#: glade/xcfa.glade:4600
 msgid "AJouter de nouvelles images."
 msgstr ""
 
-#: src/translate.c:167
+#: glade/xcfa.glade:4606
 msgid "Ouvre un fichier"
 msgstr ""
 
-#: src/translate.c:168
+#: glade/xcfa.glade:4623
 msgid "Enregistrer la page au format png."
 msgstr ""
 
-#: src/translate.c:169
+#: glade/xcfa.glade:4629
 msgid "Sauvegarde le fichier"
 msgstr ""
 
-#: src/translate.c:170
+#: glade/xcfa.glade:4646
 msgid "Diminution de l'echelle."
 msgstr ""
 
-#: src/translate.c:171
+#: glade/xcfa.glade:4652
 msgid "Reduit l'agrandissement"
 msgstr ""
 
-#: src/translate.c:172
+#: glade/xcfa.glade:4669
 msgid "Echelle a 100%."
 msgstr ""
 
-#: src/translate.c:173
+#: glade/xcfa.glade:4675
 msgid "Remet l'echelle a 100%"
 msgstr ""
 
-#: src/translate.c:174
+#: glade/xcfa.glade:4692
 msgid "Augmentation de l'echelle."
 msgstr ""
 
-#: src/translate.c:175
+#: glade/xcfa.glade:4698
 msgid "Augmente l'agrandissement"
 msgstr ""
 
-#: src/translate.c:176
+#: glade/xcfa.glade:4715
 msgid "Echelle compatible avec la taille de la fenetre."
 msgstr ""
 
-#: src/translate.c:177
+#: glade/xcfa.glade:4721
 msgid "Adapte l'echelle a la taille de la fenetre"
 msgstr ""
 
-#: src/translate.c:178
+#: glade/xcfa.glade:4738
 msgid "Emplacement de sauvegarde des fichiers."
 msgstr ""
 
-#: src/translate.c:179
+#: glade/xcfa.glade:4752
 msgid "Nom (sans extention) du fichier a sauvegarder."
 msgstr ""
 
-#: src/translate.c:181
+#: glade/xcfa.glade:4815
 msgid " Pochette "
 msgstr ""
 
-#: src/translate.c:182
+#: glade/xcfa.glade:4861
 msgid "Nice"
 msgstr ""
 
-#: src/translate.c:183
-msgid " Priorite systeme "
+#: glade/xcfa.glade:4896
+msgid " Priority system "
 msgstr ""
 
-#: src/translate.c:184
+#: glade/xcfa.glade:4935
 msgid ""
-"Indiquez ici le dossier sur votre systeme qui servira de lieu\n"
-"de stockage provisoire pendant les differentes conversions.\n"
+"\n"
+"Enter here the folder on your system that will serve as\n"
+"temporary storage for the different conversions.\n"
 msgstr ""
 
-#: src/translate.c:185
-msgid " Dossier provisoire des conversions "
+#: glade/xcfa.glade:4971
+msgid " Provisional file conversions "
 msgstr ""
 
-#: src/translate.c:186
+#: glade/xcfa.glade:5017
 msgid "button"
 msgstr ""
 
-#: src/translate.c:187
-msgid " Jouer une musique en fin de tache "
+#: glade/xcfa.glade:5038
+msgid " Playing a job end music "
 msgstr ""
 
-#: src/translate.c:188
+#: glade/xcfa.glade:5058
 msgid " General "
 msgstr ""
 
-#: src/translate.c:189
+#: glade/xcfa.glade:5100
 msgid "cdparanoia"
 msgstr ""
 
-#: src/translate.c:190
-msgid "cdda2wav / icedax"
+#: glade/xcfa.glade:5120
+msgid "cdparanoia mode expert"
 msgstr ""
 
-#: src/translate.c:191
-msgid "cdparanoia mode expert"
+#: glade/xcfa.glade:5140
+msgid "cdparanoia mode expert multi passes"
 msgstr ""
 
-#: src/translate.c:192
+#: glade/xcfa.glade:5168
+msgid "cdda2wav / icedax"
+msgstr ""
+
+#: glade/xcfa.glade:5194
 msgid " Extraction cd-audio avec: "
 msgstr ""
 
-#: src/translate.c:193
+#: glade/xcfa.glade:5268
 msgid "HomePage"
 msgstr ""
 
-#: src/translate.c:194
+#: glade/xcfa.glade:5323
 msgid "ManPage "
 msgstr ""
 
-#: src/translate.c:195
+#: glade/xcfa.glade:5352
 msgid " Web cdparanoia "
 msgstr ""
 
-#: src/translate.c:196
+#: glade/xcfa.glade:5414
 msgid ""
-"%a - artiste %b - titre "
+"Le fichier LogExpertMode.txt sera cree dans le dossier des "
+"extractions"
+msgstr ""
+
+#: glade/xcfa.glade:5431
+msgid "Generation of a report for: cdparanoia mode expert multi passes"
+msgstr ""
+
+#: glade/xcfa.glade:5467
+msgid ""
+"%a - artist %b - titre "
 "de l'album %c - numero de la piste\n"
 "%d - titre de la chanson %e - "
-"annee %g - genre\n"
+"year %g - genre\n"
 "%na - no accent %Tl "
 "- Tetsumaki lower\n"
-"%u - remplacement de caracteres: %u(AB=C) %u( =_)"
+"%u - replacement characters: %u(AB=C) %u( =_)"
 msgstr ""
 
-#: src/translate.c:197
+#: glade/xcfa.glade:5536
 msgid " Dossier de stockage "
 msgstr ""
 
-#: src/translate.c:198
+#: glade/xcfa.glade:5567
 msgid " CD "
 msgstr ""
 
-#: src/translate.c:199
+#: glade/xcfa.glade:5615
 msgid "ABR / CBR / VBR / VBR-NEW"
 msgstr ""
 
-#: src/translate.c:200
+#: glade/xcfa.glade:5660 glade/xcfa.glade:6295
 msgid "Debit"
 msgstr ""
 
-#: src/translate.c:201
+#: glade/xcfa.glade:5705 glade/xcfa.glade:6317
 msgid "Mode"
 msgstr ""
 
-#: src/translate.c:203 src/translate.c:219 src/translate.c:231
-#: src/translate.c:244 src/translate.c:261 src/translate.c:272
-#: src/translate.c:286 src/translate.c:300
+#: glade/xcfa.glade:5747
+msgid " Lame (fichier mp3): "
+msgstr ""
+
+#: glade/xcfa.glade:5827 glade/xcfa.glade:6466 glade/xcfa.glade:6941
+#: glade/xcfa.glade:7469 glade/xcfa.glade:8200 glade/xcfa.glade:8659
+#: glade/xcfa.glade:9192 glade/xcfa.glade:9753
 msgid "Par defaut"
 msgstr ""
 
-#: src/translate.c:204
+#: glade/xcfa.glade:5848
 msgid " Options LAME "
 msgstr ""
 
-#: src/translate.c:205 src/translate.c:233 src/translate.c:274
+#: glade/xcfa.glade:5909 glade/xcfa.glade:7023 glade/xcfa.glade:8741
 msgid "Site officiel"
 msgstr ""
 
-#: src/translate.c:206
+#: glade/xcfa.glade:5964
 msgid "Wiki mp3 "
 msgstr ""
 
-#: src/translate.c:207
+#: glade/xcfa.glade:6020
 msgid "Wiki "
 msgstr ""
 
-#: src/translate.c:208
+#: glade/xcfa.glade:6076
 msgid "ManPage "
 msgstr ""
 
-#: src/translate.c:209
+#: glade/xcfa.glade:6105
 msgid " Web Lame "
 msgstr ""
 
-#: src/translate.c:210 src/translate.c:224 src/translate.c:237
-#: src/translate.c:248 src/translate.c:266 src/translate.c:277
-#: src/translate.c:292
+#: glade/xcfa.glade:6181 glade/xcfa.glade:6709 glade/xcfa.glade:7238
+#: glade/xcfa.glade:7644 glade/xcfa.glade:8442 glade/xcfa.glade:8901
+#: glade/xcfa.glade:9491
 msgid "["
 msgstr ""
 
-#: src/translate.c:211 src/translate.c:225 src/translate.c:238
-#: src/translate.c:249 src/translate.c:267 src/translate.c:278
-#: src/translate.c:293
+#: glade/xcfa.glade:6194 glade/xcfa.glade:6722 glade/xcfa.glade:7251
+#: glade/xcfa.glade:7657 glade/xcfa.glade:8455 glade/xcfa.glade:8914
+#: glade/xcfa.glade:9504
 msgid "string option interne"
 msgstr ""
 
-#: src/translate.c:212 src/translate.c:226 src/translate.c:239
-#: src/translate.c:250 src/translate.c:268 src/translate.c:279
-#: src/translate.c:294
+#: glade/xcfa.glade:6209 glade/xcfa.glade:6737 glade/xcfa.glade:7266
+#: glade/xcfa.glade:7672 glade/xcfa.glade:8470 glade/xcfa.glade:8929
+#: glade/xcfa.glade:9519
 msgid "]"
 msgstr ""
 
-#: src/translate.c:213
-msgid ""
-" Options experts, definies par l'utilisateur - lame (wav -> mp3) "
+#: glade/xcfa.glade:6234
+msgid " Experts options defined by the user- lame (wav -> mp3) "
 msgstr ""
 
-#: src/translate.c:214
+#: glade/xcfa.glade:6254
 msgid " Mp3 "
 msgstr ""
 
-#: src/translate.c:215
-msgid " Mode"
-msgstr ""
-
-#: src/translate.c:216
-msgid " Mode flux (streaming)"
+#: glade/xcfa.glade:6306
+msgid "Mode flux (streaming)"
 msgstr ""
 
-#: src/translate.c:217
-msgid " Debit"
+#: glade/xcfa.glade:6386
+msgid " Oggenc (fichier ogg): "
 msgstr ""
 
-#: src/translate.c:220
+#: glade/xcfa.glade:6487
 msgid " Options OGGENC "
 msgstr ""
 
-#: src/translate.c:221
+#: glade/xcfa.glade:6548
 msgid "Wiki "
 msgstr ""
 
-#: src/translate.c:222 src/translate.c:264 src/translate.c:290
-#: src/translate.c:304
+#: glade/xcfa.glade:6604 glade/xcfa.glade:8337 glade/xcfa.glade:9386
+#: glade/xcfa.glade:9947
 msgid "ManPage"
 msgstr ""
 
-#: src/translate.c:223
+#: glade/xcfa.glade:6633
 msgid " Web Oggenc "
 msgstr ""
 
-#: src/translate.c:227
-msgid ""
-" Options experts, definies par l'utilisateur - oggenc (wav -> ogg) "
+#: glade/xcfa.glade:6762
+msgid " Experts options defined by the user - oggenc (wav -> ogg) "
 msgstr ""
 
-#: src/translate.c:228
+#: glade/xcfa.glade:6782
 msgid " Oggenc "
 msgstr ""
 
-#: src/translate.c:229
+#: glade/xcfa.glade:6824
 msgid "Taux de compression"
 msgstr ""
 
-#: src/translate.c:230
+#: glade/xcfa.glade:6861
 msgid " Flac (fichier flac): "
 msgstr ""
 
-#: src/translate.c:232
+#: glade/xcfa.glade:6962
 msgid " Options FLAC "
 msgstr ""
 
-#: src/translate.c:234 src/translate.c:275
+#: glade/xcfa.glade:7078 glade/xcfa.glade:8796
 msgid "Framasoft "
 msgstr ""
 
-#: src/translate.c:235
+#: glade/xcfa.glade:7133
 msgid "ManPage "
 msgstr ""
 
-#: src/translate.c:236
+#: glade/xcfa.glade:7162
 msgid " Web Flac "
 msgstr ""
 
-#: src/translate.c:240
-msgid ""
-" Options experts, definies par l'utilisateur - flac (wav -> flac) "
+#: glade/xcfa.glade:7291
+msgid " Experts options defined by the user- flac (wav -> flac) "
 msgstr ""
 
-#: src/translate.c:241
+#: glade/xcfa.glade:7311
 msgid " Flac "
 msgstr ""
 
-#: src/translate.c:242
+#: glade/xcfa.glade:7353
 msgid " Qualite"
 msgstr ""
 
-#: src/translate.c:243
+#: glade/xcfa.glade:7389
 msgid " Mac (fichier ape): "
 msgstr ""
 
-#: src/translate.c:245
+#: glade/xcfa.glade:7490
 msgid " Options MAC "
 msgstr ""
 
-#: src/translate.c:246
+#: glade/xcfa.glade:7546
 msgid "Wiki"
 msgstr ""
 
-#: src/translate.c:247
+#: glade/xcfa.glade:7568
 msgid " Web Mac "
 msgstr ""
 
-#: src/translate.c:251
-msgid " Options experts, definies par l'utilisateur - mac (wav -> ape) "
+#: glade/xcfa.glade:7697
+msgid " Experts options defined by the user - mac (wav -> ape) "
 msgstr ""
 
-#: src/translate.c:252
+#: glade/xcfa.glade:7717
 msgid " Mac "
 msgstr ""
 
-#: src/translate.c:253
+#: glade/xcfa.glade:7765
 msgid "Compression"
 msgstr ""
 
-#: src/translate.c:254
+#: glade/xcfa.glade:7817
 msgid "Son"
 msgstr ""
 
-#: src/translate.c:255
+#: glade/xcfa.glade:7869
 msgid "Mode hybride"
 msgstr ""
 
-#: src/translate.c:256
+#: glade/xcfa.glade:7921
 msgid "Fichier de correction"
 msgstr ""
 
-#: src/translate.c:257
+#: glade/xcfa.glade:7973
 msgid "Compression maximum"
 msgstr ""
 
-#: src/translate.c:258
+#: glade/xcfa.glade:8025
 msgid "Signature MD5"
 msgstr ""
 
-#: src/translate.c:259
+#: glade/xcfa.glade:8077
 msgid "Extra encode processing"
 msgstr ""
 
-#: src/translate.c:260
+#: glade/xcfa.glade:8120
 msgid " WavPack (fichier wv): "
 msgstr ""
 
-#: src/translate.c:262
+#: glade/xcfa.glade:8221
 msgid " Options WAVPACK "
 msgstr ""
 
-#: src/translate.c:263
+#: glade/xcfa.glade:8282
 msgid "Wiki "
 msgstr ""
 
-#: src/translate.c:265
+#: glade/xcfa.glade:8366
 msgid " Web Wavpack "
 msgstr ""
 
-#: src/translate.c:269
-msgid ""
-" Options experts, definies par l'utilisateur - wavpack (wav -> wv) "
+#: glade/xcfa.glade:8495
+msgid " Experts options defined by the user - wavpack (wav -> wv) "
 msgstr ""
 
-#: src/translate.c:270
+#: glade/xcfa.glade:8515
 msgid " Wavpack "
 msgstr ""
 
-#: src/translate.c:271
+#: glade/xcfa.glade:8579
 msgid " MusePack (fichier mpc): "
 msgstr ""
 
-#: src/translate.c:273
+#: glade/xcfa.glade:8680
 msgid " Options MUSEPACK "
 msgstr ""
 
-#: src/translate.c:276
+#: glade/xcfa.glade:8825
 msgid " Web Musepack "
 msgstr ""
 
-#: src/translate.c:280
-msgid ""
-" Options experts, definies par l'utilisateur - musepack (wav -> mpc) "
+#: glade/xcfa.glade:8954
+msgid " Experts options defined by the user- musepack (wav -> mpc) "
 msgstr ""
 
-#: src/translate.c:281
+#: glade/xcfa.glade:8974
 msgid " Musepack "
 msgstr ""
 
-#: src/translate.c:282
-msgid " Qualite VBR / Debit ABR"
+#: glade/xcfa.glade:9016
+msgid "Conteneur"
 msgstr ""
 
-#: src/translate.c:283
-msgid " VBR / ABR"
+#: glade/xcfa.glade:9027
+msgid "VBR / ABR"
 msgstr ""
 
-#: src/translate.c:284
-msgid " Conteneur"
+#: glade/xcfa.glade:9038
+msgid "Qualite VBR / Debit ABR"
 msgstr ""
 
-#: src/translate.c:285
+#: glade/xcfa.glade:9112
 msgid " Faac (fichier .m4a): "
 msgstr ""
 
-#: src/translate.c:287
+#: glade/xcfa.glade:9213
 msgid " Options FAAC "
 msgstr ""
 
-#: src/translate.c:288 src/translate.c:302
+#: glade/xcfa.glade:9274 glade/xcfa.glade:9835
 msgid "Site officiel "
 msgstr ""
 
-#: src/translate.c:289 src/translate.c:303
+#: glade/xcfa.glade:9330 glade/xcfa.glade:9891
 msgid "Web Info "
 msgstr ""
 
-#: src/translate.c:291
+#: glade/xcfa.glade:9415
 msgid " Web Faac "
 msgstr ""
 
-#: src/translate.c:295
-msgid ""
-" Options experts, definies par l'utilisateur - faac (wav -> m4a) "
+#: glade/xcfa.glade:9544
+msgid " Experts options defined by the user - faac (wav -> m4a) "
 msgstr ""
 
-#: src/translate.c:296
+#: glade/xcfa.glade:9564
 msgid " Faac "
 msgstr ""
 
-#: src/translate.c:297
-msgid " Stereo: Qualite en kbit/s"
+#: glade/xcfa.glade:9606
+msgid "Mono: Qualite en kbit/s"
 msgstr ""
 
-#: src/translate.c:298
-msgid " Mono: Qualite en kbit/s"
+#: glade/xcfa.glade:9617
+msgid "Stereo: Qualite en kbit/s"
 msgstr ""
 
-#: src/translate.c:299
+#: glade/xcfa.glade:9673
 msgid " AacplusEnc (fichier .aac): "
 msgstr ""
 
-#: src/translate.c:301
+#: glade/xcfa.glade:9774
 msgid " Options AacPlusEnc "
 msgstr ""
 
-#: src/translate.c:305
+#: glade/xcfa.glade:9976
 msgid " Web AacPlusEnc "
 msgstr ""
 
-#: src/translate.c:306
+#: glade/xcfa.glade:10021
 msgid " AacplusEnc "
 msgstr ""
 
-#: src/translate.c:307
+#: glade/xcfa.glade:10051
 msgid "Artiste"
 msgstr ""
 
-#: src/translate.c:308 src/translate.c:335
+#: glade/xcfa.glade:10070 glade/xcfa_win_treeview.glade:95
 msgid "Titre"
 msgstr ""
 
-#: src/translate.c:309
+#: glade/xcfa.glade:10089
 msgid "Album"
 msgstr ""
 
-#: src/translate.c:310
+#: glade/xcfa.glade:10108
 msgid "Numero"
 msgstr ""
 
-#: src/translate.c:311
+#: glade/xcfa.glade:10127
 msgid "Genre"
 msgstr ""
 
-#: src/translate.c:312
+#: glade/xcfa.glade:10146
 msgid "Annee"
 msgstr ""
 
-#: src/translate.c:313
+#: glade/xcfa.glade:10165
 msgid "Commentaire"
 msgstr ""
 
-#: src/translate.c:314
+#: glade/xcfa.glade:10190
 msgid " Exportation de "
 msgstr ""
 
-#: src/translate.c:316
+#: glade/xcfa.glade:10226
 msgid " Preferences "
 msgstr ""
 
-#: src/translate.c:317
+#: glade/xcfa.glade:10289
 msgid "SCAN"
 msgstr ""
 
-#: src/translate.c:318
+#: glade/xcfa.glade:10303
 msgid " Installation "
 msgstr ""
 
-#: src/translate.c:319
-msgid " Votre systeme utilise ... "
+#: glade/xcfa.glade:10338
+msgid " Your system use ... "
 msgstr ""
 
-#: src/translate.c:320
+#: glade/xcfa.glade:10375
 msgid ""
 "\n"
-"Pour installer les programmes externes requis,\n"
-"veuillez utiliser l'installateur de votre distribution Gnu/Linux.\n"
+"To install the required external programs\n"
+"Please use the installer to your distribution Gnu / Linux.\n"
 msgstr ""
 
-#: src/translate.c:321
+#: glade/xcfa.glade:10393
 msgid ""
 "Le programme XCFA_INSTALL_ALL ecrit en Perl vous sera utile en ligne de "
 "commande pour une installation des programmes complementaire."
 msgstr ""
 
-#: src/translate.c:322
+#: glade/xcfa.glade:10419
 msgid " Informations "
 msgstr ""
 
-#: src/translate.c:323
-msgid " Application externes "
+#: glade/xcfa.glade:10443
+msgid " External application "
 msgstr ""
 
-#: src/translate.c:324 src/translate.c:326
+#: glade/xcfa.glade:10514 glade/xcfa.glade:10618
 msgid "parametres:"
 msgstr ""
 
-#: src/translate.c:325
-msgid "Navigateur"
-msgstr ""
-
-#: src/translate.c:327
-msgid "Lecteurs audio"
-msgstr ""
-
-#: src/translate.c:328
-msgid " Navigateurs / Lecteurs audio "
-msgstr ""
-
-#: src/translate.c:329
-msgid " Applications externes "
-msgstr ""
-
-#: src/translate.c:330
-msgid "Scan en cours ..."
-msgstr ""
-
-#: src/translate.c:331
-msgid "Scan du support en cours ..."
-msgstr ""
-
-#: src/translate.c:332
-msgid "Detail extraction mode expert"
-msgstr ""
-
-#: src/translate.c:333
-msgid "Modification des champs"
-msgstr ""
-
-#: src/translate.c:334
+#: glade/xcfa.glade:10527
 msgid ""
 "\n"
-"Modification des champs\n"
-msgstr ""
-
-#: src/translate.c:342 src/translate.c:361 src/translate.c:382
-#: src/translate.c:394 src/translate.c:405 src/translate.c:413
-msgid " Visibilite "
-msgstr ""
-
-#: src/translate.c:343 src/translate.c:362 src/translate.c:383
-#: src/translate.c:395 src/translate.c:406 src/translate.c:414
-msgid "Nom a gauche"
-msgstr ""
-
-#: src/translate.c:344 src/translate.c:363 src/translate.c:384
-#: src/translate.c:396 src/translate.c:407 src/translate.c:415
-msgid "Nom au centre"
+" konqueror : newTab\n"
+" iceweasel : -new-window -new-tab \n"
 msgstr ""
 
-#: src/translate.c:345 src/translate.c:364 src/translate.c:385
-#: src/translate.c:397 src/translate.c:408 src/translate.c:416
-msgid "Nom a droite"
-msgstr ""
-
-#: src/translate.c:346
-msgid "DVD"
-msgstr ""
-
-#: src/translate.c:351 src/translate.c:372
-msgid "Wavpack"
-msgstr ""
-
-#: src/translate.c:355 src/translate.c:376
-msgid "Musepack"
-msgstr ""
-
-#: src/translate.c:365
-msgid "CD"
-msgstr ""
-
-#: src/translate.c:380
-msgid "Replaygain"
-msgstr ""
-
-#: src/translate.c:386
-msgid "CONVERSIONS"
-msgstr ""
-
-#: src/translate.c:387
-msgid "Hertz"
-msgstr ""
-
-#: src/translate.c:388
-msgid "New Hertz"
-msgstr ""
-
-#: src/translate.c:389
-msgid "Voie"
-msgstr ""
-
-#: src/translate.c:390
-msgid "New Voie"
-msgstr ""
-
-#: src/translate.c:391
-msgid "Bits"
-msgstr ""
-
-#: src/translate.c:392
-msgid "New Bits"
-msgstr ""
-
-#: src/translate.c:398
-msgid "WAV"
-msgstr ""
-
-#: src/translate.c:401
-msgid "New Bitrate"
-msgstr ""
-
-#: src/translate.c:402
-msgid "Size"
-msgstr ""
-
-#: src/translate.c:409
-msgid "MP3-OGG"
-msgstr ""
-
-#: src/translate.c:417
-msgid "TAGS"
+#: glade/xcfa.glade:10548
+msgid "Navigateur"
 msgstr ""
 
-#: src/translate.c:418
-msgid "Selection globale"
+#: glade/xcfa.glade:10648
+msgid "Lecteurs audio"
 msgstr ""
 
-#: src/translate.c:419
-msgid "Deselection globale"
+#: glade/xcfa.glade:10669
+msgid "  Browsers / Audio Players "
 msgstr ""
 
-#: src/translate.c:420
-msgid "Retour"
+#: glade/xcfa.glade:10692
+msgid " Applications externes "
 msgstr ""
 
-#: src/translate.c:421
+#: glade/xcfa_win_about.glade:7
 msgid "About X Convert File Audio"
 msgstr ""
 
-#: src/translate.c:422
+#: glade/xcfa_win_about.glade:103
 msgid "Author"
 msgstr ""
 
-#: src/translate.c:423
+#: glade/xcfa_win_about.glade:139
 msgid "Licence"
 msgstr ""
 
-#: src/translate.c:424
+#: glade/xcfa_win_about.glade:163
 msgid " Informations "
 msgstr ""
 
-#: src/translate.c:425
+#: glade/xcfa_win_about.glade:198
 msgid " Machine "
 msgstr ""
 
-#: src/translate.c:426
+#: glade/xcfa_win_about.glade:333
 msgid "Ingenieurs du son\n"
 msgstr ""
 
-#: src/translate.c:427
+#: glade/xcfa_win_about.glade:350
 msgid ""
 "\n"
 "Graphisme\n"
 msgstr ""
 
-#: src/translate.c:428
+#: glade/xcfa_win_about.glade:370
 msgid ""
 "Traduction Anglaise\n"
 "\n"
 "\n"
 msgstr ""
 
-#: src/translate.c:429
+#: glade/xcfa_win_about.glade:391
 msgid ""
 "\n"
 "Traduction Allemande"
 msgstr ""
 
-#: src/translate.c:430
+#: glade/xcfa_win_about.glade:628
 msgid ""
 "\n"
 "Codeur Xcfa"
 msgstr ""
 
-#: src/translate.c:431
+#: glade/xcfa_win_about.glade:665
 msgid ""
 "\n"
 "ElementSpeak pour Xcfa "
 msgstr ""
 
-#: src/translate.c:432
+#: glade/xcfa_win_about.glade:702
 msgid ""
 "\n"
 "Codeur pages Web"
 msgstr ""
 
-#: src/translate.c:433
+#: glade/xcfa_win_about.glade:739
 msgid ""
 "\n"
 "Traduction Italienne"
 msgstr ""
 
-#: src/translate.c:434
+#: glade/xcfa_win_about.glade:800
 msgid ""
 "\n"
 "\n"
 "Pages a visiter\n"
 msgstr ""
 
-#: src/translate.c:435
+#: glade/xcfa_win_about.glade:1123
 msgid "Linux On The Root"
 msgstr ""
 
-#: src/translate.c:436
+#: glade/xcfa_win_about.glade:1180
 msgid "Frugalware"
 msgstr ""
 
-#: src/translate.c:437
+#: glade/xcfa_win_about.glade:1237
 msgid "Road2Mayotte"
 msgstr ""
 
-#: src/translate.c:438
+#: glade/xcfa_win_about.glade:1294
 msgid "La Linuxerie"
 msgstr ""
 
-#: src/translate.c:439
-msgid "Audioptimisation by Dzef"
-msgstr ""
-
-#: src/translate.c:440
+#: glade/xcfa_win_about.glade:1351
 msgid "Tuxfamily"
 msgstr ""
 
-#: src/translate.c:441
+#: glade/xcfa_win_about.glade:1408
 msgid "Framasoft"
 msgstr ""
 
-#: src/translate.c:442
+#: glade/xcfa_win_about.glade:1465
 msgid "Ekd (EnKoDeur-Mixeur)"
 msgstr ""
 
-#: src/translate.c:443
-msgid "Bishop's page"
+#: glade/xcfa_win_about.glade:1544
+msgid "Debian Multimedia"
 msgstr ""
 
-#: src/translate.c:444
+#: glade/xcfa_win_about.glade:1598
 msgid "Je suis libre"
 msgstr ""
 
-#: src/translate.c:445
-msgid "Debian Multimedia"
-msgstr ""
-
-#: src/translate.c:446
+#: glade/xcfa_win_about.glade:1705
 msgid ""
 "\n"
 "Forum\n"
 msgstr ""
 
-#: src/translate.c:447
-msgid "XCFA Vorstellung "
+#: glade/xcfa_win_about.glade:1825
+msgid "Forum Xcfa"
 msgstr ""
 
-#: src/translate.c:448
+#: glade/xcfa_win_about.glade:1879
 msgid "XCFA LinuxForen.de"
 msgstr ""
 
-#: src/translate.c:449
-msgid "Forum Xcfa"
-msgstr ""
-
-#: src/translate.c:450
+#: glade/xcfa_win_about.glade:1929
 msgid ""
 "\n"
 "Documentation\n"
 msgstr ""
 
-#: src/translate.c:451
+#: glade/xcfa_win_about.glade:2164
 msgid "Wiki Xcfa par Shankarius"
 msgstr ""
 
-#: src/translate.c:452
+#: glade/xcfa_win_about.glade:2219
 msgid "Doc Xcfa par Patachon"
 msgstr ""
 
-#: src/translate.c:453
+#: glade/xcfa_win_about.glade:2276
 msgid "Ogg Vorbis explique par Shankarius"
 msgstr ""
 
-#: src/translate.c:454
+#: glade/xcfa_win_about.glade:2333
 msgid "La normalisation expliquee par Dzef"
 msgstr ""
 
-#: src/translate.c:455
+#: glade/xcfa_win_about.glade:2390
 msgid "Xcfa sur Linux On The Root"
 msgstr ""
 
-#: src/translate.c:456
+#: glade/xcfa_win_about.glade:2433
 msgid " Contributions "
 msgstr ""
 
-#: src/translate.c:457
+#: glade/xcfa_win_about.glade:2461
 msgid " License "
 msgstr ""
 
-#: src/translate.c:458
+#: glade/xcfa_win_about.glade:2482
 msgid "OK"
 msgstr ""
 
-#: src/web.c:147 src/web.c:207
-msgid "PAS de navigateur present"
+#: glade/xcfa_win_scan.glade:9
+msgid "Scan en cours ..."
 msgstr ""
 
-#: src/web.c:148
-msgid "L'acces au web est impossible car aucun navigateur"
+#: glade/xcfa_win_scan.glade:77
+msgid "Scan du support en cours ..."
 msgstr ""
 
-#: src/web.c:150
-msgid "n'est present dans votre configuration."
+#: glade/xcfa_win_scan.glade:128
+msgid "Detail extraction mode expert"
 msgstr ""
 
-#: src/web.c:152
-msgid "Veuillez installez un navigateur."
+#: glade/xcfa_win_treeview.glade:7
+msgid "Modification des champs"
 msgstr ""
 
-#: src/web.c:161
-msgid "Vous devez ouvrir l'acces internet"
+#: glade/xcfa_win_treeview.glade:41
+msgid ""
+"\n"
+"Modification des champs\n"
 msgstr ""
 
-#: src/web.c:209
-msgid " L'acces au web est impossible car aucun navigateur"
+#: glade/xcfa_win_treeview.glade:129
+msgid "Temps"
 msgstr ""
 
-#: src/web.c:211
-msgid " n'est present dans votre configuration."
+#: glade/xcfa_win_treeview.glade:163
+msgid "Choix"
 msgstr ""
 
-#: src/web.c:213
-msgid " Veuillez installez un navigateur."
+#: glade/xcfa_win_treeview.glade:197 glade/xcfa_win_treeview.glade:577
+#: glade/xcfa_win_treeview.glade:995 glade/xcfa_win_treeview.glade:1260
+#: glade/xcfa_win_treeview.glade:1508 glade/xcfa_win_treeview.glade:1706
+msgid "Nom"
 msgstr ""
 
-#: src/web.c:222
-msgid "L'application est absente."
+#: glade/xcfa_win_treeview.glade:220 glade/xcfa_win_treeview.glade:600
+#: glade/xcfa_win_treeview.glade:1018 glade/xcfa_win_treeview.glade:1283
+#: glade/xcfa_win_treeview.glade:1531 glade/xcfa_win_treeview.glade:1732
+msgid " Visibilite "
 msgstr ""
 
-#: src/web.c:223
-msgid "Veuillez installer : "
+#: glade/xcfa_win_treeview.glade:250 glade/xcfa_win_treeview.glade:630
+#: glade/xcfa_win_treeview.glade:1048 glade/xcfa_win_treeview.glade:1313
+#: glade/xcfa_win_treeview.glade:1562 glade/xcfa_win_treeview.glade:1763
+msgid "Nom a gauche"
 msgstr ""
 
-#: src/win_about.c:138
-msgid " Xcfa sur le web"
+#: glade/xcfa_win_treeview.glade:267 glade/xcfa_win_treeview.glade:647
+#: glade/xcfa_win_treeview.glade:1065 glade/xcfa_win_treeview.glade:1330
+#: glade/xcfa_win_treeview.glade:1579 glade/xcfa_win_treeview.glade:1780
+msgid "Nom au centre"
 msgstr ""
 
-#: src/win_about.c:188
-msgid ""
-"\n"
-"Au tout debut:\n"
-"\n"
-"Serres Patrick, Hamann Regis, Fabien Gregis, @Dzef, @alteo_gange, \n"
-"@Leonux, @zarer, @Shankarius, @bishop, @Ludo, @Patachonf,\n"
-"... ;-)\n"
-"\n"
-""
+#: glade/xcfa_win_treeview.glade:286 glade/xcfa_win_treeview.glade:666
+#: glade/xcfa_win_treeview.glade:1084 glade/xcfa_win_treeview.glade:1349
+#: glade/xcfa_win_treeview.glade:1598 glade/xcfa_win_treeview.glade:1799
+msgid "Nom a droite"
 msgstr ""
 
-#: src/win_scan.c:166
-msgid "Waiting ..."
+#: glade/xcfa_win_treeview.glade:326
+msgid "DVD"
+msgstr ""
+
+#: glade/xcfa_win_treeview.glade:373 glade/xcfa_win_treeview.glade:791
+msgid "Wav"
+msgstr ""
+
+#: glade/xcfa_win_treeview.glade:390 glade/xcfa_win_treeview.glade:808
+msgid "Flac"
+msgstr ""
+
+#: glade/xcfa_win_treeview.glade:407 glade/xcfa_win_treeview.glade:825
+msgid "Ape"
+msgstr ""
+
+#: glade/xcfa_win_treeview.glade:424 glade/xcfa_win_treeview.glade:842
+msgid "Wavpack"
+msgstr ""
+
+#: glade/xcfa_win_treeview.glade:441 glade/xcfa_win_treeview.glade:859
+msgid "Ogg"
+msgstr ""
+
+#: glade/xcfa_win_treeview.glade:458 glade/xcfa_win_treeview.glade:876
+msgid "M4a"
+msgstr ""
+
+#: glade/xcfa_win_treeview.glade:475 glade/xcfa_win_treeview.glade:893
+msgid "Aac"
+msgstr ""
+
+#: glade/xcfa_win_treeview.glade:492 glade/xcfa_win_treeview.glade:910
+msgid "Musepack"
+msgstr ""
+
+#: glade/xcfa_win_treeview.glade:509 glade/xcfa_win_treeview.glade:927
+msgid "Mp3"
+msgstr ""
+
+#: glade/xcfa_win_treeview.glade:526
+msgid "Num"
+msgstr ""
+
+#: glade/xcfa_win_treeview.glade:709
+msgid "CD"
+msgstr ""
+
+#: glade/xcfa_win_treeview.glade:978
+msgid "Replaygain"
+msgstr ""
+
+#: glade/xcfa_win_treeview.glade:1127
+msgid "CONVERSIONS"
+msgstr ""
+
+#: glade/xcfa_win_treeview.glade:1158
+msgid "Hertz"
+msgstr ""
+
+#: glade/xcfa_win_treeview.glade:1175
+msgid "New Hertz"
+msgstr ""
+
+#: glade/xcfa_win_treeview.glade:1192
+msgid "Voie"
+msgstr ""
+
+#: glade/xcfa_win_treeview.glade:1209
+msgid "New Voie"
+msgstr ""
+
+#: glade/xcfa_win_treeview.glade:1226
+msgid "Bits"
+msgstr ""
+
+#: glade/xcfa_win_treeview.glade:1243
+msgid "New Bits"
+msgstr ""
+
+#: glade/xcfa_win_treeview.glade:1392
+msgid "WAV"
+msgstr ""
+
+#: glade/xcfa_win_treeview.glade:1440
+msgid "Bitrate"
+msgstr ""
+
+#: glade/xcfa_win_treeview.glade:1457
+msgid "New Bitrate"
+msgstr ""
+
+#: glade/xcfa_win_treeview.glade:1641
+msgid "MP3-OGG"
+msgstr ""
+
+#: glade/xcfa_win_treeview.glade:1842
+msgid "TAGS"
+msgstr ""
+
+#: glade/xcfa_win_treeview.glade:1894
+msgid "Selection globale"
+msgstr ""
+
+#: glade/xcfa_win_treeview.glade:1948
+msgid "Deselection globale"
+msgstr ""
+
+#: glade/xcfa_win_treeview.glade:2009
+msgid "Retour"
 msgstr ""

xcfa-5.0.2.tar.gz/po_cli Added

xcfa-5.0.2.tar.gz/po_cli/ChangeLog Added

xcfa-5.0.2.tar.gz/po_cli/Makefile.in.in Added

@@ -0,0 +1,476 @@
+# Makefile for PO directory in any package using GNU gettext.
+# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+#
+# This file can be copied and used freely without restrictions. It can
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.
+# Please note that the actual code of GNU gettext is covered by the GNU
+# General Public License and is *not* in the public domain.
+#
+# Origin: gettext-0.19
+GETTEXT_MACRO_VERSION = 0.19
+
+# PACKAGE = @PACKAGE@
+PACKAGE = xcfa_cli
+VERSION = @VERSION@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+
+SED = @SED@
+SHELL = /bin/sh
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
+datadir = @datadir@
+localedir = @localedir@
+gettextsrcdir = $(datadir)/gettext/po
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# @install_sh@ does not start with $(SHELL), so we add it.
+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
+mkinstalldirs = $(SHELL) @install_sh@ -d
+install_sh = $(SHELL) @install_sh@
+MKDIR_P = @MKDIR_P@
+mkdir_p = @mkdir_p@
+
+GMSGFMT_ = @GMSGFMT@
+GMSGFMT_no = @GMSGFMT@
+GMSGFMT_yes = @GMSGFMT_015@
+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
+MSGFMT_ = @MSGFMT@
+MSGFMT_no = @MSGFMT@
+MSGFMT_yes = @MSGFMT_015@
+MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
+XGETTEXT_ = @XGETTEXT@
+XGETTEXT_no = @XGETTEXT@
+XGETTEXT_yes = @XGETTEXT_015@
+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
+MSGMERGE = msgmerge
+MSGMERGE_UPDATE = @MSGMERGE@ --update
+MSGINIT = msginit
+MSGCONV = msgconv
+MSGFILTER = msgfilter
+
+POFILES = @POFILES@
+GMOFILES = @GMOFILES@
+UPDATEPOFILES = @UPDATEPOFILES@
+DUMMYPOFILES = @DUMMYPOFILES@
+DISTFILES.common = Makefile.in.in remove-potcdate.sin \
+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
+$(POFILES) $(GMOFILES) \
+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
+
+POTFILES = \
+
+CATALOGS = @CATALOGS@
+
+POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot
+POFILESDEPS_yes = $(POFILESDEPS_)
+POFILESDEPS_no =
+POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT))
+
+DISTFILESDEPS_ = update-po
+DISTFILESDEPS_yes = $(DISTFILESDEPS_)
+DISTFILESDEPS_no =
+DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
+
+# Makevars gets inserted here. (Don't remove this line!)
+
+.SUFFIXES:
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
+
+.po.mo:
+	@echo "$(MSGFMT) -c -o $@ $<"; \
+	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+
+.po.gmo:
+	@lang=`echo $* | sed -e 's,.*/,,'`; \
+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
+	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+
+.sin.sed:
+	sed -e '/^#/d' $< > t-$@
+	mv t-$@ $@
+
+
+all: all-@USE_NLS@
+
+all-yes: stamp-po
+all-no:
+
+# Ensure that the gettext macros and this Makefile.in.in are in sync.
+CHECK_MACRO_VERSION = \
+	test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+	 || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
+	 exit 1; \
+	 }
+
+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
+# we don't want to bother translators with empty POT files). We assume that
+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
+# In this case, stamp-po is a nop (i.e. a phony target).
+
+# stamp-po is a timestamp denoting the last time at which the CATALOGS have
+# been loosely updated. Its purpose is that when a developer or translator
+# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
+# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
+# invocations of "make" will do nothing. This timestamp would not be necessary
+# if updating the $(CATALOGS) would always touch them; however, the rule for
+# $(POFILES) has been designed to not touch files that don't need to be
+# changed.
+stamp-po: $(srcdir)/$(DOMAIN).pot
+	@$(CHECK_MACRO_VERSION)
+	test ! -f $(srcdir)/$(DOMAIN).pot || \
+	 test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
+	 echo "touch stamp-po" && \
+	 echo timestamp > stamp-poT && \
+	 mv stamp-poT stamp-po; \
+	}
+
+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
+# otherwise packages like GCC can not be built if only parts of the source
+# have been downloaded.
+
+# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
+# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+# The determination of whether the package xyz is a GNU one is based on the
+# heuristic whether some file in the top level directory mentions "GNU xyz".
+# If GNU 'find' is available, we avoid grepping through monster files.
+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+	package_gnu="$(PACKAGE_GNU)"; \
+	test -n "$$package_gnu" || { \
+	 if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
+		 LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \
+			 -size -10000000c -exec grep 'GNU @PACKAGE@' \
+			 /dev/null '{}' ';' 2>/dev/null; \
+	 else \
+		 LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
+	 fi; \
+	 } | grep -v 'libtool:' >/dev/null; then \
+	 package_gnu=yes; \
+	 else \
+	 package_gnu=no; \
+	 fi; \
+	}; \
+	if test "$$package_gnu" = "yes"; then \
+	 package_prefix='GNU '; \
+	else \
+	 package_prefix=''; \
+	fi; \
+	if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
+	 msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+	else \
+	 msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+	fi; \
+	case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
+	 $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+	 --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+	 --files-from=$(srcdir)/POTFILES.in \
+	 --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	 --msgid-bugs-address="$$msgid_bugs_address" \
+	 ;; \
+	 *) \
+	 $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+	 --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+	 --files-from=$(srcdir)/POTFILES.in \
+	 --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	 --package-name="$${package_prefix}@PACKAGE@" \
+	 --package-version='@VERSION@' \
+	 --msgid-bugs-address="$$msgid_bugs_address" \
+	 ;; \
+	esac
+	test ! -f $(DOMAIN).po || { \
+	 if test -f $(srcdir)/$(DOMAIN).pot; then \
+	 sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
+	 sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
+	 if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
+	 rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
+	 else \
+	 rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
+	 mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+	 fi; \
+	 else \
+	 mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+	 fi; \
+	}
+
+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
+# every "make" invocation, only create it when it is missing.
+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
+$(srcdir)/$(DOMAIN).pot:
+	$(MAKE) $(DOMAIN).pot-update
+
+# This target rebuilds a PO file if $(DOMAIN).pot has changed.
+# Note that a PO file is not touched if it doesn't need to be changed.
+$(POFILES): $(POFILESDEPS)
+	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+	if test -f "$(srcdir)/$${lang}.po"; then \
+	 test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \
+	 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	 echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
+	 cd $(srcdir) \
+	 && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+	 $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
+	 *) \
+	 $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
+	 esac; \
+	 }; \
+	else \
+	 $(MAKE) $${lang}.po-create; \
+	fi
+
+
+install: install-exec install-data
+install-exec:
+install-data: install-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	 $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+	 for file in $(DISTFILES.common) Makevars.template; do \
+	 $(INSTALL_DATA) $(srcdir)/$$file \
+			 $(DESTDIR)$(gettextsrcdir)/$$file; \
+	 done; \
+	 for file in Makevars; do \
+	 rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	 done; \
+	else \
+	 : ; \
+	fi
+install-data-no: all
+install-data-yes: all
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	 cat=`basename $$cat`; \
+	 lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	 dir=$(localedir)/$$lang/LC_MESSAGES; \
+	 $(mkdir_p) $(DESTDIR)$$dir; \
+	 if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
+	 $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+	 echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+	 for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+	 if test -n "$$lc"; then \
+	 if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+	 link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+	 mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	 (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+	 for file in *; do \
+	 if test -f $$file; then \
+	 ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+	 fi; \
+	 done); \
+	 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	 else \
+	 if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+	 :; \
+	 else \
+	 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	 fi; \
+	 fi; \
+	 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	 ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+	 ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+	 cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	 echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
+	 fi; \
+	 done; \
+	done
+
+install-strip: install
+
+installdirs: installdirs-exec installdirs-data
+installdirs-exec:
+installdirs-data: installdirs-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	 $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+	else \
+	 : ; \
+	fi
+installdirs-data-no:
+installdirs-data-yes:
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	 cat=`basename $$cat`; \
+	 lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	 dir=$(localedir)/$$lang/LC_MESSAGES; \
+	 $(mkdir_p) $(DESTDIR)$$dir; \
+	 for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+	 if test -n "$$lc"; then \
+	 if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+	 link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+	 mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	 (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+	 for file in *; do \
+	 if test -f $$file; then \
+	 ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+	 fi; \
+	 done); \
+	 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	 else \
+	 if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+	 :; \
+	 else \
+	 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	 fi; \
+	 fi; \
+	 fi; \
+	 done; \
+	done
+
+# Define this as empty until I found a useful application.
+installcheck:
+
+uninstall: uninstall-exec uninstall-data
+uninstall-exec:
+uninstall-data: uninstall-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	 for file in $(DISTFILES.common) Makevars.template; do \
+	 rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	 done; \
+	else \
+	 : ; \
+	fi
+uninstall-data-no:
+uninstall-data-yes:
+	catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	 cat=`basename $$cat`; \
+	 lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	 for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
+	 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	 done; \
+	done
+
+check: all
+
+info dvi ps pdf html tags TAGS ctags CTAGS ID:
+
+mostlyclean:
+	rm -f remove-potcdate.sed
+	rm -f stamp-poT
+	rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
+	rm -fr *.o
+
+clean: mostlyclean
+
+distclean: clean
+	rm -f Makefile Makefile.in POTFILES *.mo
+
+maintainer-clean: distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	rm -f stamp-po $(GMOFILES)
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir:
+	test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS)
+	@$(MAKE) dist2
+# This is a separate target because 'update-po' must be executed before.
+dist2: stamp-po $(DISTFILES)
+	dists="$(DISTFILES)"; \
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	 dists="$$dists Makevars.template"; \
+	fi; \
+	if test -f $(srcdir)/$(DOMAIN).pot; then \
+	 dists="$$dists $(DOMAIN).pot stamp-po"; \
+	fi; \
+	if test -f $(srcdir)/ChangeLog; then \
+	 dists="$$dists ChangeLog"; \
+	fi; \
+	for i in 0 1 2 3 4 5 6 7 8 9; do \
+	 if test -f $(srcdir)/ChangeLog.$$i; then \
+	 dists="$$dists ChangeLog.$$i"; \
+	 fi; \
+	done; \
+	if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
+	for file in $$dists; do \
+	 if test -f $$file; then \
+	 cp -p $$file $(distdir) || exit 1; \
+	 else \
+	 cp -p $(srcdir)/$$file $(distdir) || exit 1; \
+	 fi; \
+	done
+
+update-po: Makefile
+	$(MAKE) $(DOMAIN).pot-update
+	test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
+	$(MAKE) update-gmo
+
+# General rule for creating PO files.
+
+.nop.po-create:
+	@lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
+	echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
+	exit 1
+
+# General rule for updating PO files.
+
+.nop.po-update:
+	@lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
+	if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
+	tmpdir=`pwd`; \
+	echo "$$lang:"; \
+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+	cd $(srcdir); \
+	if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+	 $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+	 *) \
+	 $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+	 esac; \
+	 }; then \
+	 if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	 rm -f $$tmpdir/$$lang.new.po; \
+	 else \
+	 if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	 :; \
+	 else \
+	 echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	 exit 1; \
+	 fi; \
+	 fi; \
+	else \
+	 echo "msgmerge for $$lang.po failed!" 1>&2; \
+	 rm -f $$tmpdir/$$lang.new.po; \
+	fi
+
+$(DUMMYPOFILES):
+
+update-gmo: Makefile $(GMOFILES)
+	@:
+
+# Recreate Makefile by invoking config.status. Explicitly invoke the shell,
+# because execution permission bits may not work on the current file system.
+# Use @SHELL@, which is the shell determined by autoconf for the use by its
+# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
+	cd $(top_builddir) \
+	 && @SHELL@ ./config.status $(subdir)/$@.in po-directories
+
+force:
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

xcfa-5.0.2.tar.gz/po_cli/Makevars Added

@@ -0,0 +1,72 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU =
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS =
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context.  Possible values are "yes" and "no".  Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+#   --previous            to keep previous msgids of translated messages,
+#   --quiet               to reduce the verbosity.
+MSGMERGE_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = yes
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = yes

xcfa-5.0.2.tar.gz/po_cli/POTFILES.in Added

xcfa-5.0.2.tar.gz/po_cli/Rules-quot Added

@@ -0,0 +1,58 @@
+# This file, Rules-quot, can be copied and used freely without restrictions.
+# Special Makefile rules for English message catalogs with quotation marks.
+
+DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
+
+.SUFFIXES: .insert-header .po-update-en
+
+en@quot.po-create:
+	$(MAKE) en@quot.po-update
+en@boldquot.po-create:
+	$(MAKE) en@boldquot.po-update
+
+en@quot.po-update: en@quot.po-update-en
+en@boldquot.po-update: en@boldquot.po-update-en
+
+.insert-header.po-update-en:
+	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
+	if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
+	tmpdir=`pwd`; \
+	echo "$$lang:"; \
+	ll=`echo $$lang | sed -e 's/@.*//'`; \
+	LC_ALL=C; export LC_ALL; \
+	cd $(srcdir); \
+	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \
+	   | $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | \
+	   { case `$(MSGFILTER) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	     '' | 0.[0-9] | 0.[0-9].* | 0.1[0-8] | 0.1[0-8].*) \
+	       $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed \
+	       ;; \
+	     *) \
+	       $(MSGFILTER) `echo $$lang | sed -e 's/.*@//'` \
+	       ;; \
+	     esac } 2>/dev/null > $$tmpdir/$$lang.new.po \
+	     ; then \
+	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  else \
+	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	      :; \
+	    else \
+	      echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	      exit 1; \
+	    fi; \
+	  fi; \
+	else \
+	  echo "creation of $$lang.po failed!" 1>&2; \
+	  rm -f $$tmpdir/$$lang.new.po; \
+	fi
+
+en@quot.insert-header: insert-header.sin
+	sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
+
+en@boldquot.insert-header: insert-header.sin
+	sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
+
+mostlyclean: mostlyclean-quot
+mostlyclean-quot:
+	rm -f *.insert-header

xcfa-5.0.2.tar.gz/po_cli/boldquot.sed Added

xcfa-5.0.2.tar.gz/po_cli/de.gmo Added

xcfa-5.0.2.tar.gz/po_cli/de.po Added

@@ -0,0 +1,400 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xcfa_cli 0.0.6\n"
+"Report-Msgid-Bugs-To: http://www.xcfa.tuxfamily.org/\n"
+"POT-Creation-Date: 2015-03-03 11:27+0100\n"
+"PO-Revision-Date: 2015-02-07 10:45+0100\n"
+"Last-Translator: MyName <Emailr@Adress.Ext>\n"
+"Language-Team: german\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.7.3\n"
+
+#: src_cli/main.c:313
+#, c-format
+msgid ""
+"xcfa_cli is an implementation of xcfa in command line.\n"
+"xcfa_cli is an application for conversion, normalization, reconfiguring wav "
+"files and cut audio files ...\n"
+"\n"
+"What xcfa_cli can do:\n"
+" - replaygain on files: flac, mp3, ogg, wavpack\n"
+" - conversions:\n"
+" - from files:\n"
+" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, "
+"aif, ac3\t\t\n"
+" - to files:\t\t\t\n"
+" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, aac\n"
+" - conversion settings for file management:\n"
+" flac, ape, wavpack, ogg, m4a, aac, mpc, mp3\n"
+" - management tags\n"
+" - management cue wav file\n"
+" - manipulation of the frequency, track and bit wav files\n"
+" - standardization on files: wav, mp3, ogg\n"
+" - cuts (split) wav files\n"
+" - displaying information on files\n"
+msgstr ""
+"xcfa_cli ist eine Implementierung des xcfa in Befehlszeile ein.\n"
+"xcfa_cli ist eine Anwendung für die Konvertierung, Normalisierung, zur "
+"Neukonfiguration des wav Dateien und schneiden Audio-Dateien ...\n"
+"\n"
+"Was xcfa_cli Möglichkeiten:\n"
+" - replaygain auf Dateien: flac, mp3, ogg, wavpack\n"
+" - konvertierungen:\n"
+" - von Dateien:\n"
+" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, "
+"aif, ac3\t\t\n"
+" - dateien:\t\t\t\n"
+" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, aac\n"
+" - konvertierungseinstellungen für die Dateiverwaltung:\n"
+" flac, ape, wavpack, ogg, m4a, aac, mpc, mp3\n"
+" - management-Tags\n"
+" - management-Cue wav-Datei\n"
+" - manipulation der Frequenz, Leichtathletik-Bit-WAV-Dateien\n"
+" - standardisierung auf Dateien: wav, mp3, ogg\n"
+" - schnitte (split) WAV-Dateien\n"
+" - anzeigen von Informationen über Dateien\n"
+
+#: src_cli/main.c:338
+#, c-format
+msgid ""
+" --verbose Verbose mode\n"
+" -h --help Print help mode and quit\n"
+"\n"
+" -i <\"file.type\"> --input <\"file.type\">\n"
+" Input name file to convert in "
+"inverted commas, by example: --input \"*.flac\"\n"
+" Type input files: wav, flac, ape, "
+"wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, aif, ac3\n"
+" -o <path_dest/> --output <path_dest/>\n"
+" Destination folder. By default in "
+"the source file folder.\n"
+" -d <wav,flac,ape,...> --dest <wav,flac,ape,...>\n"
+" Destination file: wav, flac, ape, "
+"wavpack, ogg, m4a, mpc, mp3, aac\n"
+" -r --recursion Recursive search\n"
+" -e --ext2src Extract in the source folder. This "
+"option is useful with '--recursion'\n"
+" --nice <priority> Change the priority of running "
+"processes in the interval: 0 .. 20\n"
+"\n"
+"Management options with default parameters:\n"
+"\n"
+" --op_flac <\"-5\">\n"
+" --op_ape <\"c2000\">\n"
+" --op_wavpack <\"-y -j1\">\n"
+" --op_ogg <\"--quality=3\">\n"
+" --op_m4a <\"-q 100\">\n"
+" --op_aac <\"48\">\n"
+" --op_mpc <\"--verbose --overwrite --insane\">\n"
+" --op_mp3 <\"-h --nohist --noreplaygain -b 128\">\n"
+"\n"
+"Displays information about the files:\n"
+"\n"
+" --info_files Displays time, level dBFS, frequency/"
+"track/quantification\n"
+" --info_tags Displays tags\n"
+" --info_head Displays head\n"
+"\n"
+"Management tags:\n"
+"\n"
+" --no_tag The tags will not be carried\n"
+" --tag_album <\"tags\"> Tag of album\n"
+" --tag_artist <\"tags\"> Tag of artist\n"
+" --tag_title <\"tags\"> Tag of title\n"
+" --tag_number <\"tags\"> Tag of number\n"
+" --tag_genre <\"tags\"> Tag of genre\n"
+" --tag_year <\"tags\"> Tag of year\n"
+" --tag_comment <\"tags\"> Tag of comment\n"
+" --tag_description <\"tags\"> Tag of description\n"
+"\n"
+"Management cue file:\n"
+" -c <info|extract> --cue <info|extract>\n"
+" info Provides information on a "
+"WAV or CUE file.\n"
+" extract Extract all tracks of a WAV "
+"file.\n"
+"\n"
+"Management split:\n"
+"\n"
+" -s <hh:mm:ss> --split <hh:mm:ss> Mark the beginning of the file to be "
+"cut.\n"
+" -l <sec> --length <sec> Specifies the length of the file to "
+"cut with the seconds parameter.\n"
+"\n"
+"Changing the settings of a WAV file:\n"
+"\n"
+" -f <num> --frequency <num> Changing the frequency: 8000, "
+"22000, 32000, 44056, 44100, 48000, 88200, 96000 or other\n"
+" -t <num> --track <num> Changing the number of tracks: 1, 2, "
+"4, 6\n"
+" -q <num> --quantification <num> Changing the quantification: 8, "
+"16, 24, 32, 64\n"
+"\n"
+"Replaygain: dynamic modification for next files: FLAC, MP3, OGG, WAVPACK\n"
+"\n"
+" -g <clear|album|track> --replaygain <clear|album|track>\n"
+" FLAC [ clear | album ]\n"
+" MP3 [ clear | album | track ]\n"
+" OGG [ clear | album | track ]\n"
+" WAVPACK [ clear | album | track ]\n"
+"\n"
+"Normalize: static modification for next files: MP3, WAV, OGG\n"
+" See an excellent article by @Dzef on standardization: http://ubunteros."
+"tuxfamily.org/spip.php?article159\n"
+"\n"
+" --peak Action on a single file.\n"
+" Maximum volume amplification for "
+"each file:\n"
+" Increase the overall level of the "
+"signal so as to bring the level to 0 dBFS peak without changing dynamics.\n"
+" --peak_album Action on a group of files.\n"
+" Maximum volume boost for a group of "
+"files in accordance with the level of differences between each of them.\n"
+" If the maximum level of one or more "
+"files is already at 0 dBFS, the level of all the selected files remain "
+"unchanged\n"
+" after normalization. So this mode "
+"can be safely used almost systematically.\n"
+" --mix_rms_album <dBFS> Action on a group of files.\n"
+" Adjusting the average volume for a "
+"group of files respecting average level of the differences between each of "
+"them.\n"
+" The selecting a value for a file "
+"modifies the other files in the group.\n"
+" --fix_rms <dBFS> Action on a single file.\n"
+" Adjusting the average volume of each "
+"file..\n"
+"\n"
+msgstr ""
+" --verbose Verbose mode\n"
+" -h --help Print help mode and quit\n"
+"\n"
+" -i <\"file.type\"> --input <\"file.type\">\n"
+" Input name file to convert in "
+"inverted commas, by example: --input \"*.flac\"\n"
+" Type input files: wav, flac, ape, "
+"wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, aif, ac3\n"
+" -o <path_dest/> --output <path_dest/>\n"
+" Destination folder. By default in "
+"the source file folder.\n"
+" -d <wav,flac,ape,...> --dest <wav,flac,ape,...>\n"
+" Destination file: wav, flac, ape, "
+"wavpack, ogg, m4a, mpc, mp3, aac\n"
+" -r --recursion Recursive search\n"
+" -e --ext2src Extract in the source folder. This "
+"option is useful with '--recursion'\n"
+" --nice <priority> Change the priority of running "
+"processes in the interval: 0 .. 20\n"
+"\n"
+"Management options with default parameters:\n"
+"\n"
+" --op_flac <\"-5\">\n"
+" --op_ape <\"c2000\">\n"
+" --op_wavpack <\"-y -j1\">\n"
+" --op_ogg <\"--quality=3\">\n"
+" --op_m4a <\"-q 100\">\n"
+" --op_aac <\"48\">\n"
+" --op_mpc <\"--verbose --overwrite --insane\">\n"
+" --op_mp3 <\"-h --nohist --noreplaygain -b 128\">\n"
+"\n"
+"Displays information about the files:\n"
+"\n"
+" --info_files Displays time, level dBFS, frequency/"
+"track/quantification\n"
+" --info_tags Displays tags\n"
+" --info_head Displays head\n"
+"\n"
+"Management tags:\n"
+"\n"
+" --no_tag The tags will not be carried\n"
+" --tag_album <\"tags\"> Tag of album\n"
+" --tag_artist <\"tags\"> Tag of artist\n"
+" --tag_title <\"tags\"> Tag of title\n"
+" --tag_number <\"tags\"> Tag of number\n"
+" --tag_genre <\"tags\"> Tag of genre\n"
+" --tag_year <\"tags\"> Tag of year\n"
+" --tag_comment <\"tags\"> Tag of comment\n"
+" --tag_description <\"tags\"> Tag of description\n"
+"\n"
+"Management cue file:\n"
+" -c <info|extract> --cue <info|extract>\n"
+" info Provides information on a "
+"WAV or CUE file.\n"
+" extract Extract all tracks of a WAV "
+"file.\n"
+"\n"
+"Management split:\n"
+"\n"
+" -s <hh:mm:ss> --split <hh:mm:ss> Mark the beginning of the file to be "
+"cut.\n"
+" -l <sec> --length <sec> Specifies the length of the file to "
+"cut with the seconds parameter.\n"
+"\n"
+"Changing the settings of a WAV file:\n"
+"\n"
+" -f <num> --frequency <num> Changing the frequency: 8000, "
+"22000, 32000, 44056, 44100, 48000, 88200, 96000 or other\n"
+" -t <num> --track <num> Changing the number of tracks: 1, 2, "
+"4, 6\n"
+" -q <num> --quantification <num> Changing the quantification: 8, "
+"16, 24, 32, 64\n"
+"\n"
+"Replaygain: dynamic modification for next files: FLAC, MP3, OGG, WAVPACK\n"
+"\n"
+" -g <clear|album|track> --replaygain <clear|album|track>\n"
+" FLAC [ clear | album ]\n"
+" MP3 [ clear | album | track ]\n"
+" OGG [ clear | album | track ]\n"
+" WAVPACK [ clear | album | track ]\n"
+"\n"
+"Normalize: static modification for next files: MP3, WAV, OGG\n"
+" See an excellent article by @Dzef on standardization: http://ubunteros."
+"tuxfamily.org/spip.php?article159\n"
+"\n"
+" --peak Action on a single file.\n"
+" Maximum volume amplification for "
+"each file:\n"
+" Increase the overall level of the "
+"signal so as to bring the level to 0 dBFS peak without changing dynamics.\n"
+" --peak_album Action on a group of files.\n"
+" Maximum volume boost for a group of "
+"files in accordance with the level of differences between each of them.\n"
+" If the maximum level of one or more "
+"files is already at 0 dBFS, the level of all the selected files remain "
+"unchanged\n"
+" after normalization. So this mode "
+"can be safely used almost systematically.\n"
+" --mix_rms_album <dBFS> Action on a group of files.\n"
+" Adjusting the average volume for a "
+"group of files respecting average level of the differences between each of "
+"them.\n"
+" The selecting a value for a file "
+"modifies the other files in the group.\n"
+" --fix_rms <dBFS> Action on a single file.\n"
+" Adjusting the average volume of each "
+"file..\n"
+"\n"
+
+#: src_cli/main.c:431
+#, c-format
+msgid "Example conversion:\n"
+msgstr "Beispiel Konvertierung:\n"
+
+#: src_cli/main.c:438
+#, c-format
+msgid "Conversion example with two inputs:\n"
+msgstr "Umrechnungsbeispiel mit zwei eingängen:\n"
+
+#: src_cli/main.c:443
+#, c-format
+msgid "Example split:\n"
+msgstr "Beispiel split:\n"
+
+#: src_cli/main.c:450
+#, c-format
+msgid "Example cue:\n"
+msgstr "Beispiel cue:\n"
+
+#: src_cli/main.c:458
+#, c-format
+msgid "Example setting wav:\n"
+msgstr "Beispiel einstellung wav:\n"
+
+#: src_cli/main.c:463
+#, c-format
+msgid "Example replaygain:\n"
+msgstr "Beispiel replaygain:\n"
+
+#: src_cli/main.c:469
+#, c-format
+msgid "Example normalize:\n"
+msgstr "Beispiel normalisieren:\n"
+
+#: src_cli/main.c:478
+#, c-format
+msgid "Example info:\n"
+msgstr "Beispiel info:\n"
+
+#: src_cli/prg_init.c:54
+msgid " Decode ATSC A/52 audio streams"
+msgstr " Decode ATSC A / 52-Kanal"
+
+#: src_cli/prg_init.c:62
+msgid " AAC+ encoder"
+msgstr " AAC+ encoder"
+
+#: src_cli/prg_init.c:70
+msgid " Cherche des renseignements sur les formats mp3"
+msgstr " Ich suche Informationen über mp3-Formate"
+
+#: src_cli/prg_init.c:78
+msgid " Audio Codeur freeware"
+msgstr " Freeware Audio-Encoder"
+
+#: src_cli/prg_init.c:86
+msgid " MPEG-4 AAC decodeur"
+msgstr " MPEG-4 AAC-Decoder"
+
+#: src_cli/prg_init.c:94
+msgid " Conversion wav : flac"
+msgstr " Umwandlung wav : flac"
+
+#: src_cli/prg_init.c:102
+msgid " Conversion wav : mp3"
+msgstr " Umwandlung wav : mp3"
+
+#: src_cli/prg_init.c:111
+msgid " Monkey's Audio Console Front End : APE"
+msgstr " Monkey's Audio Console Front End : APE"
+
+#: src_cli/prg_init.c:120 src_cli/prg_init.c:128
+msgid " MusePack commandline utilities"
+msgstr " MusePack commandline utilities"
+
+#: src_cli/prg_init.c:136
+msgid " Lecteur et extracteur"
+msgstr " Spieler und Dunstabzug"
+
+#: src_cli/prg_init.c:144
+msgid " Replaygain pour les fichiers mp3"
+msgstr " Für MP3-Dateien replaygain"
+
+#: src_cli/prg_init.c:152
+msgid " Normaliseur de fichier wav"
+msgstr " Normalizer WAV-Datei"
+
+#: src_cli/prg_init.c:160
+msgid " A program to send desktop notifications"
+msgstr " Ein Programm zur Desktop-Benachrichtigungen zu senden"
+
+#: src_cli/prg_init.c:168
+msgid " Forte compression au format wave"
+msgstr " Starke Kompression im Wave-Format"
+
+#: src_cli/prg_init.c:176
+msgid " Decoupage de fichiers sans decodage"
+msgstr " Cutting-Dateien ohne Dekodierung"
+
+#: src_cli/prg_init.c:184
+msgid " Transformation universelle de fichiers son"
+msgstr " Universal-Datei ihre Umwandlung"
+
+#: src_cli/prg_init.c:192
+msgid " Conversion wav : ogg"
+msgstr " Umwandlung wav : ogg"
+
+#: src_cli/prg_init.c:200
+msgid " Replaygain pour les fichiers ogg"
+msgstr " Replaygain für ogg-Dateien"
+
+#: src_cli/prg_init.c:208
+msgid " WAVPACK Hybrid Lossless Audio Compressor"
+msgstr " WAVPACK Hybrid Lossless Audio Compressor"

xcfa-5.0.2.tar.gz/po_cli/en.gmo Added

xcfa-5.0.2.tar.gz/po_cli/en.po Added

@@ -0,0 +1,399 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xcfa_cli 0.0.6\n"
+"Report-Msgid-Bugs-To: http://www.xcfa.tuxfamily.org/\n"
+"POT-Creation-Date: 2015-03-03 11:27+0100\n"
+"PO-Revision-Date: 2014-11-11 22:10:09.622832\n"
+"Last-Translator: MyName <Emailr@Adress.Ext>\n"
+"Language-Team: english\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src_cli/main.c:313
+#, c-format
+msgid ""
+"xcfa_cli is an implementation of xcfa in command line.\n"
+"xcfa_cli is an application for conversion, normalization, reconfiguring wav "
+"files and cut audio files ...\n"
+"\n"
+"What xcfa_cli can do:\n"
+" - replaygain on files: flac, mp3, ogg, wavpack\n"
+" - conversions:\n"
+" - from files:\n"
+" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, "
+"aif, ac3\t\t\n"
+" - to files:\t\t\t\n"
+" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, aac\n"
+" - conversion settings for file management:\n"
+" flac, ape, wavpack, ogg, m4a, aac, mpc, mp3\n"
+" - management tags\n"
+" - management cue wav file\n"
+" - manipulation of the frequency, track and bit wav files\n"
+" - standardization on files: wav, mp3, ogg\n"
+" - cuts (split) wav files\n"
+" - displaying information on files\n"
+msgstr ""
+"xcfa_cli is an implementation of xcfa in command line.\n"
+"xcfa_cli is an application for conversion, normalization, reconfiguring wav "
+"files and cut audio files ...\n"
+"\n"
+"What xcfa_cli can do:\n"
+" - replaygain on files: flac, mp3, ogg, wavpack\n"
+" - conversions:\n"
+" - from files:\n"
+" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, "
+"aif, ac3\t\t\n"
+" - to files:\t\t\t\n"
+" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, aac\n"
+" - conversion settings for file management:\n"
+" flac, ape, wavpack, ogg, m4a, aac, mpc, mp3\n"
+" - management tags\n"
+" - management cue wav file\n"
+" - manipulation of the frequency, track and bit wav files\n"
+" - standardization on files: wav, mp3, ogg\n"
+" - cuts (split) wav files\n"
+" - displaying information on files\n"
+
+#: src_cli/main.c:338
+#, c-format
+msgid ""
+" --verbose Verbose mode\n"
+" -h --help Print help mode and quit\n"
+"\n"
+" -i <\"file.type\"> --input <\"file.type\">\n"
+" Input name file to convert in "
+"inverted commas, by example: --input \"*.flac\"\n"
+" Type input files: wav, flac, ape, "
+"wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, aif, ac3\n"
+" -o <path_dest/> --output <path_dest/>\n"
+" Destination folder. By default in "
+"the source file folder.\n"
+" -d <wav,flac,ape,...> --dest <wav,flac,ape,...>\n"
+" Destination file: wav, flac, ape, "
+"wavpack, ogg, m4a, mpc, mp3, aac\n"
+" -r --recursion Recursive search\n"
+" -e --ext2src Extract in the source folder. This "
+"option is useful with '--recursion'\n"
+" --nice <priority> Change the priority of running "
+"processes in the interval: 0 .. 20\n"
+"\n"
+"Management options with default parameters:\n"
+"\n"
+" --op_flac <\"-5\">\n"
+" --op_ape <\"c2000\">\n"
+" --op_wavpack <\"-y -j1\">\n"
+" --op_ogg <\"--quality=3\">\n"
+" --op_m4a <\"-q 100\">\n"
+" --op_aac <\"48\">\n"
+" --op_mpc <\"--verbose --overwrite --insane\">\n"
+" --op_mp3 <\"-h --nohist --noreplaygain -b 128\">\n"
+"\n"
+"Displays information about the files:\n"
+"\n"
+" --info_files Displays time, level dBFS, frequency/"
+"track/quantification\n"
+" --info_tags Displays tags\n"
+" --info_head Displays head\n"
+"\n"
+"Management tags:\n"
+"\n"
+" --no_tag The tags will not be carried\n"
+" --tag_album <\"tags\"> Tag of album\n"
+" --tag_artist <\"tags\"> Tag of artist\n"
+" --tag_title <\"tags\"> Tag of title\n"
+" --tag_number <\"tags\"> Tag of number\n"
+" --tag_genre <\"tags\"> Tag of genre\n"
+" --tag_year <\"tags\"> Tag of year\n"
+" --tag_comment <\"tags\"> Tag of comment\n"
+" --tag_description <\"tags\"> Tag of description\n"
+"\n"
+"Management cue file:\n"
+" -c <info|extract> --cue <info|extract>\n"
+" info Provides information on a "
+"WAV or CUE file.\n"
+" extract Extract all tracks of a WAV "
+"file.\n"
+"\n"
+"Management split:\n"
+"\n"
+" -s <hh:mm:ss> --split <hh:mm:ss> Mark the beginning of the file to be "
+"cut.\n"
+" -l <sec> --length <sec> Specifies the length of the file to "
+"cut with the seconds parameter.\n"
+"\n"
+"Changing the settings of a WAV file:\n"
+"\n"
+" -f <num> --frequency <num> Changing the frequency: 8000, "
+"22000, 32000, 44056, 44100, 48000, 88200, 96000 or other\n"
+" -t <num> --track <num> Changing the number of tracks: 1, 2, "
+"4, 6\n"
+" -q <num> --quantification <num> Changing the quantification: 8, "
+"16, 24, 32, 64\n"
+"\n"
+"Replaygain: dynamic modification for next files: FLAC, MP3, OGG, WAVPACK\n"
+"\n"
+" -g <clear|album|track> --replaygain <clear|album|track>\n"
+" FLAC [ clear | album ]\n"
+" MP3 [ clear | album | track ]\n"
+" OGG [ clear | album | track ]\n"
+" WAVPACK [ clear | album | track ]\n"
+"\n"
+"Normalize: static modification for next files: MP3, WAV, OGG\n"
+" See an excellent article by @Dzef on standardization: http://ubunteros."
+"tuxfamily.org/spip.php?article159\n"
+"\n"
+" --peak Action on a single file.\n"
+" Maximum volume amplification for "
+"each file:\n"
+" Increase the overall level of the "
+"signal so as to bring the level to 0 dBFS peak without changing dynamics.\n"
+" --peak_album Action on a group of files.\n"
+" Maximum volume boost for a group of "
+"files in accordance with the level of differences between each of them.\n"
+" If the maximum level of one or more "
+"files is already at 0 dBFS, the level of all the selected files remain "
+"unchanged\n"
+" after normalization. So this mode "
+"can be safely used almost systematically.\n"
+" --mix_rms_album <dBFS> Action on a group of files.\n"
+" Adjusting the average volume for a "
+"group of files respecting average level of the differences between each of "
+"them.\n"
+" The selecting a value for a file "
+"modifies the other files in the group.\n"
+" --fix_rms <dBFS> Action on a single file.\n"
+" Adjusting the average volume of each "
+"file..\n"
+"\n"
+msgstr ""
+" --verbose Verbose mode\n"
+" -h --help Print help mode and quit\n"
+"\n"
+" -i <\"file.type\"> --input <\"file.type\">\n"
+" Input name file to convert in "
+"inverted commas, by example: --input \"*.flac\"\n"
+" Type input files: wav, flac, ape, "
+"wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, aif, ac3\n"
+" -o <path_dest/> --output <path_dest/>\n"
+" Destination folder. By default in "
+"the source file folder.\n"
+" -d <wav,flac,ape,...> --dest <wav,flac,ape,...>\n"
+" Destination file: wav, flac, ape, "
+"wavpack, ogg, m4a, mpc, mp3, aac\n"
+" -r --recursion Recursive search\n"
+" -e --ext2src Extract in the source folder. This "
+"option is useful with '--recursion'\n"
+" --nice <priority> Change the priority of running "
+"processes in the interval: 0 .. 20\n"
+"\n"
+"Management options with default parameters:\n"
+"\n"
+" --op_flac <\"-5\">\n"
+" --op_ape <\"c2000\">\n"
+" --op_wavpack <\"-y -j1\">\n"
+" --op_ogg <\"--quality=3\">\n"
+" --op_m4a <\"-q 100\">\n"
+" --op_aac <\"48\">\n"
+" --op_mpc <\"--verbose --overwrite --insane\">\n"
+" --op_mp3 <\"-h --nohist --noreplaygain -b 128\">\n"
+"\n"
+"Displays information about the files:\n"
+"\n"
+" --info_files Displays time, level dBFS, frequency/"
+"track/quantification\n"
+" --info_tags Displays tags\n"
+" --info_head Displays head\n"
+"\n"
+"Management tags:\n"
+"\n"
+" --no_tag The tags will not be carried\n"
+" --tag_album <\"tags\"> Tag of album\n"
+" --tag_artist <\"tags\"> Tag of artist\n"
+" --tag_title <\"tags\"> Tag of title\n"
+" --tag_number <\"tags\"> Tag of number\n"
+" --tag_genre <\"tags\"> Tag of genre\n"
+" --tag_year <\"tags\"> Tag of year\n"
+" --tag_comment <\"tags\"> Tag of comment\n"
+" --tag_description <\"tags\"> Tag of description\n"
+"\n"
+"Management cue file:\n"
+" -c <info|extract> --cue <info|extract>\n"
+" info Provides information on a "
+"WAV or CUE file.\n"
+" extract Extract all tracks of a WAV "
+"file.\n"
+"\n"
+"Management split:\n"
+"\n"
+" -s <hh:mm:ss> --split <hh:mm:ss> Mark the beginning of the file to be "
+"cut.\n"
+" -l <sec> --length <sec> Specifies the length of the file to "
+"cut with the seconds parameter.\n"
+"\n"
+"Changing the settings of a WAV file:\n"
+"\n"
+" -f <num> --frequency <num> Changing the frequency: 8000, "
+"22000, 32000, 44056, 44100, 48000, 88200, 96000 or other\n"
+" -t <num> --track <num> Changing the number of tracks: 1, 2, "
+"4, 6\n"
+" -q <num> --quantification <num> Changing the quantification: 8, "
+"16, 24, 32, 64\n"
+"\n"
+"Replaygain: dynamic modification for next files: FLAC, MP3, OGG, WAVPACK\n"
+"\n"
+" -g <clear|album|track> --replaygain <clear|album|track>\n"
+" FLAC [ clear | album ]\n"
+" MP3 [ clear | album | track ]\n"
+" OGG [ clear | album | track ]\n"
+" WAVPACK [ clear | album | track ]\n"
+"\n"
+"Normalize: static modification for next files: MP3, WAV, OGG\n"
+" See an excellent article by @Dzef on standardization: http://ubunteros."
+"tuxfamily.org/spip.php?article159\n"
+"\n"
+" --peak Action on a single file.\n"
+" Maximum volume amplification for "
+"each file:\n"
+" Increase the overall level of the "
+"signal so as to bring the level to 0 dBFS peak without changing dynamics.\n"
+" --peak_album Action on a group of files.\n"
+" Maximum volume boost for a group of "
+"files in accordance with the level of differences between each of them.\n"
+" If the maximum level of one or more "
+"files is already at 0 dBFS, the level of all the selected files remain "
+"unchanged\n"
+" after normalization. So this mode "
+"can be safely used almost systematically.\n"
+" --mix_rms_album <dBFS> Action on a group of files.\n"
+" Adjusting the average volume for a "
+"group of files respecting average level of the differences between each of "
+"them.\n"
+" The selecting a value for a file "
+"modifies the other files in the group.\n"
+" --fix_rms <dBFS> Action on a single file.\n"
+" Adjusting the average volume of each "
+"file..\n"
+"\n"
+
+#: src_cli/main.c:431
+#, c-format
+msgid "Example conversion:\n"
+msgstr "Example conversion:\n"
+
+#: src_cli/main.c:438
+#, c-format
+msgid "Conversion example with two inputs:\n"
+msgstr "Conversion example with two inputs:\n"
+
+#: src_cli/main.c:443
+#, c-format
+msgid "Example split:\n"
+msgstr "Example split:\n"
+
+#: src_cli/main.c:450
+#, c-format
+msgid "Example cue:\n"
+msgstr "Example cue:\n"
+
+#: src_cli/main.c:458
+#, c-format
+msgid "Example setting wav:\n"
+msgstr "Example setting wav:\n"
+
+#: src_cli/main.c:463
+#, c-format
+msgid "Example replaygain:\n"
+msgstr "Example replaygain:\n"
+
+#: src_cli/main.c:469
+#, c-format
+msgid "Example normalize:\n"
+msgstr "Example normalize:\n"
+
+#: src_cli/main.c:478
+#, c-format
+msgid "Example info:\n"
+msgstr "Example info:\n"
+
+#: src_cli/prg_init.c:54
+msgid " Decode ATSC A/52 audio streams"
+msgstr " Decode ATSC A/52 audio streams"
+
+#: src_cli/prg_init.c:62
+msgid " AAC+ encoder"
+msgstr " AAC+ encode"
+
+#: src_cli/prg_init.c:70
+msgid " Cherche des renseignements sur les formats mp3"
+msgstr " Cherche des renseignements sur les formats mp3"
+
+#: src_cli/prg_init.c:78
+msgid " Audio Codeur freeware"
+msgstr " Audio Codeur freeware"
+
+#: src_cli/prg_init.c:86
+msgid " MPEG-4 AAC decodeur"
+msgstr " MPEG-4 AAC decodeu"
+
+#: src_cli/prg_init.c:94
+msgid " Conversion wav : flac"
+msgstr " Conversion wav : flac"
+
+#: src_cli/prg_init.c:102
+msgid " Conversion wav : mp3"
+msgstr " Conversion wav : mp3"
+
+#: src_cli/prg_init.c:111
+msgid " Monkey's Audio Console Front End : APE"
+msgstr " Monkey's Audio Console Front End : APE"
+
+#: src_cli/prg_init.c:120 src_cli/prg_init.c:128
+msgid " MusePack commandline utilities"
+msgstr " MusePack commandline utilities"
+
+#: src_cli/prg_init.c:136
+msgid " Lecteur et extracteur"
+msgstr " Lecteur et extracteur"
+
+#: src_cli/prg_init.c:144
+msgid " Replaygain pour les fichiers mp3"
+msgstr " Replaygain pour les fichiers mp3"
+
+#: src_cli/prg_init.c:152
+msgid " Normaliseur de fichier wav"
+msgstr " Normaliseur de fichier wa"
+
+#: src_cli/prg_init.c:160
+msgid " A program to send desktop notifications"
+msgstr " A program to send desktop notifications"
+
+#: src_cli/prg_init.c:168
+msgid " Forte compression au format wave"
+msgstr " Forte compression au format wave"
+
+#: src_cli/prg_init.c:176
+msgid " Decoupage de fichiers sans decodage"
+msgstr " Decoupage de fichiers sans decodage"
+
+#: src_cli/prg_init.c:184
+msgid " Transformation universelle de fichiers son"
+msgstr " Transformation universelle de fichiers son"
+
+#: src_cli/prg_init.c:192
+msgid " Conversion wav : ogg"
+msgstr " Conversion wav : og"
+
+#: src_cli/prg_init.c:200
+msgid " Replaygain pour les fichiers ogg"
+msgstr " Replaygain pour les fichiers ogg"
+
+#: src_cli/prg_init.c:208
+msgid " WAVPACK Hybrid Lossless Audio Compressor"
+msgstr " WAVPACK Hybrid Lossless Audio Compressor"

xcfa-5.0.2.tar.gz/po_cli/en@boldquot.header Added

@@ -0,0 +1,25 @@
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
+# This catalog furthermore displays the text between the quotation marks in
+# bold face, assuming the VT100/XTerm escape sequences.
+#

xcfa-5.0.2.tar.gz/po_cli/en@quot.header Added

@@ -0,0 +1,22 @@
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#

xcfa-5.0.2.tar.gz/po_cli/en_GB.gmo Added

xcfa-5.0.2.tar.gz/po_cli/en_GB.po Added

@@ -0,0 +1,399 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xcfa_cli 0.0.6\n"
+"Report-Msgid-Bugs-To: http://www.xcfa.tuxfamily.org/\n"
+"POT-Creation-Date: 2015-03-03 11:27+0100\n"
+"PO-Revision-Date: 2014-11-11 22:10:09.622832\n"
+"Last-Translator: MyName <Emailr@Adress.Ext>\n"
+"Language-Team: english\n"
+"Language: en_GB\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src_cli/main.c:313
+#, c-format
+msgid ""
+"xcfa_cli is an implementation of xcfa in command line.\n"
+"xcfa_cli is an application for conversion, normalization, reconfiguring wav "
+"files and cut audio files ...\n"
+"\n"
+"What xcfa_cli can do:\n"
+" - replaygain on files: flac, mp3, ogg, wavpack\n"
+" - conversions:\n"
+" - from files:\n"
+" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, "
+"aif, ac3\t\t\n"
+" - to files:\t\t\t\n"
+" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, aac\n"
+" - conversion settings for file management:\n"
+" flac, ape, wavpack, ogg, m4a, aac, mpc, mp3\n"
+" - management tags\n"
+" - management cue wav file\n"
+" - manipulation of the frequency, track and bit wav files\n"
+" - standardization on files: wav, mp3, ogg\n"
+" - cuts (split) wav files\n"
+" - displaying information on files\n"
+msgstr ""
+"xcfa_cli is an implementation of xcfa in command line.\n"
+"xcfa_cli is an application for conversion, normalization, reconfiguring wav "
+"files and cut audio files ...\n"
+"\n"
+"What xcfa_cli can do:\n"
+" - replaygain on files: flac, mp3, ogg, wavpack\n"
+" - conversions:\n"
+" - from files:\n"
+" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, "
+"aif, ac3\t\t\n"
+" - to files:\t\t\t\n"
+" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, aac\n"
+" - conversion settings for file management:\n"
+" flac, ape, wavpack, ogg, m4a, aac, mpc, mp3\n"
+" - management tags\n"
+" - management cue wav file\n"
+" - manipulation of the frequency, track and bit wav files\n"
+" - standardization on files: wav, mp3, ogg\n"
+" - cuts (split) wav files\n"
+" - displaying information on files\n"
+
+#: src_cli/main.c:338
+#, c-format
+msgid ""
+" --verbose Verbose mode\n"
+" -h --help Print help mode and quit\n"
+"\n"
+" -i <\"file.type\"> --input <\"file.type\">\n"
+" Input name file to convert in "
+"inverted commas, by example: --input \"*.flac\"\n"
+" Type input files: wav, flac, ape, "
+"wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, aif, ac3\n"
+" -o <path_dest/> --output <path_dest/>\n"
+" Destination folder. By default in "
+"the source file folder.\n"
+" -d <wav,flac,ape,...> --dest <wav,flac,ape,...>\n"
+" Destination file: wav, flac, ape, "
+"wavpack, ogg, m4a, mpc, mp3, aac\n"
+" -r --recursion Recursive search\n"
+" -e --ext2src Extract in the source folder. This "
+"option is useful with '--recursion'\n"
+" --nice <priority> Change the priority of running "
+"processes in the interval: 0 .. 20\n"
+"\n"
+"Management options with default parameters:\n"
+"\n"
+" --op_flac <\"-5\">\n"
+" --op_ape <\"c2000\">\n"
+" --op_wavpack <\"-y -j1\">\n"
+" --op_ogg <\"--quality=3\">\n"
+" --op_m4a <\"-q 100\">\n"
+" --op_aac <\"48\">\n"
+" --op_mpc <\"--verbose --overwrite --insane\">\n"
+" --op_mp3 <\"-h --nohist --noreplaygain -b 128\">\n"
+"\n"
+"Displays information about the files:\n"
+"\n"
+" --info_files Displays time, level dBFS, frequency/"
+"track/quantification\n"
+" --info_tags Displays tags\n"
+" --info_head Displays head\n"
+"\n"
+"Management tags:\n"
+"\n"
+" --no_tag The tags will not be carried\n"
+" --tag_album <\"tags\"> Tag of album\n"
+" --tag_artist <\"tags\"> Tag of artist\n"
+" --tag_title <\"tags\"> Tag of title\n"
+" --tag_number <\"tags\"> Tag of number\n"
+" --tag_genre <\"tags\"> Tag of genre\n"
+" --tag_year <\"tags\"> Tag of year\n"
+" --tag_comment <\"tags\"> Tag of comment\n"
+" --tag_description <\"tags\"> Tag of description\n"
+"\n"
+"Management cue file:\n"
+" -c <info|extract> --cue <info|extract>\n"
+" info Provides information on a "
+"WAV or CUE file.\n"
+" extract Extract all tracks of a WAV "
+"file.\n"
+"\n"
+"Management split:\n"
+"\n"
+" -s <hh:mm:ss> --split <hh:mm:ss> Mark the beginning of the file to be "
+"cut.\n"
+" -l <sec> --length <sec> Specifies the length of the file to "
+"cut with the seconds parameter.\n"
+"\n"
+"Changing the settings of a WAV file:\n"
+"\n"
+" -f <num> --frequency <num> Changing the frequency: 8000, "
+"22000, 32000, 44056, 44100, 48000, 88200, 96000 or other\n"
+" -t <num> --track <num> Changing the number of tracks: 1, 2, "
+"4, 6\n"
+" -q <num> --quantification <num> Changing the quantification: 8, "
+"16, 24, 32, 64\n"
+"\n"
+"Replaygain: dynamic modification for next files: FLAC, MP3, OGG, WAVPACK\n"
+"\n"
+" -g <clear|album|track> --replaygain <clear|album|track>\n"
+" FLAC [ clear | album ]\n"
+" MP3 [ clear | album | track ]\n"
+" OGG [ clear | album | track ]\n"
+" WAVPACK [ clear | album | track ]\n"
+"\n"
+"Normalize: static modification for next files: MP3, WAV, OGG\n"
+" See an excellent article by @Dzef on standardization: http://ubunteros."
+"tuxfamily.org/spip.php?article159\n"
+"\n"
+" --peak Action on a single file.\n"
+" Maximum volume amplification for "
+"each file:\n"
+" Increase the overall level of the "
+"signal so as to bring the level to 0 dBFS peak without changing dynamics.\n"
+" --peak_album Action on a group of files.\n"
+" Maximum volume boost for a group of "
+"files in accordance with the level of differences between each of them.\n"
+" If the maximum level of one or more "
+"files is already at 0 dBFS, the level of all the selected files remain "
+"unchanged\n"
+" after normalization. So this mode "
+"can be safely used almost systematically.\n"
+" --mix_rms_album <dBFS> Action on a group of files.\n"
+" Adjusting the average volume for a "
+"group of files respecting average level of the differences between each of "
+"them.\n"
+" The selecting a value for a file "
+"modifies the other files in the group.\n"
+" --fix_rms <dBFS> Action on a single file.\n"
+" Adjusting the average volume of each "
+"file..\n"
+"\n"
+msgstr ""
+" --verbose Verbose mode\n"
+" -h --help Print help mode and quit\n"
+"\n"
+" -i <\"file.type\"> --input <\"file.type\">\n"
+" Input name file to convert in "
+"inverted commas, by example: --input \"*.flac\"\n"
+" Type input files: wav, flac, ape, "
+"wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, aif, ac3\n"
+" -o <path_dest/> --output <path_dest/>\n"
+" Destination folder. By default in "
+"the source file folder.\n"
+" -d <wav,flac,ape,...> --dest <wav,flac,ape,...>\n"
+" Destination file: wav, flac, ape, "
+"wavpack, ogg, m4a, mpc, mp3, aac\n"
+" -r --recursion Recursive search\n"
+" -e --ext2src Extract in the source folder. This "
+"option is useful with '--recursion'\n"
+" --nice <priority> Change the priority of running "
+"processes in the interval: 0 .. 20\n"
+"\n"
+"Management options with default parameters:\n"
+"\n"
+" --op_flac <\"-5\">\n"
+" --op_ape <\"c2000\">\n"
+" --op_wavpack <\"-y -j1\">\n"
+" --op_ogg <\"--quality=3\">\n"
+" --op_m4a <\"-q 100\">\n"
+" --op_aac <\"48\">\n"
+" --op_mpc <\"--verbose --overwrite --insane\">\n"
+" --op_mp3 <\"-h --nohist --noreplaygain -b 128\">\n"
+"\n"
+"Displays information about the files:\n"
+"\n"
+" --info_files Displays time, level dBFS, frequency/"
+"track/quantification\n"
+" --info_tags Displays tags\n"
+" --info_head Displays head\n"
+"\n"
+"Management tags:\n"
+"\n"
+" --no_tag The tags will not be carried\n"
+" --tag_album <\"tags\"> Tag of album\n"
+" --tag_artist <\"tags\"> Tag of artist\n"
+" --tag_title <\"tags\"> Tag of title\n"
+" --tag_number <\"tags\"> Tag of number\n"
+" --tag_genre <\"tags\"> Tag of genre\n"
+" --tag_year <\"tags\"> Tag of year\n"
+" --tag_comment <\"tags\"> Tag of comment\n"
+" --tag_description <\"tags\"> Tag of description\n"
+"\n"
+"Management cue file:\n"
+" -c <info|extract> --cue <info|extract>\n"
+" info Provides information on a "
+"WAV or CUE file.\n"
+" extract Extract all tracks of a WAV "
+"file.\n"
+"\n"
+"Management split:\n"
+"\n"
+" -s <hh:mm:ss> --split <hh:mm:ss> Mark the beginning of the file to be "
+"cut.\n"
+" -l <sec> --length <sec> Specifies the length of the file to "
+"cut with the seconds parameter.\n"
+"\n"
+"Changing the settings of a WAV file:\n"
+"\n"
+" -f <num> --frequency <num> Changing the frequency: 8000, "
+"22000, 32000, 44056, 44100, 48000, 88200, 96000 or other\n"
+" -t <num> --track <num> Changing the number of tracks: 1, 2, "
+"4, 6\n"
+" -q <num> --quantification <num> Changing the quantification: 8, "
+"16, 24, 32, 64\n"
+"\n"
+"Replaygain: dynamic modification for next files: FLAC, MP3, OGG, WAVPACK\n"
+"\n"
+" -g <clear|album|track> --replaygain <clear|album|track>\n"
+" FLAC [ clear | album ]\n"
+" MP3 [ clear | album | track ]\n"
+" OGG [ clear | album | track ]\n"
+" WAVPACK [ clear | album | track ]\n"
+"\n"
+"Normalize: static modification for next files: MP3, WAV, OGG\n"
+" See an excellent article by @Dzef on standardization: http://ubunteros."
+"tuxfamily.org/spip.php?article159\n"
+"\n"
+" --peak Action on a single file.\n"
+" Maximum volume amplification for "
+"each file:\n"
+" Increase the overall level of the "
+"signal so as to bring the level to 0 dBFS peak without changing dynamics.\n"
+" --peak_album Action on a group of files.\n"
+" Maximum volume boost for a group of "
+"files in accordance with the level of differences between each of them.\n"
+" If the maximum level of one or more "
+"files is already at 0 dBFS, the level of all the selected files remain "
+"unchanged\n"
+" after normalization. So this mode "
+"can be safely used almost systematically.\n"
+" --mix_rms_album <dBFS> Action on a group of files.\n"
+" Adjusting the average volume for a "
+"group of files respecting average level of the differences between each of "
+"them.\n"
+" The selecting a value for a file "
+"modifies the other files in the group.\n"
+" --fix_rms <dBFS> Action on a single file.\n"
+" Adjusting the average volume of each "
+"file..\n"
+"\n"
+
+#: src_cli/main.c:431
+#, c-format
+msgid "Example conversion:\n"
+msgstr "Example conversion:\n"
+
+#: src_cli/main.c:438
+#, c-format
+msgid "Conversion example with two inputs:\n"
+msgstr "Conversion example with two inputs:\n"
+
+#: src_cli/main.c:443
+#, c-format
+msgid "Example split:\n"
+msgstr "Example split:\n"
+
+#: src_cli/main.c:450
+#, c-format
+msgid "Example cue:\n"
+msgstr "Example cue:\n"
+
+#: src_cli/main.c:458
+#, c-format
+msgid "Example setting wav:\n"
+msgstr "Example setting wav:\n"
+
+#: src_cli/main.c:463
+#, c-format
+msgid "Example replaygain:\n"
+msgstr "Example replaygain:\n"
+
+#: src_cli/main.c:469
+#, c-format
+msgid "Example normalize:\n"
+msgstr "Example normalize:\n"
+
+#: src_cli/main.c:478
+#, c-format
+msgid "Example info:\n"
+msgstr "Example info:\n"
+
+#: src_cli/prg_init.c:54
+msgid " Decode ATSC A/52 audio streams"
+msgstr " Decode ATSC A/52 audio streams"
+
+#: src_cli/prg_init.c:62
+msgid " AAC+ encoder"
+msgstr " AAC+ encode"
+
+#: src_cli/prg_init.c:70
+msgid " Cherche des renseignements sur les formats mp3"
+msgstr " Cherche des renseignements sur les formats mp3"
+
+#: src_cli/prg_init.c:78
+msgid " Audio Codeur freeware"
+msgstr " Audio Codeur freeware"
+
+#: src_cli/prg_init.c:86
+msgid " MPEG-4 AAC decodeur"
+msgstr " MPEG-4 AAC decodeu"
+
+#: src_cli/prg_init.c:94
+msgid " Conversion wav : flac"
+msgstr " Conversion wav : flac"
+
+#: src_cli/prg_init.c:102
+msgid " Conversion wav : mp3"
+msgstr " Conversion wav : mp3"
+
+#: src_cli/prg_init.c:111
+msgid " Monkey's Audio Console Front End : APE"
+msgstr " Monkey's Audio Console Front End : APE"
+
+#: src_cli/prg_init.c:120 src_cli/prg_init.c:128
+msgid " MusePack commandline utilities"
+msgstr " MusePack commandline utilities"
+
+#: src_cli/prg_init.c:136
+msgid " Lecteur et extracteur"
+msgstr " Lecteur et extracteur"
+
+#: src_cli/prg_init.c:144
+msgid " Replaygain pour les fichiers mp3"
+msgstr " Replaygain pour les fichiers mp3"
+
+#: src_cli/prg_init.c:152
+msgid " Normaliseur de fichier wav"
+msgstr " Normaliseur de fichier wa"
+
+#: src_cli/prg_init.c:160
+msgid " A program to send desktop notifications"
+msgstr " A program to send desktop notifications"
+
+#: src_cli/prg_init.c:168
+msgid " Forte compression au format wave"
+msgstr " Forte compression au format wave"
+
+#: src_cli/prg_init.c:176
+msgid " Decoupage de fichiers sans decodage"
+msgstr " Decoupage de fichiers sans decodage"
+
+#: src_cli/prg_init.c:184
+msgid " Transformation universelle de fichiers son"
+msgstr " Transformation universelle de fichiers son"
+
+#: src_cli/prg_init.c:192
+msgid " Conversion wav : ogg"
+msgstr " Conversion wav : og"
+
+#: src_cli/prg_init.c:200
+msgid " Replaygain pour les fichiers ogg"
+msgstr " Replaygain pour les fichiers ogg"
+
+#: src_cli/prg_init.c:208
+msgid " WAVPACK Hybrid Lossless Audio Compressor"
+msgstr " WAVPACK Hybrid Lossless Audio Compressor"

xcfa-5.0.2.tar.gz/po_cli/es.gmo Added

xcfa-5.0.2.tar.gz/po_cli/es.po Added

@@ -0,0 +1,271 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xcfa_cli 0.0.6\n"
+"Report-Msgid-Bugs-To: http://www.xcfa.tuxfamily.org/\n"
+"POT-Creation-Date: 2015-03-03 11:27+0100\n"
+"PO-Revision-Date: 2014-11-11 22:10:09.624052\n"
+"Last-Translator: MyName <Emailr@Adress.Ext>\n"
+"Language-Team: spanish\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src_cli/main.c:313
+#, c-format
+msgid ""
+"xcfa_cli is an implementation of xcfa in command line.\n"
+"xcfa_cli is an application for conversion, normalization, reconfiguring wav "
+"files and cut audio files ...\n"
+"\n"
+"What xcfa_cli can do:\n"
+" - replaygain on files: flac, mp3, ogg, wavpack\n"
+" - conversions:\n"
+" - from files:\n"
+" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, "
+"aif, ac3\t\t\n"
+" - to files:\t\t\t\n"
+" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, aac\n"
+" - conversion settings for file management:\n"
+" flac, ape, wavpack, ogg, m4a, aac, mpc, mp3\n"
+" - management tags\n"
+" - management cue wav file\n"
+" - manipulation of the frequency, track and bit wav files\n"
+" - standardization on files: wav, mp3, ogg\n"
+" - cuts (split) wav files\n"
+" - displaying information on files\n"
+msgstr ""
+
+#: src_cli/main.c:338
+#, c-format
+msgid ""
+" --verbose Verbose mode\n"
+" -h --help Print help mode and quit\n"
+"\n"
+" -i <\"file.type\"> --input <\"file.type\">\n"
+" Input name file to convert in "
+"inverted commas, by example: --input \"*.flac\"\n"
+" Type input files: wav, flac, ape, "
+"wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, aif, ac3\n"
+" -o <path_dest/> --output <path_dest/>\n"
+" Destination folder. By default in "
+"the source file folder.\n"
+" -d <wav,flac,ape,...> --dest <wav,flac,ape,...>\n"
+" Destination file: wav, flac, ape, "
+"wavpack, ogg, m4a, mpc, mp3, aac\n"
+" -r --recursion Recursive search\n"
+" -e --ext2src Extract in the source folder. This "
+"option is useful with '--recursion'\n"
+" --nice <priority> Change the priority of running "
+"processes in the interval: 0 .. 20\n"
+"\n"
+"Management options with default parameters:\n"
+"\n"
+" --op_flac <\"-5\">\n"
+" --op_ape <\"c2000\">\n"
+" --op_wavpack <\"-y -j1\">\n"
+" --op_ogg <\"--quality=3\">\n"
+" --op_m4a <\"-q 100\">\n"
+" --op_aac <\"48\">\n"
+" --op_mpc <\"--verbose --overwrite --insane\">\n"
+" --op_mp3 <\"-h --nohist --noreplaygain -b 128\">\n"
+"\n"
+"Displays information about the files:\n"
+"\n"
+" --info_files Displays time, level dBFS, frequency/"
+"track/quantification\n"
+" --info_tags Displays tags\n"
+" --info_head Displays head\n"
+"\n"
+"Management tags:\n"
+"\n"
+" --no_tag The tags will not be carried\n"
+" --tag_album <\"tags\"> Tag of album\n"
+" --tag_artist <\"tags\"> Tag of artist\n"
+" --tag_title <\"tags\"> Tag of title\n"
+" --tag_number <\"tags\"> Tag of number\n"
+" --tag_genre <\"tags\"> Tag of genre\n"
+" --tag_year <\"tags\"> Tag of year\n"
+" --tag_comment <\"tags\"> Tag of comment\n"
+" --tag_description <\"tags\"> Tag of description\n"
+"\n"
+"Management cue file:\n"
+" -c <info|extract> --cue <info|extract>\n"
+" info Provides information on a "
+"WAV or CUE file.\n"
+" extract Extract all tracks of a WAV "
+"file.\n"
+"\n"
+"Management split:\n"
+"\n"
+" -s <hh:mm:ss> --split <hh:mm:ss> Mark the beginning of the file to be "
+"cut.\n"
+" -l <sec> --length <sec> Specifies the length of the file to "
+"cut with the seconds parameter.\n"
+"\n"
+"Changing the settings of a WAV file:\n"
+"\n"
+" -f <num> --frequency <num> Changing the frequency: 8000, "
+"22000, 32000, 44056, 44100, 48000, 88200, 96000 or other\n"
+" -t <num> --track <num> Changing the number of tracks: 1, 2, "
+"4, 6\n"
+" -q <num> --quantification <num> Changing the quantification: 8, "
+"16, 24, 32, 64\n"
+"\n"
+"Replaygain: dynamic modification for next files: FLAC, MP3, OGG, WAVPACK\n"
+"\n"
+" -g <clear|album|track> --replaygain <clear|album|track>\n"
+" FLAC [ clear | album ]\n"
+" MP3 [ clear | album | track ]\n"
+" OGG [ clear | album | track ]\n"
+" WAVPACK [ clear | album | track ]\n"
+"\n"
+"Normalize: static modification for next files: MP3, WAV, OGG\n"
+" See an excellent article by @Dzef on standardization: http://ubunteros."
+"tuxfamily.org/spip.php?article159\n"
+"\n"
+" --peak Action on a single file.\n"
+" Maximum volume amplification for "
+"each file:\n"
+" Increase the overall level of the "
+"signal so as to bring the level to 0 dBFS peak without changing dynamics.\n"
+" --peak_album Action on a group of files.\n"
+" Maximum volume boost for a group of "
+"files in accordance with the level of differences between each of them.\n"
+" If the maximum level of one or more "
+"files is already at 0 dBFS, the level of all the selected files remain "
+"unchanged\n"
+" after normalization. So this mode "
+"can be safely used almost systematically.\n"
+" --mix_rms_album <dBFS> Action on a group of files.\n"
+" Adjusting the average volume for a "
+"group of files respecting average level of the differences between each of "
+"them.\n"
+" The selecting a value for a file "
+"modifies the other files in the group.\n"
+" --fix_rms <dBFS> Action on a single file.\n"
+" Adjusting the average volume of each "
+"file..\n"
+"\n"
+msgstr ""
+
+#: src_cli/main.c:431
+#, c-format
+msgid "Example conversion:\n"
+msgstr ""
+
+#: src_cli/main.c:438
+#, c-format
+msgid "Conversion example with two inputs:\n"
+msgstr ""
+
+#: src_cli/main.c:443
+#, c-format
+msgid "Example split:\n"
+msgstr ""
+
+#: src_cli/main.c:450
+#, c-format
+msgid "Example cue:\n"
+msgstr ""
+
+#: src_cli/main.c:458
+#, c-format
+msgid "Example setting wav:\n"
+msgstr ""
+
+#: src_cli/main.c:463
+#, c-format
+msgid "Example replaygain:\n"
+msgstr ""
+
+#: src_cli/main.c:469
+#, c-format
+msgid "Example normalize:\n"
+msgstr ""
+
+#: src_cli/main.c:478
+#, c-format
+msgid "Example info:\n"
+msgstr ""
+
+#: src_cli/prg_init.c:54
+msgid " Decode ATSC A/52 audio streams"
+msgstr ""
+
+#: src_cli/prg_init.c:62
+msgid " AAC+ encoder"
+msgstr ""
+
+#: src_cli/prg_init.c:70
+msgid " Cherche des renseignements sur les formats mp3"
+msgstr ""
+
+#: src_cli/prg_init.c:78
+msgid " Audio Codeur freeware"
+msgstr ""
+
+#: src_cli/prg_init.c:86
+msgid " MPEG-4 AAC decodeur"
+msgstr ""
+
+#: src_cli/prg_init.c:94
+msgid " Conversion wav : flac"
+msgstr ""
+
+#: src_cli/prg_init.c:102
+msgid " Conversion wav : mp3"
+msgstr ""
+
+#: src_cli/prg_init.c:111
+msgid " Monkey's Audio Console Front End : APE"
+msgstr ""
+
+#: src_cli/prg_init.c:120 src_cli/prg_init.c:128
+msgid " MusePack commandline utilities"
+msgstr ""
+
+#: src_cli/prg_init.c:136
+msgid " Lecteur et extracteur"
+msgstr ""
+
+#: src_cli/prg_init.c:144
+msgid " Replaygain pour les fichiers mp3"
+msgstr ""
+
+#: src_cli/prg_init.c:152
+msgid " Normaliseur de fichier wav"
+msgstr ""
+
+#: src_cli/prg_init.c:160
+msgid " A program to send desktop notifications"
+msgstr ""
+
+#: src_cli/prg_init.c:168
+msgid " Forte compression au format wave"
+msgstr ""
+
+#: src_cli/prg_init.c:176
+msgid " Decoupage de fichiers sans decodage"
+msgstr ""
+
+#: src_cli/prg_init.c:184
+msgid " Transformation universelle de fichiers son"
+msgstr ""
+
+#: src_cli/prg_init.c:192
+msgid " Conversion wav : ogg"
+msgstr ""
+
+#: src_cli/prg_init.c:200
+msgid " Replaygain pour les fichiers ogg"
+msgstr ""
+
+#: src_cli/prg_init.c:208
+msgid " WAVPACK Hybrid Lossless Audio Compressor"
+msgstr ""

xcfa-5.0.2.tar.gz/po_cli/fr.gmo Added

xcfa-5.0.2.tar.gz/po_cli/fr.po Added

@@ -0,0 +1,410 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xcfa_cli 0.0.6\n"
+"Report-Msgid-Bugs-To: http://www.xcfa.tuxfamily.org/\n"
+"POT-Creation-Date: 2015-03-03 11:27+0100\n"
+"PO-Revision-Date: 2014-11-11 22:10:09.623273\n"
+"Last-Translator: MyName <Emailr@Adress.Ext>\n"
+"Language-Team: french\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src_cli/main.c:313
+#, c-format
+msgid ""
+"xcfa_cli is an implementation of xcfa in command line.\n"
+"xcfa_cli is an application for conversion, normalization, reconfiguring wav "
+"files and cut audio files ...\n"
+"\n"
+"What xcfa_cli can do:\n"
+" - replaygain on files: flac, mp3, ogg, wavpack\n"
+" - conversions:\n"
+" - from files:\n"
+" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, "
+"aif, ac3\t\t\n"
+" - to files:\t\t\t\n"
+" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, aac\n"
+" - conversion settings for file management:\n"
+" flac, ape, wavpack, ogg, m4a, aac, mpc, mp3\n"
+" - management tags\n"
+" - management cue wav file\n"
+" - manipulation of the frequency, track and bit wav files\n"
+" - standardization on files: wav, mp3, ogg\n"
+" - cuts (split) wav files\n"
+" - displaying information on files\n"
+msgstr ""
+"xcfa_cli est une implémentation de xcfa en ligne de commande.\n"
+"xcfa_cli est une application pour la conversion, la normalisation, la "
+"reconfiguration des fichiers wav et découpe des fichiers audio ...\n"
+"\n"
+"Ce que xcfa_cli sait faire:\n"
+" - replaygain sur des fichiers: flac, mp3, ogg, wavpack\n"
+" - conversions:\n"
+" - depuis des fichiers:\n"
+" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, "
+"aif, ac3\n"
+" - vers des fichiers:\n"
+" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, aac\n"
+" - gestion des paramètres de conversion pour les fichiers:\n"
+" flac, ape, wavpack, ogg, m4a, aac, mpc, mp3\n"
+" - gestion des tags\n"
+" - gestion des fichiers cue (wav)\n"
+" - manipulation de la fréquence, voie et bits sur les fichiers wav\n"
+" - normalisations sur des fichiers: wav, mp3, ogg\n"
+" - découpes (split) de fichiers wav\n"
+" - affichage d'informations sur des fichiers\n"
+
+#: src_cli/main.c:338
+#, c-format
+msgid ""
+" --verbose Verbose mode\n"
+" -h --help Print help mode and quit\n"
+"\n"
+" -i <\"file.type\"> --input <\"file.type\">\n"
+" Input name file to convert in "
+"inverted commas, by example: --input \"*.flac\"\n"
+" Type input files: wav, flac, ape, "
+"wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, aif, ac3\n"
+" -o <path_dest/> --output <path_dest/>\n"
+" Destination folder. By default in "
+"the source file folder.\n"
+" -d <wav,flac,ape,...> --dest <wav,flac,ape,...>\n"
+" Destination file: wav, flac, ape, "
+"wavpack, ogg, m4a, mpc, mp3, aac\n"
+" -r --recursion Recursive search\n"
+" -e --ext2src Extract in the source folder. This "
+"option is useful with '--recursion'\n"
+" --nice <priority> Change the priority of running "
+"processes in the interval: 0 .. 20\n"
+"\n"
+"Management options with default parameters:\n"
+"\n"
+" --op_flac <\"-5\">\n"
+" --op_ape <\"c2000\">\n"
+" --op_wavpack <\"-y -j1\">\n"
+" --op_ogg <\"--quality=3\">\n"
+" --op_m4a <\"-q 100\">\n"
+" --op_aac <\"48\">\n"
+" --op_mpc <\"--verbose --overwrite --insane\">\n"
+" --op_mp3 <\"-h --nohist --noreplaygain -b 128\">\n"
+"\n"
+"Displays information about the files:\n"
+"\n"
+" --info_files Displays time, level dBFS, frequency/"
+"track/quantification\n"
+" --info_tags Displays tags\n"
+" --info_head Displays head\n"
+"\n"
+"Management tags:\n"
+"\n"
+" --no_tag The tags will not be carried\n"
+" --tag_album <\"tags\"> Tag of album\n"
+" --tag_artist <\"tags\"> Tag of artist\n"
+" --tag_title <\"tags\"> Tag of title\n"
+" --tag_number <\"tags\"> Tag of number\n"
+" --tag_genre <\"tags\"> Tag of genre\n"
+" --tag_year <\"tags\"> Tag of year\n"
+" --tag_comment <\"tags\"> Tag of comment\n"
+" --tag_description <\"tags\"> Tag of description\n"
+"\n"
+"Management cue file:\n"
+" -c <info|extract> --cue <info|extract>\n"
+" info Provides information on a "
+"WAV or CUE file.\n"
+" extract Extract all tracks of a WAV "
+"file.\n"
+"\n"
+"Management split:\n"
+"\n"
+" -s <hh:mm:ss> --split <hh:mm:ss> Mark the beginning of the file to be "
+"cut.\n"
+" -l <sec> --length <sec> Specifies the length of the file to "
+"cut with the seconds parameter.\n"
+"\n"
+"Changing the settings of a WAV file:\n"
+"\n"
+" -f <num> --frequency <num> Changing the frequency: 8000, "
+"22000, 32000, 44056, 44100, 48000, 88200, 96000 or other\n"
+" -t <num> --track <num> Changing the number of tracks: 1, 2, "
+"4, 6\n"
+" -q <num> --quantification <num> Changing the quantification: 8, "
+"16, 24, 32, 64\n"
+"\n"
+"Replaygain: dynamic modification for next files: FLAC, MP3, OGG, WAVPACK\n"
+"\n"
+" -g <clear|album|track> --replaygain <clear|album|track>\n"
+" FLAC [ clear | album ]\n"
+" MP3 [ clear | album | track ]\n"
+" OGG [ clear | album | track ]\n"
+" WAVPACK [ clear | album | track ]\n"
+"\n"
+"Normalize: static modification for next files: MP3, WAV, OGG\n"
+" See an excellent article by @Dzef on standardization: http://ubunteros."
+"tuxfamily.org/spip.php?article159\n"
+"\n"
+" --peak Action on a single file.\n"
+" Maximum volume amplification for "
+"each file:\n"
+" Increase the overall level of the "
+"signal so as to bring the level to 0 dBFS peak without changing dynamics.\n"
+" --peak_album Action on a group of files.\n"
+" Maximum volume boost for a group of "
+"files in accordance with the level of differences between each of them.\n"
+" If the maximum level of one or more "
+"files is already at 0 dBFS, the level of all the selected files remain "
+"unchanged\n"
+" after normalization. So this mode "
+"can be safely used almost systematically.\n"
+" --mix_rms_album <dBFS> Action on a group of files.\n"
+" Adjusting the average volume for a "
+"group of files respecting average level of the differences between each of "
+"them.\n"
+" The selecting a value for a file "
+"modifies the other files in the group.\n"
+" --fix_rms <dBFS> Action on a single file.\n"
+" Adjusting the average volume of each "
+"file..\n"
+"\n"
+msgstr ""
+" --verbose Mode verbeux\n"
+" -h --help Print help mode and quit\n"
+"\n"
+" -i <\"file.type\"> --input <\"file.type\">\n"
+" Le nom de fichier en entrée doit "
+"^etre entre guillemets, par exemple: --input \"*.flac\"\n"
+" Types des fichiers acceptés en "
+"entrée: wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, "
+"aif, ac3\n"
+" -o <path_dest/> --output <path_dest/>\n"
+" Dossier de destination. Par défaut "
+"dans le dossier source.\n"
+" -d <wav,flac,ape,...> --dest <wav,flac,ape,...>\n"
+" Types des fichiers acceptés en "
+"destination: wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, aac\n"
+" -r --recursion Recherche récursive\n"
+" -e --ext2src Extraction dans le dossier source. "
+"Cette option est utile avec '--recursion'\n"
+" --nice <priority> Changer la priorité d'exécution des "
+"processus dans l'interval: 0 .. 20\n"
+"\n"
+"Les options de gestion avec les paramètres par défaut:\n"
+"\n"
+" --op_flac <\"-5\">\n"
+" --op_ape <\"c2000\">\n"
+" --op_wavpack <\"-y -j1\">\n"
+" --op_ogg <\"--quality=3\">\n"
+" --op_m4a <\"-q 100\">\n"
+" --op_aac <\"48\">\n"
+" --op_mpc <\"--verbose --overwrite --insane\">\n"
+" --op_mp3 <\"-h --nohist --noreplaygain -b 128\">\n"
+"\n"
+"Affiche des informations sur les fichiers:\n"
+"\n"
+" --info_files Affichage: durée, niveau dBFS, "
+"fréquence/piste/quantification\n"
+" --info_tags Affichage: tags\n"
+" --info_head Affichage: entete\n"
+"\n"
+"Gestion des tags:\n"
+"\n"
+" --no_tag Les tags ne seront pas inclus\n"
+" --tag_album <\"tags\"> Tag album\n"
+" --tag_artist <\"tags\"> Tag artist\n"
+" --tag_title <\"tags\"> Tag title\n"
+" --tag_number <\"tags\"> Tag number\n"
+" --tag_genre <\"tags\"> Tag genre\n"
+" --tag_year <\"tags\"> Tag year\n"
+" --tag_comment <\"tags\"> Tag comment\n"
+" --tag_description <\"tags\"> Tag description\n"
+"\n"
+"Gestion des fichiers cue:\n"
+" -c <info|extract> --cue <info|extract>\n"
+" info Fournit des informations "
+"sur un fichier WAV ou CUE.\n"
+" extract Extrait toutes les pistes "
+"d'un fichier WAV.\n"
+"\n"
+"Gestion du split:\n"
+"\n"
+" -s <hh:mm:ss> --split <hh:mm:ss> Marque le début du fichier à "
+"découper.\n"
+" -l <sec> --length <sec> Indique la longueur du fichier de "
+"couper en secondes.\n"
+"\n"
+"Modification des paramètres d'un fichier WAV:\n"
+"\n"
+" -f <num> --frequency <num> Changement de la fréquence: "
+"8000, 22000, 32000, 44056, 44100, 48000, 88200, 96000 ou autre valeur\n"
+" -t <num> --track <num> Changement du nombre de pistes: "
+"1, 2, 4, 6\n"
+" -q <num> --quantification <num> Changement de la quantification: "
+"8, 16, 24, 32, 64\n"
+"\n"
+"Replaygain: modification dynamique pour les fichiers suivants: FLAC, MP3, "
+"OGG, WAVPACK\n"
+"\n"
+" -g <clear|album|track> --replaygain <clear|album|track>\n"
+" FLAC [ clear | album ]\n"
+" MP3 [ clear | album | track ]\n"
+" OGG [ clear | album | track ]\n"
+" WAVPACK [ clear | album | track ]\n"
+"\n"
+"Normalize: modification statique pour les fichiers suivants: MP3, WAV, OGG\n"
+" Voir un excellent article de @Dzef sur la normalisation: http://ubunteros."
+"tuxfamily.org/spip.php?article159\n"
+"\n"
+" --peak Action sur un fichier.\n"
+" L'amplification du volume maximale "
+"pour chaque fichier:\n"
+" Augmenter le niveau global du signal "
+"de façon à amener le niveau à 0 dBFS sans changer la dynamique.\n"
+" --peak_album Action sur un groupe de fichiers.\n"
+" Gain de volume maximum pour un "
+"groupe de fichiers en fonction du niveau de différences entre chacun d'eux.\n"
+" Si le niveau maximum de un ou "
+"plusieurs fichiers est déjà à 0 dBFS, le niveau de tous les fichiers "
+"sélectionnés\n"
+" restent inchangés après "
+"normalisation. Donc, ce mode peut être utilisé en toute sécurité presque "
+"systématiquement.\n"
+" --mix_rms_album <dBFS> Action sur un groupe de fichiers.\n"
+" Réglage du volume moyen d'un groupe "
+"de fichiers concernant le niveau moyen de la différence entre chacun d'eux.\n"
+" La sélection d'une valeur d'un "
+"fichier modifie les autres fichiers dans le groupe.\n"
+" --fix_rms <dBFS> Action sur un fichier.\n"
+" Réglage du volume moyen de chaque "
+"fichier.\n"
+" La sélection d'une valeur d'un "
+"fichier.\n"
+"\n"
+
+#: src_cli/main.c:431
+#, c-format
+msgid "Example conversion:\n"
+msgstr "Exemple conversion:\n"
+
+#: src_cli/main.c:438
+#, c-format
+msgid "Conversion example with two inputs:\n"
+msgstr "Exemple de conversion avec deux entrées:\n"
+
+#: src_cli/main.c:443
+#, c-format
+msgid "Example split:\n"
+msgstr "Exemple de split:\n"
+
+#: src_cli/main.c:450
+#, c-format
+msgid "Example cue:\n"
+msgstr "Exemple cue:\n"
+
+#: src_cli/main.c:458
+#, c-format
+msgid "Example setting wav:\n"
+msgstr "Exemple de reparamétrage de fichier wav:\n"
+
+#: src_cli/main.c:463
+#, c-format
+msgid "Example replaygain:\n"
+msgstr "Exemple de replaygain:\n"
+
+#: src_cli/main.c:469
+#, c-format
+msgid "Example normalize:\n"
+msgstr "Exemple avec normalize:\n"
+
+#: src_cli/main.c:478
+#, c-format
+msgid "Example info:\n"
+msgstr "Exemple info:\n"
+
+#: src_cli/prg_init.c:54
+msgid " Decode ATSC A/52 audio streams"
+msgstr " Decode ATSC A/52 audio streams"
+
+#: src_cli/prg_init.c:62
+msgid " AAC+ encoder"
+msgstr " AAC+ encoder"
+
+#: src_cli/prg_init.c:70
+msgid " Cherche des renseignements sur les formats mp3"
+msgstr " Cherche des renseignements sur les formats mp3"
+
+#: src_cli/prg_init.c:78
+msgid " Audio Codeur freeware"
+msgstr " Audio Codeur freeware"
+
+#: src_cli/prg_init.c:86
+msgid " MPEG-4 AAC decodeur"
+msgstr " MPEG-4 AAC decodeur"
+
+#: src_cli/prg_init.c:94
+msgid " Conversion wav : flac"
+msgstr " Conversion wav : flac"
+
+#: src_cli/prg_init.c:102
+msgid " Conversion wav : mp3"
+msgstr " Conversion wav : mp3"
+
+#: src_cli/prg_init.c:111
+msgid " Monkey's Audio Console Front End : APE"
+msgstr " Monkey's Audio Console Front End : APE"
+
+#: src_cli/prg_init.c:120 src_cli/prg_init.c:128
+msgid " MusePack commandline utilities"
+msgstr " MusePack commandline utilities"
+
+#: src_cli/prg_init.c:136
+msgid " Lecteur et extracteur"
+msgstr " Lecteur et extracteur"
+
+#: src_cli/prg_init.c:144
+msgid " Replaygain pour les fichiers mp3"
+msgstr " Replaygain pour les fichiers mp3"
+
+#: src_cli/prg_init.c:152
+msgid " Normaliseur de fichier wav"
+msgstr " Normaliseur de fichier wav"
+
+#: src_cli/prg_init.c:160
+msgid " A program to send desktop notifications"
+msgstr " A program to send desktop notifications"
+
+#: src_cli/prg_init.c:168
+msgid " Forte compression au format wave"
+msgstr " Forte compression au format wave"
+
+#: src_cli/prg_init.c:176
+msgid " Decoupage de fichiers sans decodage"
+msgstr " Découpage de fichiers sans décodage"
+
+#: src_cli/prg_init.c:184
+msgid " Transformation universelle de fichiers son"
+msgstr " Transformation universelle de fichiers son"
+
+#: src_cli/prg_init.c:192
+msgid " Conversion wav : ogg"
+msgstr " Conversion wav : ogg"
+
+#: src_cli/prg_init.c:200
+msgid " Replaygain pour les fichiers ogg"
+msgstr " Replaygain pour les fichiers ogg"
+
+#: src_cli/prg_init.c:208
+msgid " WAVPACK Hybrid Lossless Audio Compressor"
+msgstr " WAVPACK Hybrid Lossless Audio Compressor"
+
+#~ msgid ""
+#~ "un\n"
+#~ "deux"
+#~ msgstr ""
+#~ "uno\n"
+#~ "DOS"

xcfa-5.0.2.tar.gz/po_cli/insert-header.sin Added

xcfa-5.0.2.tar.gz/po_cli/it.gmo Added

xcfa-5.0.2.tar.gz/po_cli/it.po Added

@@ -0,0 +1,271 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xcfa_cli 0.0.6\n"
+"Report-Msgid-Bugs-To: http://www.xcfa.tuxfamily.org/\n"
+"POT-Creation-Date: 2015-03-03 11:27+0100\n"
+"PO-Revision-Date: 2014-11-11 22:10:09.623885\n"
+"Last-Translator: MyName <Emailr@Adress.Ext>\n"
+"Language-Team: italian\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src_cli/main.c:313
+#, c-format
+msgid ""
+"xcfa_cli is an implementation of xcfa in command line.\n"
+"xcfa_cli is an application for conversion, normalization, reconfiguring wav "
+"files and cut audio files ...\n"
+"\n"
+"What xcfa_cli can do:\n"
+" - replaygain on files: flac, mp3, ogg, wavpack\n"
+" - conversions:\n"
+" - from files:\n"
+" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, "
+"aif, ac3\t\t\n"
+" - to files:\t\t\t\n"
+" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, aac\n"
+" - conversion settings for file management:\n"
+" flac, ape, wavpack, ogg, m4a, aac, mpc, mp3\n"
+" - management tags\n"
+" - management cue wav file\n"
+" - manipulation of the frequency, track and bit wav files\n"
+" - standardization on files: wav, mp3, ogg\n"
+" - cuts (split) wav files\n"
+" - displaying information on files\n"
+msgstr ""
+
+#: src_cli/main.c:338
+#, c-format
+msgid ""
+" --verbose Verbose mode\n"
+" -h --help Print help mode and quit\n"
+"\n"
+" -i <\"file.type\"> --input <\"file.type\">\n"
+" Input name file to convert in "
+"inverted commas, by example: --input \"*.flac\"\n"
+" Type input files: wav, flac, ape, "
+"wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, aif, ac3\n"
+" -o <path_dest/> --output <path_dest/>\n"
+" Destination folder. By default in "
+"the source file folder.\n"
+" -d <wav,flac,ape,...> --dest <wav,flac,ape,...>\n"
+" Destination file: wav, flac, ape, "
+"wavpack, ogg, m4a, mpc, mp3, aac\n"
+" -r --recursion Recursive search\n"
+" -e --ext2src Extract in the source folder. This "
+"option is useful with '--recursion'\n"
+" --nice <priority> Change the priority of running "
+"processes in the interval: 0 .. 20\n"
+"\n"
+"Management options with default parameters:\n"
+"\n"
+" --op_flac <\"-5\">\n"
+" --op_ape <\"c2000\">\n"
+" --op_wavpack <\"-y -j1\">\n"
+" --op_ogg <\"--quality=3\">\n"
+" --op_m4a <\"-q 100\">\n"
+" --op_aac <\"48\">\n"
+" --op_mpc <\"--verbose --overwrite --insane\">\n"
+" --op_mp3 <\"-h --nohist --noreplaygain -b 128\">\n"
+"\n"
+"Displays information about the files:\n"
+"\n"
+" --info_files Displays time, level dBFS, frequency/"
+"track/quantification\n"
+" --info_tags Displays tags\n"
+" --info_head Displays head\n"
+"\n"
+"Management tags:\n"
+"\n"
+" --no_tag The tags will not be carried\n"
+" --tag_album <\"tags\"> Tag of album\n"
+" --tag_artist <\"tags\"> Tag of artist\n"
+" --tag_title <\"tags\"> Tag of title\n"
+" --tag_number <\"tags\"> Tag of number\n"
+" --tag_genre <\"tags\"> Tag of genre\n"
+" --tag_year <\"tags\"> Tag of year\n"
+" --tag_comment <\"tags\"> Tag of comment\n"
+" --tag_description <\"tags\"> Tag of description\n"
+"\n"
+"Management cue file:\n"
+" -c <info|extract> --cue <info|extract>\n"
+" info Provides information on a "
+"WAV or CUE file.\n"
+" extract Extract all tracks of a WAV "
+"file.\n"
+"\n"
+"Management split:\n"
+"\n"
+" -s <hh:mm:ss> --split <hh:mm:ss> Mark the beginning of the file to be "
+"cut.\n"
+" -l <sec> --length <sec> Specifies the length of the file to "
+"cut with the seconds parameter.\n"
+"\n"
+"Changing the settings of a WAV file:\n"
+"\n"
+" -f <num> --frequency <num> Changing the frequency: 8000, "
+"22000, 32000, 44056, 44100, 48000, 88200, 96000 or other\n"
+" -t <num> --track <num> Changing the number of tracks: 1, 2, "
+"4, 6\n"
+" -q <num> --quantification <num> Changing the quantification: 8, "
+"16, 24, 32, 64\n"
+"\n"
+"Replaygain: dynamic modification for next files: FLAC, MP3, OGG, WAVPACK\n"
+"\n"
+" -g <clear|album|track> --replaygain <clear|album|track>\n"
+" FLAC [ clear | album ]\n"
+" MP3 [ clear | album | track ]\n"
+" OGG [ clear | album | track ]\n"
+" WAVPACK [ clear | album | track ]\n"
+"\n"
+"Normalize: static modification for next files: MP3, WAV, OGG\n"
+" See an excellent article by @Dzef on standardization: http://ubunteros."
+"tuxfamily.org/spip.php?article159\n"
+"\n"
+" --peak Action on a single file.\n"
+" Maximum volume amplification for "
+"each file:\n"
+" Increase the overall level of the "
+"signal so as to bring the level to 0 dBFS peak without changing dynamics.\n"
+" --peak_album Action on a group of files.\n"
+" Maximum volume boost for a group of "
+"files in accordance with the level of differences between each of them.\n"
+" If the maximum level of one or more "
+"files is already at 0 dBFS, the level of all the selected files remain "
+"unchanged\n"
+" after normalization. So this mode "
+"can be safely used almost systematically.\n"
+" --mix_rms_album <dBFS> Action on a group of files.\n"
+" Adjusting the average volume for a "
+"group of files respecting average level of the differences between each of "
+"them.\n"
+" The selecting a value for a file "
+"modifies the other files in the group.\n"
+" --fix_rms <dBFS> Action on a single file.\n"
+" Adjusting the average volume of each "
+"file..\n"
+"\n"
+msgstr ""
+
+#: src_cli/main.c:431
+#, c-format
+msgid "Example conversion:\n"
+msgstr ""
+
+#: src_cli/main.c:438
+#, c-format
+msgid "Conversion example with two inputs:\n"
+msgstr ""
+
+#: src_cli/main.c:443
+#, c-format
+msgid "Example split:\n"
+msgstr ""
+
+#: src_cli/main.c:450
+#, c-format
+msgid "Example cue:\n"
+msgstr ""
+
+#: src_cli/main.c:458
+#, c-format
+msgid "Example setting wav:\n"
+msgstr ""
+
+#: src_cli/main.c:463
+#, c-format
+msgid "Example replaygain:\n"
+msgstr ""
+
+#: src_cli/main.c:469
+#, c-format
+msgid "Example normalize:\n"
+msgstr ""
+
+#: src_cli/main.c:478
+#, c-format
+msgid "Example info:\n"
+msgstr ""
+
+#: src_cli/prg_init.c:54
+msgid " Decode ATSC A/52 audio streams"
+msgstr ""
+
+#: src_cli/prg_init.c:62
+msgid " AAC+ encoder"
+msgstr ""
+
+#: src_cli/prg_init.c:70
+msgid " Cherche des renseignements sur les formats mp3"
+msgstr ""
+
+#: src_cli/prg_init.c:78
+msgid " Audio Codeur freeware"
+msgstr ""
+
+#: src_cli/prg_init.c:86
+msgid " MPEG-4 AAC decodeur"
+msgstr ""
+
+#: src_cli/prg_init.c:94
+msgid " Conversion wav : flac"
+msgstr ""
+
+#: src_cli/prg_init.c:102
+msgid " Conversion wav : mp3"
+msgstr ""
+
+#: src_cli/prg_init.c:111
+msgid " Monkey's Audio Console Front End : APE"
+msgstr ""
+
+#: src_cli/prg_init.c:120 src_cli/prg_init.c:128
+msgid " MusePack commandline utilities"
+msgstr ""
+
+#: src_cli/prg_init.c:136
+msgid " Lecteur et extracteur"
+msgstr ""
+
+#: src_cli/prg_init.c:144
+msgid " Replaygain pour les fichiers mp3"
+msgstr ""
+
+#: src_cli/prg_init.c:152
+msgid " Normaliseur de fichier wav"
+msgstr ""
+
+#: src_cli/prg_init.c:160
+msgid " A program to send desktop notifications"
+msgstr ""
+
+#: src_cli/prg_init.c:168
+msgid " Forte compression au format wave"
+msgstr ""
+
+#: src_cli/prg_init.c:176
+msgid " Decoupage de fichiers sans decodage"
+msgstr ""
+
+#: src_cli/prg_init.c:184
+msgid " Transformation universelle de fichiers son"
+msgstr ""
+
+#: src_cli/prg_init.c:192
+msgid " Conversion wav : ogg"
+msgstr ""
+
+#: src_cli/prg_init.c:200
+msgid " Replaygain pour les fichiers ogg"
+msgstr ""
+
+#: src_cli/prg_init.c:208
+msgid " WAVPACK Hybrid Lossless Audio Compressor"
+msgstr ""

xcfa-5.0.2.tar.gz/po_cli/nl.gmo Added

xcfa-5.0.2.tar.gz/po_cli/nl.po Added

@@ -0,0 +1,399 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xcfa_cli 0.0.6\n"
+"Report-Msgid-Bugs-To: http://www.xcfa.tuxfamily.org/\n"
+"POT-Creation-Date: 2015-03-03 11:27+0100\n"
+"PO-Revision-Date: 2014-11-11 22:10:09.622832\n"
+"Last-Translator: MyName <Emailr@Adress.Ext>\n"
+"Language-Team: english\n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src_cli/main.c:313
+#, c-format
+msgid ""
+"xcfa_cli is an implementation of xcfa in command line.\n"
+"xcfa_cli is an application for conversion, normalization, reconfiguring wav "
+"files and cut audio files ...\n"
+"\n"
+"What xcfa_cli can do:\n"
+" - replaygain on files: flac, mp3, ogg, wavpack\n"
+" - conversions:\n"
+" - from files:\n"
+" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, "
+"aif, ac3\t\t\n"
+" - to files:\t\t\t\n"
+" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, aac\n"
+" - conversion settings for file management:\n"
+" flac, ape, wavpack, ogg, m4a, aac, mpc, mp3\n"
+" - management tags\n"
+" - management cue wav file\n"
+" - manipulation of the frequency, track and bit wav files\n"
+" - standardization on files: wav, mp3, ogg\n"
+" - cuts (split) wav files\n"
+" - displaying information on files\n"
+msgstr ""
+"xcfa_cli is an implementation of xcfa in command line.\n"
+"xcfa_cli is an application for conversion, normalization, reconfiguring wav "
+"files and cut audio files ...\n"
+"\n"
+"What xcfa_cli can do:\n"
+" - replaygain on files: flac, mp3, ogg, wavpack\n"
+" - conversions:\n"
+" - from files:\n"
+" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, "
+"aif, ac3\t\t\n"
+" - to files:\t\t\t\n"
+" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, aac\n"
+" - conversion settings for file management:\n"
+" flac, ape, wavpack, ogg, m4a, aac, mpc, mp3\n"
+" - management tags\n"
+" - management cue wav file\n"
+" - manipulation of the frequency, track and bit wav files\n"
+" - standardization on files: wav, mp3, ogg\n"
+" - cuts (split) wav files\n"
+" - displaying information on files\n"
+
+#: src_cli/main.c:338
+#, c-format
+msgid ""
+" --verbose Verbose mode\n"
+" -h --help Print help mode and quit\n"
+"\n"
+" -i <\"file.type\"> --input <\"file.type\">\n"
+" Input name file to convert in "
+"inverted commas, by example: --input \"*.flac\"\n"
+" Type input files: wav, flac, ape, "
+"wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, aif, ac3\n"
+" -o <path_dest/> --output <path_dest/>\n"
+" Destination folder. By default in "
+"the source file folder.\n"
+" -d <wav,flac,ape,...> --dest <wav,flac,ape,...>\n"
+" Destination file: wav, flac, ape, "
+"wavpack, ogg, m4a, mpc, mp3, aac\n"
+" -r --recursion Recursive search\n"
+" -e --ext2src Extract in the source folder. This "
+"option is useful with '--recursion'\n"
+" --nice <priority> Change the priority of running "
+"processes in the interval: 0 .. 20\n"
+"\n"
+"Management options with default parameters:\n"
+"\n"
+" --op_flac <\"-5\">\n"
+" --op_ape <\"c2000\">\n"
+" --op_wavpack <\"-y -j1\">\n"
+" --op_ogg <\"--quality=3\">\n"
+" --op_m4a <\"-q 100\">\n"
+" --op_aac <\"48\">\n"
+" --op_mpc <\"--verbose --overwrite --insane\">\n"
+" --op_mp3 <\"-h --nohist --noreplaygain -b 128\">\n"
+"\n"
+"Displays information about the files:\n"
+"\n"
+" --info_files Displays time, level dBFS, frequency/"
+"track/quantification\n"
+" --info_tags Displays tags\n"
+" --info_head Displays head\n"
+"\n"
+"Management tags:\n"
+"\n"
+" --no_tag The tags will not be carried\n"
+" --tag_album <\"tags\"> Tag of album\n"
+" --tag_artist <\"tags\"> Tag of artist\n"
+" --tag_title <\"tags\"> Tag of title\n"
+" --tag_number <\"tags\"> Tag of number\n"
+" --tag_genre <\"tags\"> Tag of genre\n"
+" --tag_year <\"tags\"> Tag of year\n"
+" --tag_comment <\"tags\"> Tag of comment\n"
+" --tag_description <\"tags\"> Tag of description\n"
+"\n"
+"Management cue file:\n"
+" -c <info|extract> --cue <info|extract>\n"
+" info Provides information on a "
+"WAV or CUE file.\n"
+" extract Extract all tracks of a WAV "
+"file.\n"
+"\n"
+"Management split:\n"
+"\n"
+" -s <hh:mm:ss> --split <hh:mm:ss> Mark the beginning of the file to be "
+"cut.\n"
+" -l <sec> --length <sec> Specifies the length of the file to "
+"cut with the seconds parameter.\n"
+"\n"
+"Changing the settings of a WAV file:\n"
+"\n"
+" -f <num> --frequency <num> Changing the frequency: 8000, "
+"22000, 32000, 44056, 44100, 48000, 88200, 96000 or other\n"
+" -t <num> --track <num> Changing the number of tracks: 1, 2, "
+"4, 6\n"
+" -q <num> --quantification <num> Changing the quantification: 8, "
+"16, 24, 32, 64\n"
+"\n"
+"Replaygain: dynamic modification for next files: FLAC, MP3, OGG, WAVPACK\n"
+"\n"
+" -g <clear|album|track> --replaygain <clear|album|track>\n"
+" FLAC [ clear | album ]\n"
+" MP3 [ clear | album | track ]\n"
+" OGG [ clear | album | track ]\n"
+" WAVPACK [ clear | album | track ]\n"
+"\n"
+"Normalize: static modification for next files: MP3, WAV, OGG\n"
+" See an excellent article by @Dzef on standardization: http://ubunteros."
+"tuxfamily.org/spip.php?article159\n"
+"\n"
+" --peak Action on a single file.\n"
+" Maximum volume amplification for "
+"each file:\n"
+" Increase the overall level of the "
+"signal so as to bring the level to 0 dBFS peak without changing dynamics.\n"
+" --peak_album Action on a group of files.\n"
+" Maximum volume boost for a group of "
+"files in accordance with the level of differences between each of them.\n"
+" If the maximum level of one or more "
+"files is already at 0 dBFS, the level of all the selected files remain "
+"unchanged\n"
+" after normalization. So this mode "
+"can be safely used almost systematically.\n"
+" --mix_rms_album <dBFS> Action on a group of files.\n"
+" Adjusting the average volume for a "
+"group of files respecting average level of the differences between each of "
+"them.\n"
+" The selecting a value for a file "
+"modifies the other files in the group.\n"
+" --fix_rms <dBFS> Action on a single file.\n"
+" Adjusting the average volume of each "
+"file..\n"
+"\n"
+msgstr ""
+" --verbose Verbose mode\n"
+" -h --help Print help mode and quit\n"
+"\n"
+" -i <\"file.type\"> --input <\"file.type\">\n"
+" Input name file to convert in "
+"inverted commas, by example: --input \"*.flac\"\n"
+" Type input files: wav, flac, ape, "
+"wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, aif, ac3\n"
+" -o <path_dest/> --output <path_dest/>\n"
+" Destination folder. By default in "
+"the source file folder.\n"
+" -d <wav,flac,ape,...> --dest <wav,flac,ape,...>\n"
+" Destination file: wav, flac, ape, "
+"wavpack, ogg, m4a, mpc, mp3, aac\n"
+" -r --recursion Recursive search\n"
+" -e --ext2src Extract in the source folder. This "
+"option is useful with '--recursion'\n"
+" --nice <priority> Change the priority of running "
+"processes in the interval: 0 .. 20\n"
+"\n"
+"Management options with default parameters:\n"
+"\n"
+" --op_flac <\"-5\">\n"
+" --op_ape <\"c2000\">\n"
+" --op_wavpack <\"-y -j1\">\n"
+" --op_ogg <\"--quality=3\">\n"
+" --op_m4a <\"-q 100\">\n"
+" --op_aac <\"48\">\n"
+" --op_mpc <\"--verbose --overwrite --insane\">\n"
+" --op_mp3 <\"-h --nohist --noreplaygain -b 128\">\n"
+"\n"
+"Displays information about the files:\n"
+"\n"
+" --info_files Displays time, level dBFS, frequency/"
+"track/quantification\n"
+" --info_tags Displays tags\n"
+" --info_head Displays head\n"
+"\n"
+"Management tags:\n"
+"\n"
+" --no_tag The tags will not be carried\n"
+" --tag_album <\"tags\"> Tag of album\n"
+" --tag_artist <\"tags\"> Tag of artist\n"
+" --tag_title <\"tags\"> Tag of title\n"
+" --tag_number <\"tags\"> Tag of number\n"
+" --tag_genre <\"tags\"> Tag of genre\n"
+" --tag_year <\"tags\"> Tag of year\n"
+" --tag_comment <\"tags\"> Tag of comment\n"
+" --tag_description <\"tags\"> Tag of description\n"
+"\n"
+"Management cue file:\n"
+" -c <info|extract> --cue <info|extract>\n"
+" info Provides information on a "
+"WAV or CUE file.\n"
+" extract Extract all tracks of a WAV "
+"file.\n"
+"\n"
+"Management split:\n"
+"\n"
+" -s <hh:mm:ss> --split <hh:mm:ss> Mark the beginning of the file to be "
+"cut.\n"
+" -l <sec> --length <sec> Specifies the length of the file to "
+"cut with the seconds parameter.\n"
+"\n"
+"Changing the settings of a WAV file:\n"
+"\n"
+" -f <num> --frequency <num> Changing the frequency: 8000, "
+"22000, 32000, 44056, 44100, 48000, 88200, 96000 or other\n"
+" -t <num> --track <num> Changing the number of tracks: 1, 2, "
+"4, 6\n"
+" -q <num> --quantification <num> Changing the quantification: 8, "
+"16, 24, 32, 64\n"
+"\n"
+"Replaygain: dynamic modification for next files: FLAC, MP3, OGG, WAVPACK\n"
+"\n"
+" -g <clear|album|track> --replaygain <clear|album|track>\n"
+" FLAC [ clear | album ]\n"
+" MP3 [ clear | album | track ]\n"
+" OGG [ clear | album | track ]\n"
+" WAVPACK [ clear | album | track ]\n"
+"\n"
+"Normalize: static modification for next files: MP3, WAV, OGG\n"
+" See an excellent article by @Dzef on standardization: http://ubunteros."
+"tuxfamily.org/spip.php?article159\n"
+"\n"
+" --peak Action on a single file.\n"
+" Maximum volume amplification for "
+"each file:\n"
+" Increase the overall level of the "
+"signal so as to bring the level to 0 dBFS peak without changing dynamics.\n"
+" --peak_album Action on a group of files.\n"
+" Maximum volume boost for a group of "
+"files in accordance with the level of differences between each of them.\n"
+" If the maximum level of one or more "
+"files is already at 0 dBFS, the level of all the selected files remain "
+"unchanged\n"
+" after normalization. So this mode "
+"can be safely used almost systematically.\n"
+" --mix_rms_album <dBFS> Action on a group of files.\n"
+" Adjusting the average volume for a "
+"group of files respecting average level of the differences between each of "
+"them.\n"
+" The selecting a value for a file "
+"modifies the other files in the group.\n"
+" --fix_rms <dBFS> Action on a single file.\n"
+" Adjusting the average volume of each "
+"file..\n"
+"\n"
+
+#: src_cli/main.c:431
+#, c-format
+msgid "Example conversion:\n"
+msgstr "Example conversion:\n"
+
+#: src_cli/main.c:438
+#, c-format
+msgid "Conversion example with two inputs:\n"
+msgstr "Conversion example with two inputs:\n"
+
+#: src_cli/main.c:443
+#, c-format
+msgid "Example split:\n"
+msgstr "Example split:\n"
+
+#: src_cli/main.c:450
+#, c-format
+msgid "Example cue:\n"
+msgstr "Example cue:\n"
+
+#: src_cli/main.c:458
+#, c-format
+msgid "Example setting wav:\n"
+msgstr "Example setting wav:\n"
+
+#: src_cli/main.c:463
+#, c-format
+msgid "Example replaygain:\n"
+msgstr "Example replaygain:\n"
+
+#: src_cli/main.c:469
+#, c-format
+msgid "Example normalize:\n"
+msgstr "Example normalize:\n"
+
+#: src_cli/main.c:478
+#, c-format
+msgid "Example info:\n"
+msgstr "Example info:\n"
+
+#: src_cli/prg_init.c:54
+msgid " Decode ATSC A/52 audio streams"
+msgstr " Decode ATSC A/52 audio streams"
+
+#: src_cli/prg_init.c:62
+msgid " AAC+ encoder"
+msgstr " AAC+ encode"
+
+#: src_cli/prg_init.c:70
+msgid " Cherche des renseignements sur les formats mp3"
+msgstr " Cherche des renseignements sur les formats mp3"
+
+#: src_cli/prg_init.c:78
+msgid " Audio Codeur freeware"
+msgstr " Audio Codeur freeware"
+
+#: src_cli/prg_init.c:86
+msgid " MPEG-4 AAC decodeur"
+msgstr " MPEG-4 AAC decodeu"
+
+#: src_cli/prg_init.c:94
+msgid " Conversion wav : flac"
+msgstr " Conversion wav : flac"
+
+#: src_cli/prg_init.c:102
+msgid " Conversion wav : mp3"
+msgstr " Conversion wav : mp3"
+
+#: src_cli/prg_init.c:111
+msgid " Monkey's Audio Console Front End : APE"
+msgstr " Monkey's Audio Console Front End : APE"
+
+#: src_cli/prg_init.c:120 src_cli/prg_init.c:128
+msgid " MusePack commandline utilities"
+msgstr " MusePack commandline utilities"
+
+#: src_cli/prg_init.c:136
+msgid " Lecteur et extracteur"
+msgstr " Lecteur et extracteur"
+
+#: src_cli/prg_init.c:144
+msgid " Replaygain pour les fichiers mp3"
+msgstr " Replaygain pour les fichiers mp3"
+
+#: src_cli/prg_init.c:152
+msgid " Normaliseur de fichier wav"
+msgstr " Normaliseur de fichier wa"
+
+#: src_cli/prg_init.c:160
+msgid " A program to send desktop notifications"
+msgstr " A program to send desktop notifications"
+
+#: src_cli/prg_init.c:168
+msgid " Forte compression au format wave"
+msgstr " Forte compression au format wave"
+
+#: src_cli/prg_init.c:176
+msgid " Decoupage de fichiers sans decodage"
+msgstr " Decoupage de fichiers sans decodage"
+
+#: src_cli/prg_init.c:184
+msgid " Transformation universelle de fichiers son"
+msgstr " Transformation universelle de fichiers son"
+
+#: src_cli/prg_init.c:192
+msgid " Conversion wav : ogg"
+msgstr " Conversion wav : og"
+
+#: src_cli/prg_init.c:200
+msgid " Replaygain pour les fichiers ogg"
+msgstr " Replaygain pour les fichiers ogg"
+
+#: src_cli/prg_init.c:208
+msgid " WAVPACK Hybrid Lossless Audio Compressor"
+msgstr " WAVPACK Hybrid Lossless Audio Compressor"

xcfa-5.0.2.tar.gz/po_cli/quot.sed Added

xcfa-5.0.2.tar.gz/po_cli/remove-potcdate.sin Added

xcfa-5.0.2.tar.gz/po_cli/stamp-po Added

xcfa-5.0.2.tar.gz/po_cli/xcfa_cli.pot Added

@@ -0,0 +1,272 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: xcfa 5.0.2\n"
+"Report-Msgid-Bugs-To: http://www.xcfa.tuxfamily.org/\n"
+"POT-Creation-Date: 2015-03-03 11:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src_cli/main.c:313
+#, c-format
+msgid ""
+"xcfa_cli is an implementation of xcfa in command line.\n"
+"xcfa_cli is an application for conversion, normalization, reconfiguring wav "
+"files and cut audio files ...\n"
+"\n"
+"What xcfa_cli can do:\n"
+" - replaygain on files: flac, mp3, ogg, wavpack\n"
+" - conversions:\n"
+" - from files:\n"
+" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, "
+"aif, ac3\t\t\n"
+" - to files:\t\t\t\n"
+" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, aac\n"
+" - conversion settings for file management:\n"
+" flac, ape, wavpack, ogg, m4a, aac, mpc, mp3\n"
+" - management tags\n"
+" - management cue wav file\n"
+" - manipulation of the frequency, track and bit wav files\n"
+" - standardization on files: wav, mp3, ogg\n"
+" - cuts (split) wav files\n"
+" - displaying information on files\n"
+msgstr ""
+
+#: src_cli/main.c:338
+#, c-format
+msgid ""
+" --verbose Verbose mode\n"
+" -h --help Print help mode and quit\n"
+"\n"
+" -i <\"file.type\"> --input <\"file.type\">\n"
+" Input name file to convert in "
+"inverted commas, by example: --input \"*.flac\"\n"
+" Type input files: wav, flac, ape, "
+"wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, aif, ac3\n"
+" -o <path_dest/> --output <path_dest/>\n"
+" Destination folder. By default in "
+"the source file folder.\n"
+" -d <wav,flac,ape,...> --dest <wav,flac,ape,...>\n"
+" Destination file: wav, flac, ape, "
+"wavpack, ogg, m4a, mpc, mp3, aac\n"
+" -r --recursion Recursive search\n"
+" -e --ext2src Extract in the source folder. This "
+"option is useful with '--recursion'\n"
+" --nice <priority> Change the priority of running "
+"processes in the interval: 0 .. 20\n"
+"\n"
+"Management options with default parameters:\n"
+"\n"
+" --op_flac <\"-5\">\n"
+" --op_ape <\"c2000\">\n"
+" --op_wavpack <\"-y -j1\">\n"
+" --op_ogg <\"--quality=3\">\n"
+" --op_m4a <\"-q 100\">\n"
+" --op_aac <\"48\">\n"
+" --op_mpc <\"--verbose --overwrite --insane\">\n"
+" --op_mp3 <\"-h --nohist --noreplaygain -b 128\">\n"
+"\n"
+"Displays information about the files:\n"
+"\n"
+" --info_files Displays time, level dBFS, frequency/"
+"track/quantification\n"
+" --info_tags Displays tags\n"
+" --info_head Displays head\n"
+"\n"
+"Management tags:\n"
+"\n"
+" --no_tag The tags will not be carried\n"
+" --tag_album <\"tags\"> Tag of album\n"
+" --tag_artist <\"tags\"> Tag of artist\n"
+" --tag_title <\"tags\"> Tag of title\n"
+" --tag_number <\"tags\"> Tag of number\n"
+" --tag_genre <\"tags\"> Tag of genre\n"
+" --tag_year <\"tags\"> Tag of year\n"
+" --tag_comment <\"tags\"> Tag of comment\n"
+" --tag_description <\"tags\"> Tag of description\n"
+"\n"
+"Management cue file:\n"
+" -c <info|extract> --cue <info|extract>\n"
+" info Provides information on a "
+"WAV or CUE file.\n"
+" extract Extract all tracks of a WAV "
+"file.\n"
+"\n"
+"Management split:\n"
+"\n"
+" -s <hh:mm:ss> --split <hh:mm:ss> Mark the beginning of the file to be "
+"cut.\n"
+" -l <sec> --length <sec> Specifies the length of the file to "
+"cut with the seconds parameter.\n"
+"\n"
+"Changing the settings of a WAV file:\n"
+"\n"
+" -f <num> --frequency <num> Changing the frequency: 8000, "
+"22000, 32000, 44056, 44100, 48000, 88200, 96000 or other\n"
+" -t <num> --track <num> Changing the number of tracks: 1, 2, "
+"4, 6\n"
+" -q <num> --quantification <num> Changing the quantification: 8, "
+"16, 24, 32, 64\n"
+"\n"
+"Replaygain: dynamic modification for next files: FLAC, MP3, OGG, WAVPACK\n"
+"\n"
+" -g <clear|album|track> --replaygain <clear|album|track>\n"
+" FLAC [ clear | album ]\n"
+" MP3 [ clear | album | track ]\n"
+" OGG [ clear | album | track ]\n"
+" WAVPACK [ clear | album | track ]\n"
+"\n"
+"Normalize: static modification for next files: MP3, WAV, OGG\n"
+" See an excellent article by @Dzef on standardization: http://ubunteros."
+"tuxfamily.org/spip.php?article159\n"
+"\n"
+" --peak Action on a single file.\n"
+" Maximum volume amplification for "
+"each file:\n"
+" Increase the overall level of the "
+"signal so as to bring the level to 0 dBFS peak without changing dynamics.\n"
+" --peak_album Action on a group of files.\n"
+" Maximum volume boost for a group of "
+"files in accordance with the level of differences between each of them.\n"
+" If the maximum level of one or more "
+"files is already at 0 dBFS, the level of all the selected files remain "
+"unchanged\n"
+" after normalization. So this mode "
+"can be safely used almost systematically.\n"
+" --mix_rms_album <dBFS> Action on a group of files.\n"
+" Adjusting the average volume for a "
+"group of files respecting average level of the differences between each of "
+"them.\n"
+" The selecting a value for a file "
+"modifies the other files in the group.\n"
+" --fix_rms <dBFS> Action on a single file.\n"
+" Adjusting the average volume of each "
+"file..\n"
+"\n"
+msgstr ""
+
+#: src_cli/main.c:431
+#, c-format
+msgid "Example conversion:\n"
+msgstr ""
+
+#: src_cli/main.c:438
+#, c-format
+msgid "Conversion example with two inputs:\n"
+msgstr ""
+
+#: src_cli/main.c:443
+#, c-format
+msgid "Example split:\n"
+msgstr ""
+
+#: src_cli/main.c:450
+#, c-format
+msgid "Example cue:\n"
+msgstr ""
+
+#: src_cli/main.c:458
+#, c-format
+msgid "Example setting wav:\n"
+msgstr ""
+
+#: src_cli/main.c:463
+#, c-format
+msgid "Example replaygain:\n"
+msgstr ""
+
+#: src_cli/main.c:469
+#, c-format
+msgid "Example normalize:\n"
+msgstr ""
+
+#: src_cli/main.c:478
+#, c-format
+msgid "Example info:\n"
+msgstr ""
+
+#: src_cli/prg_init.c:54
+msgid " Decode ATSC A/52 audio streams"
+msgstr ""
+
+#: src_cli/prg_init.c:62
+msgid " AAC+ encoder"
+msgstr ""
+
+#: src_cli/prg_init.c:70
+msgid " Cherche des renseignements sur les formats mp3"
+msgstr ""
+
+#: src_cli/prg_init.c:78
+msgid " Audio Codeur freeware"
+msgstr ""
+
+#: src_cli/prg_init.c:86
+msgid " MPEG-4 AAC decodeur"
+msgstr ""
+
+#: src_cli/prg_init.c:94
+msgid " Conversion wav : flac"
+msgstr ""
+
+#: src_cli/prg_init.c:102
+msgid " Conversion wav : mp3"
+msgstr ""
+
+#: src_cli/prg_init.c:111
+msgid " Monkey's Audio Console Front End : APE"
+msgstr ""
+
+#: src_cli/prg_init.c:120 src_cli/prg_init.c:128
+msgid " MusePack commandline utilities"
+msgstr ""
+
+#: src_cli/prg_init.c:136
+msgid " Lecteur et extracteur"
+msgstr ""
+
+#: src_cli/prg_init.c:144
+msgid " Replaygain pour les fichiers mp3"
+msgstr ""
+
+#: src_cli/prg_init.c:152
+msgid " Normaliseur de fichier wav"
+msgstr ""
+
+#: src_cli/prg_init.c:160
+msgid " A program to send desktop notifications"
+msgstr ""
+
+#: src_cli/prg_init.c:168
+msgid " Forte compression au format wave"
+msgstr ""
+
+#: src_cli/prg_init.c:176
+msgid " Decoupage de fichiers sans decodage"
+msgstr ""
+
+#: src_cli/prg_init.c:184
+msgid " Transformation universelle de fichiers son"
+msgstr ""
+
+#: src_cli/prg_init.c:192
+msgid " Conversion wav : ogg"
+msgstr ""
+
+#: src_cli/prg_init.c:200
+msgid " Replaygain pour les fichiers ogg"
+msgstr ""
+
+#: src_cli/prg_init.c:208
+msgid " WAVPACK Hybrid Lossless Audio Compressor"
+msgstr ""

xcfa-4.2.8.tar.gz/src/Makefile.am -> xcfa-5.0.2.tar.gz/src/Makefile.am Changed

@@ -3,7 +3,7 @@
 #
 AUTOMAKE_OPTIONS= gnu 
 
-INCLUDES = \
+AM_CPPFLAGS = \
    -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
    -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
    -DPIXMAPS_DIR=\""$(datadir)/pixmaps/xcfa"\" \
@@ -16,6 +16,7 @@
 
 bin_PROGRAMS=xcfa
 xcfa_SOURCES=main.c \
+builder.c \
 alsa_audio.c alsa_audio.h alsa_play.c alsa_play.h \
 cd_audio.c cd_audio_extract.c cd_audio_extract.h cd_audio_toc.c cd_cue.c cd_cue.h cd_expander.c cd_normalise.c cd_normalise.h cd_audio.h cd_curl.c cd_curl.h \
 configuser.c configuser.h \
@@ -35,18 +36,15 @@
 play_file.c play_file.h \
 poche.c poche_dir.c poche_draw.c poche_save.c poche_txt.c poche_web.c poche.h \
 popup.c popup.h \
-popup_systray.c popup_systray.h \
 prg_init.c prg_init.h \
 proc.c proc.h \
-process.c process.h \
 replaygain.c replaygain.h \
 scan.c scan.h \
 split.c split_selector.c split_spectre.c split_cue.c split_conv.c split_wav.c split.h \
 statusbar.c statusbar.h \
 tags.c tags_aac.c tags_aiff.c tags_ape.c tags_dts.c tags_flac.c tags_m4a.c tags_mp3.c tags_mpc.c tags_ogg.c tags_rm.c tags_shn.c tags_wav.c tags_wavpack.c tags_wma.c tags_ac3.c tags.h \
-translate.c \
-treeview.c treeview.h \
 web.c web.h \
+win_treeview.c win_treeview.h \
 win_about.c win_about.h \
 win_info.c win_info.h \
 win_reader.c win_reader.h \
@@ -60,4 +58,8 @@
 localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR="$(localedir)" @DEFS@
 
-xcfa_LDADD =@PACKAGE_LIBS@ $(INTLLIBS) ${top_builddir}/lib/lib.a
+#xcfa_LDADD=@PACKAGE_LIBS@ $(INTLLIBS) ${top_builddir}/lib/lib.a -lm -lX11
+xcfa_LDADD=${top_builddir}/lib/lib.a -lm -lX11 @PACKAGE_LIBS@ $(INTLLIBS)
+
+
+

xcfa-4.2.8.tar.gz/src/Makefile.in -> xcfa-5.0.2.tar.gz/src/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \	]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,24 +90,24 @@
 host_triplet = @host@
 bin_PROGRAMS = xcfa$(EXEEXT)
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
-am_xcfa_OBJECTS = xcfa-main.$(OBJEXT) xcfa-alsa_audio.$(OBJEXT) \
-	xcfa-alsa_play.$(OBJEXT) xcfa-cd_audio.$(OBJEXT) \
-	xcfa-cd_audio_extract.$(OBJEXT) xcfa-cd_audio_toc.$(OBJEXT) \
-	xcfa-cd_cue.$(OBJEXT) xcfa-cd_expander.$(OBJEXT) \
-	xcfa-cd_normalise.$(OBJEXT) xcfa-cd_curl.$(OBJEXT) \
-	xcfa-configuser.$(OBJEXT) xcfa-conv.$(OBJEXT) \
-	xcfa-cursor.$(OBJEXT) xcfa-dvd.$(OBJEXT) \
+am_xcfa_OBJECTS = xcfa-main.$(OBJEXT) xcfa-builder.$(OBJEXT) \
+	xcfa-alsa_audio.$(OBJEXT) xcfa-alsa_play.$(OBJEXT) \
+	xcfa-cd_audio.$(OBJEXT) xcfa-cd_audio_extract.$(OBJEXT) \
+	xcfa-cd_audio_toc.$(OBJEXT) xcfa-cd_cue.$(OBJEXT) \
+	xcfa-cd_expander.$(OBJEXT) xcfa-cd_normalise.$(OBJEXT) \
+	xcfa-cd_curl.$(OBJEXT) xcfa-configuser.$(OBJEXT) \
+	xcfa-conv.$(OBJEXT) xcfa-cursor.$(OBJEXT) xcfa-dvd.$(OBJEXT) \
 	xcfa-dvd_table.$(OBJEXT) xcfa-dvd_read.$(OBJEXT) \
 	xcfa-dvd_extract.$(OBJEXT) xcfa-dragNdrop.$(OBJEXT) \
 	xcfa-extra.$(OBJEXT) xcfa-file.$(OBJEXT) \
@@ -75,9 +129,8 @@
 	xcfa-poche.$(OBJEXT) xcfa-poche_dir.$(OBJEXT) \
 	xcfa-poche_draw.$(OBJEXT) xcfa-poche_save.$(OBJEXT) \
 	xcfa-poche_txt.$(OBJEXT) xcfa-poche_web.$(OBJEXT) \
-	xcfa-popup.$(OBJEXT) xcfa-popup_systray.$(OBJEXT) \
-	xcfa-prg_init.$(OBJEXT) xcfa-proc.$(OBJEXT) \
-	xcfa-process.$(OBJEXT) xcfa-replaygain.$(OBJEXT) \
+	xcfa-popup.$(OBJEXT) xcfa-prg_init.$(OBJEXT) \
+	xcfa-proc.$(OBJEXT) xcfa-replaygain.$(OBJEXT) \
 	xcfa-scan.$(OBJEXT) xcfa-split.$(OBJEXT) \
 	xcfa-split_selector.$(OBJEXT) xcfa-split_spectre.$(OBJEXT) \
 	xcfa-split_cue.$(OBJEXT) xcfa-split_conv.$(OBJEXT) \
@@ -90,40 +143,72 @@
 	xcfa-tags_rm.$(OBJEXT) xcfa-tags_shn.$(OBJEXT) \
 	xcfa-tags_wav.$(OBJEXT) xcfa-tags_wavpack.$(OBJEXT) \
 	xcfa-tags_wma.$(OBJEXT) xcfa-tags_ac3.$(OBJEXT) \
-	xcfa-translate.$(OBJEXT) xcfa-treeview.$(OBJEXT) \
-	xcfa-web.$(OBJEXT) xcfa-win_about.$(OBJEXT) \
-	xcfa-win_info.$(OBJEXT) xcfa-win_reader.$(OBJEXT) \
-	xcfa-win_scan.$(OBJEXT) xcfa-win_vte.$(OBJEXT)
+	xcfa-web.$(OBJEXT) xcfa-win_treeview.$(OBJEXT) \
+	xcfa-win_about.$(OBJEXT) xcfa-win_info.$(OBJEXT) \
+	xcfa-win_reader.$(OBJEXT) xcfa-win_scan.$(OBJEXT) \
+	xcfa-win_vte.$(OBJEXT)
 xcfa_OBJECTS = $(am_xcfa_OBJECTS)
 am__DEPENDENCIES_1 =
-xcfa_DEPENDENCIES = $(am__DEPENDENCIES_1) ${top_builddir}/lib/lib.a
+xcfa_DEPENDENCIES = ${top_builddir}/lib/lib.a $(am__DEPENDENCIES_1)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo " CC " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo " CCLD " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo " GEN " $@;
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 = 
 SOURCES = $(xcfa_SOURCES)
 DIST_SOURCES = $(xcfa_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -190,6 +275,7 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -255,7 +341,7 @@
 # src/Makefile.am
 #
 AUTOMAKE_OPTIONS = gnu 
-INCLUDES = \
+AM_CPPFLAGS = \
 -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 -DPIXMAPS_DIR=\""$(datadir)/pixmaps/xcfa"\" \
@@ -267,6 +353,7 @@
 -DPIXMAPS_DIR=\""$(datadir)/pixmaps/xcfa"\" 
 
 xcfa_SOURCES = main.c \
+builder.c \
 alsa_audio.c alsa_audio.h alsa_play.c alsa_play.h \
 cd_audio.c cd_audio_extract.c cd_audio_extract.h cd_audio_toc.c cd_cue.c cd_cue.h cd_expander.c cd_normalise.c cd_normalise.h cd_audio.h cd_curl.c cd_curl.h \
 configuser.c configuser.h \
@@ -286,18 +373,15 @@
 play_file.c play_file.h \
 poche.c poche_dir.c poche_draw.c poche_save.c poche_txt.c poche_web.c poche.h \
 popup.c popup.h \
-popup_systray.c popup_systray.h \
 prg_init.c prg_init.h \
 proc.c proc.h \
-process.c process.h \
 replaygain.c replaygain.h \
 scan.c scan.h \
 split.c split_selector.c split_spectre.c split_cue.c split_conv.c split_wav.c split.h \
 statusbar.c statusbar.h \
 tags.c tags_aac.c tags_aiff.c tags_ape.c tags_dts.c tags_flac.c tags_m4a.c tags_mp3.c tags_mpc.c tags_ogg.c tags_rm.c tags_shn.c tags_wav.c tags_wavpack.c tags_wma.c tags_ac3.c tags.h \
-translate.c \
-treeview.c treeview.h \
 web.c web.h \
+win_treeview.c win_treeview.h \
 win_about.c win_about.h \
 win_info.c win_info.h \
 win_reader.c win_reader.h \
@@ -306,7 +390,9 @@
 global.h
 
 xcfa_CPPFLAGS = -I${top_srcdir}/lib
-xcfa_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) ${top_builddir}/lib/lib.a
+
+#xcfa_LDADD=@PACKAGE_LIBS@ $(INTLLIBS) ${top_builddir}/lib/lib.a -lm -lX11
+xcfa_LDADD = ${top_builddir}/lib/lib.a -lm -lX11 @PACKAGE_LIBS@ $(INTLLIBS)
 all: all-am
 
 .SUFFIXES:
@@ -323,7 +409,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	 $(AUTOMAKE) --gnu src/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	 *config.status*) \
@@ -343,14 +428,18 @@
 $(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	 echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	 $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p; \
-	 then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	 -e 's|.*|.|' \
 	 -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -371,14 +460,16 @@
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	 -e 's/$$/$(EXEEXT)/' `; \
+	 -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-xcfa$(EXEEXT): $(xcfa_OBJECTS) $(xcfa_DEPENDENCIES) 
+
+xcfa$(EXEEXT): $(xcfa_OBJECTS) $(xcfa_DEPENDENCIES) $(EXTRA_xcfa_DEPENDENCIES) 
 	@rm -f xcfa$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(xcfa_OBJECTS) $(xcfa_LDADD) $(LIBS)
 
@@ -390,6 +481,7 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-alsa_audio.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-alsa_play.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-builder.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-cd_audio.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-cd_audio_extract.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-cd_audio_toc.Po@am__quote@
@@ -445,10 +537,8 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-poche_txt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-poche_web.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-popup.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-popup_systray.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-prg_init.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-proc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-process.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-replaygain.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-scan.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-split.Po@am__quote@
@@ -474,1555 +564,1325 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-tags_wav.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-tags_wavpack.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-tags_wma.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-translate.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-treeview.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-web.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-win_about.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-win_info.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-win_reader.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-win_scan.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-win_treeview.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcfa-win_vte.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 xcfa-main.o: main.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-main.o -MD -MP -MF $(DEPDIR)/xcfa-main.Tpo -c -o xcfa-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-main.Tpo $(DEPDIR)/xcfa-main.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main.c' object='xcfa-main.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='main.c' object='xcfa-main.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
 
 xcfa-main.obj: main.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-main.obj -MD -MP -MF $(DEPDIR)/xcfa-main.Tpo -c -o xcfa-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-main.Tpo $(DEPDIR)/xcfa-main.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main.c' object='xcfa-main.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='main.c' object='xcfa-main.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
+
+xcfa-builder.o: builder.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-builder.o -MD -MP -MF $(DEPDIR)/xcfa-builder.Tpo -c -o xcfa-builder.o `test -f 'builder.c' || echo '$(srcdir)/'`builder.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-builder.Tpo $(DEPDIR)/xcfa-builder.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='builder.c' object='xcfa-builder.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-builder.o `test -f 'builder.c' || echo '$(srcdir)/'`builder.c
+
+xcfa-builder.obj: builder.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-builder.obj -MD -MP -MF $(DEPDIR)/xcfa-builder.Tpo -c -o xcfa-builder.obj `if test -f 'builder.c'; then $(CYGPATH_W) 'builder.c'; else $(CYGPATH_W) '$(srcdir)/builder.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-builder.Tpo $(DEPDIR)/xcfa-builder.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='builder.c' object='xcfa-builder.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-builder.obj `if test -f 'builder.c'; then $(CYGPATH_W) 'builder.c'; else $(CYGPATH_W) '$(srcdir)/builder.c'; fi`
 
 xcfa-alsa_audio.o: alsa_audio.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-alsa_audio.o -MD -MP -MF $(DEPDIR)/xcfa-alsa_audio.Tpo -c -o xcfa-alsa_audio.o `test -f 'alsa_audio.c' || echo '$(srcdir)/'`alsa_audio.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-alsa_audio.Tpo $(DEPDIR)/xcfa-alsa_audio.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='alsa_audio.c' object='xcfa-alsa_audio.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='alsa_audio.c' object='xcfa-alsa_audio.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-alsa_audio.o `test -f 'alsa_audio.c' || echo '$(srcdir)/'`alsa_audio.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-alsa_audio.o `test -f 'alsa_audio.c' || echo '$(srcdir)/'`alsa_audio.c
 
 xcfa-alsa_audio.obj: alsa_audio.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-alsa_audio.obj -MD -MP -MF $(DEPDIR)/xcfa-alsa_audio.Tpo -c -o xcfa-alsa_audio.obj `if test -f 'alsa_audio.c'; then $(CYGPATH_W) 'alsa_audio.c'; else $(CYGPATH_W) '$(srcdir)/alsa_audio.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-alsa_audio.Tpo $(DEPDIR)/xcfa-alsa_audio.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='alsa_audio.c' object='xcfa-alsa_audio.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='alsa_audio.c' object='xcfa-alsa_audio.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-alsa_audio.obj `if test -f 'alsa_audio.c'; then $(CYGPATH_W) 'alsa_audio.c'; else $(CYGPATH_W) '$(srcdir)/alsa_audio.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-alsa_audio.obj `if test -f 'alsa_audio.c'; then $(CYGPATH_W) 'alsa_audio.c'; else $(CYGPATH_W) '$(srcdir)/alsa_audio.c'; fi`
 
 xcfa-alsa_play.o: alsa_play.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-alsa_play.o -MD -MP -MF $(DEPDIR)/xcfa-alsa_play.Tpo -c -o xcfa-alsa_play.o `test -f 'alsa_play.c' || echo '$(srcdir)/'`alsa_play.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-alsa_play.Tpo $(DEPDIR)/xcfa-alsa_play.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='alsa_play.c' object='xcfa-alsa_play.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='alsa_play.c' object='xcfa-alsa_play.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-alsa_play.o `test -f 'alsa_play.c' || echo '$(srcdir)/'`alsa_play.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-alsa_play.o `test -f 'alsa_play.c' || echo '$(srcdir)/'`alsa_play.c
 
 xcfa-alsa_play.obj: alsa_play.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-alsa_play.obj -MD -MP -MF $(DEPDIR)/xcfa-alsa_play.Tpo -c -o xcfa-alsa_play.obj `if test -f 'alsa_play.c'; then $(CYGPATH_W) 'alsa_play.c'; else $(CYGPATH_W) '$(srcdir)/alsa_play.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-alsa_play.Tpo $(DEPDIR)/xcfa-alsa_play.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='alsa_play.c' object='xcfa-alsa_play.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='alsa_play.c' object='xcfa-alsa_play.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-alsa_play.obj `if test -f 'alsa_play.c'; then $(CYGPATH_W) 'alsa_play.c'; else $(CYGPATH_W) '$(srcdir)/alsa_play.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-alsa_play.obj `if test -f 'alsa_play.c'; then $(CYGPATH_W) 'alsa_play.c'; else $(CYGPATH_W) '$(srcdir)/alsa_play.c'; fi`
 
 xcfa-cd_audio.o: cd_audio.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-cd_audio.o -MD -MP -MF $(DEPDIR)/xcfa-cd_audio.Tpo -c -o xcfa-cd_audio.o `test -f 'cd_audio.c' || echo '$(srcdir)/'`cd_audio.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-cd_audio.Tpo $(DEPDIR)/xcfa-cd_audio.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cd_audio.c' object='xcfa-cd_audio.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cd_audio.c' object='xcfa-cd_audio.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_audio.o `test -f 'cd_audio.c' || echo '$(srcdir)/'`cd_audio.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_audio.o `test -f 'cd_audio.c' || echo '$(srcdir)/'`cd_audio.c
 
 xcfa-cd_audio.obj: cd_audio.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-cd_audio.obj -MD -MP -MF $(DEPDIR)/xcfa-cd_audio.Tpo -c -o xcfa-cd_audio.obj `if test -f 'cd_audio.c'; then $(CYGPATH_W) 'cd_audio.c'; else $(CYGPATH_W) '$(srcdir)/cd_audio.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-cd_audio.Tpo $(DEPDIR)/xcfa-cd_audio.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cd_audio.c' object='xcfa-cd_audio.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cd_audio.c' object='xcfa-cd_audio.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_audio.obj `if test -f 'cd_audio.c'; then $(CYGPATH_W) 'cd_audio.c'; else $(CYGPATH_W) '$(srcdir)/cd_audio.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_audio.obj `if test -f 'cd_audio.c'; then $(CYGPATH_W) 'cd_audio.c'; else $(CYGPATH_W) '$(srcdir)/cd_audio.c'; fi`
 
 xcfa-cd_audio_extract.o: cd_audio_extract.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-cd_audio_extract.o -MD -MP -MF $(DEPDIR)/xcfa-cd_audio_extract.Tpo -c -o xcfa-cd_audio_extract.o `test -f 'cd_audio_extract.c' || echo '$(srcdir)/'`cd_audio_extract.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-cd_audio_extract.Tpo $(DEPDIR)/xcfa-cd_audio_extract.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cd_audio_extract.c' object='xcfa-cd_audio_extract.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cd_audio_extract.c' object='xcfa-cd_audio_extract.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_audio_extract.o `test -f 'cd_audio_extract.c' || echo '$(srcdir)/'`cd_audio_extract.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_audio_extract.o `test -f 'cd_audio_extract.c' || echo '$(srcdir)/'`cd_audio_extract.c
 
 xcfa-cd_audio_extract.obj: cd_audio_extract.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-cd_audio_extract.obj -MD -MP -MF $(DEPDIR)/xcfa-cd_audio_extract.Tpo -c -o xcfa-cd_audio_extract.obj `if test -f 'cd_audio_extract.c'; then $(CYGPATH_W) 'cd_audio_extract.c'; else $(CYGPATH_W) '$(srcdir)/cd_audio_extract.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-cd_audio_extract.Tpo $(DEPDIR)/xcfa-cd_audio_extract.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cd_audio_extract.c' object='xcfa-cd_audio_extract.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cd_audio_extract.c' object='xcfa-cd_audio_extract.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_audio_extract.obj `if test -f 'cd_audio_extract.c'; then $(CYGPATH_W) 'cd_audio_extract.c'; else $(CYGPATH_W) '$(srcdir)/cd_audio_extract.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_audio_extract.obj `if test -f 'cd_audio_extract.c'; then $(CYGPATH_W) 'cd_audio_extract.c'; else $(CYGPATH_W) '$(srcdir)/cd_audio_extract.c'; fi`
 
 xcfa-cd_audio_toc.o: cd_audio_toc.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-cd_audio_toc.o -MD -MP -MF $(DEPDIR)/xcfa-cd_audio_toc.Tpo -c -o xcfa-cd_audio_toc.o `test -f 'cd_audio_toc.c' || echo '$(srcdir)/'`cd_audio_toc.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-cd_audio_toc.Tpo $(DEPDIR)/xcfa-cd_audio_toc.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cd_audio_toc.c' object='xcfa-cd_audio_toc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cd_audio_toc.c' object='xcfa-cd_audio_toc.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_audio_toc.o `test -f 'cd_audio_toc.c' || echo '$(srcdir)/'`cd_audio_toc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_audio_toc.o `test -f 'cd_audio_toc.c' || echo '$(srcdir)/'`cd_audio_toc.c
 
 xcfa-cd_audio_toc.obj: cd_audio_toc.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-cd_audio_toc.obj -MD -MP -MF $(DEPDIR)/xcfa-cd_audio_toc.Tpo -c -o xcfa-cd_audio_toc.obj `if test -f 'cd_audio_toc.c'; then $(CYGPATH_W) 'cd_audio_toc.c'; else $(CYGPATH_W) '$(srcdir)/cd_audio_toc.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-cd_audio_toc.Tpo $(DEPDIR)/xcfa-cd_audio_toc.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cd_audio_toc.c' object='xcfa-cd_audio_toc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cd_audio_toc.c' object='xcfa-cd_audio_toc.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_audio_toc.obj `if test -f 'cd_audio_toc.c'; then $(CYGPATH_W) 'cd_audio_toc.c'; else $(CYGPATH_W) '$(srcdir)/cd_audio_toc.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_audio_toc.obj `if test -f 'cd_audio_toc.c'; then $(CYGPATH_W) 'cd_audio_toc.c'; else $(CYGPATH_W) '$(srcdir)/cd_audio_toc.c'; fi`
 
 xcfa-cd_cue.o: cd_cue.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-cd_cue.o -MD -MP -MF $(DEPDIR)/xcfa-cd_cue.Tpo -c -o xcfa-cd_cue.o `test -f 'cd_cue.c' || echo '$(srcdir)/'`cd_cue.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-cd_cue.Tpo $(DEPDIR)/xcfa-cd_cue.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cd_cue.c' object='xcfa-cd_cue.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cd_cue.c' object='xcfa-cd_cue.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_cue.o `test -f 'cd_cue.c' || echo '$(srcdir)/'`cd_cue.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_cue.o `test -f 'cd_cue.c' || echo '$(srcdir)/'`cd_cue.c
 
 xcfa-cd_cue.obj: cd_cue.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-cd_cue.obj -MD -MP -MF $(DEPDIR)/xcfa-cd_cue.Tpo -c -o xcfa-cd_cue.obj `if test -f 'cd_cue.c'; then $(CYGPATH_W) 'cd_cue.c'; else $(CYGPATH_W) '$(srcdir)/cd_cue.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-cd_cue.Tpo $(DEPDIR)/xcfa-cd_cue.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cd_cue.c' object='xcfa-cd_cue.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cd_cue.c' object='xcfa-cd_cue.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_cue.obj `if test -f 'cd_cue.c'; then $(CYGPATH_W) 'cd_cue.c'; else $(CYGPATH_W) '$(srcdir)/cd_cue.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_cue.obj `if test -f 'cd_cue.c'; then $(CYGPATH_W) 'cd_cue.c'; else $(CYGPATH_W) '$(srcdir)/cd_cue.c'; fi`
 
 xcfa-cd_expander.o: cd_expander.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-cd_expander.o -MD -MP -MF $(DEPDIR)/xcfa-cd_expander.Tpo -c -o xcfa-cd_expander.o `test -f 'cd_expander.c' || echo '$(srcdir)/'`cd_expander.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-cd_expander.Tpo $(DEPDIR)/xcfa-cd_expander.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cd_expander.c' object='xcfa-cd_expander.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cd_expander.c' object='xcfa-cd_expander.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_expander.o `test -f 'cd_expander.c' || echo '$(srcdir)/'`cd_expander.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_expander.o `test -f 'cd_expander.c' || echo '$(srcdir)/'`cd_expander.c
 
 xcfa-cd_expander.obj: cd_expander.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-cd_expander.obj -MD -MP -MF $(DEPDIR)/xcfa-cd_expander.Tpo -c -o xcfa-cd_expander.obj `if test -f 'cd_expander.c'; then $(CYGPATH_W) 'cd_expander.c'; else $(CYGPATH_W) '$(srcdir)/cd_expander.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-cd_expander.Tpo $(DEPDIR)/xcfa-cd_expander.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cd_expander.c' object='xcfa-cd_expander.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cd_expander.c' object='xcfa-cd_expander.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_expander.obj `if test -f 'cd_expander.c'; then $(CYGPATH_W) 'cd_expander.c'; else $(CYGPATH_W) '$(srcdir)/cd_expander.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_expander.obj `if test -f 'cd_expander.c'; then $(CYGPATH_W) 'cd_expander.c'; else $(CYGPATH_W) '$(srcdir)/cd_expander.c'; fi`
 
 xcfa-cd_normalise.o: cd_normalise.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-cd_normalise.o -MD -MP -MF $(DEPDIR)/xcfa-cd_normalise.Tpo -c -o xcfa-cd_normalise.o `test -f 'cd_normalise.c' || echo '$(srcdir)/'`cd_normalise.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-cd_normalise.Tpo $(DEPDIR)/xcfa-cd_normalise.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cd_normalise.c' object='xcfa-cd_normalise.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cd_normalise.c' object='xcfa-cd_normalise.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_normalise.o `test -f 'cd_normalise.c' || echo '$(srcdir)/'`cd_normalise.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_normalise.o `test -f 'cd_normalise.c' || echo '$(srcdir)/'`cd_normalise.c
 
 xcfa-cd_normalise.obj: cd_normalise.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-cd_normalise.obj -MD -MP -MF $(DEPDIR)/xcfa-cd_normalise.Tpo -c -o xcfa-cd_normalise.obj `if test -f 'cd_normalise.c'; then $(CYGPATH_W) 'cd_normalise.c'; else $(CYGPATH_W) '$(srcdir)/cd_normalise.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-cd_normalise.Tpo $(DEPDIR)/xcfa-cd_normalise.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cd_normalise.c' object='xcfa-cd_normalise.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cd_normalise.c' object='xcfa-cd_normalise.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_normalise.obj `if test -f 'cd_normalise.c'; then $(CYGPATH_W) 'cd_normalise.c'; else $(CYGPATH_W) '$(srcdir)/cd_normalise.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_normalise.obj `if test -f 'cd_normalise.c'; then $(CYGPATH_W) 'cd_normalise.c'; else $(CYGPATH_W) '$(srcdir)/cd_normalise.c'; fi`
 
 xcfa-cd_curl.o: cd_curl.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-cd_curl.o -MD -MP -MF $(DEPDIR)/xcfa-cd_curl.Tpo -c -o xcfa-cd_curl.o `test -f 'cd_curl.c' || echo '$(srcdir)/'`cd_curl.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-cd_curl.Tpo $(DEPDIR)/xcfa-cd_curl.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cd_curl.c' object='xcfa-cd_curl.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cd_curl.c' object='xcfa-cd_curl.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_curl.o `test -f 'cd_curl.c' || echo '$(srcdir)/'`cd_curl.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_curl.o `test -f 'cd_curl.c' || echo '$(srcdir)/'`cd_curl.c
 
 xcfa-cd_curl.obj: cd_curl.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-cd_curl.obj -MD -MP -MF $(DEPDIR)/xcfa-cd_curl.Tpo -c -o xcfa-cd_curl.obj `if test -f 'cd_curl.c'; then $(CYGPATH_W) 'cd_curl.c'; else $(CYGPATH_W) '$(srcdir)/cd_curl.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-cd_curl.Tpo $(DEPDIR)/xcfa-cd_curl.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cd_curl.c' object='xcfa-cd_curl.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cd_curl.c' object='xcfa-cd_curl.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_curl.obj `if test -f 'cd_curl.c'; then $(CYGPATH_W) 'cd_curl.c'; else $(CYGPATH_W) '$(srcdir)/cd_curl.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cd_curl.obj `if test -f 'cd_curl.c'; then $(CYGPATH_W) 'cd_curl.c'; else $(CYGPATH_W) '$(srcdir)/cd_curl.c'; fi`
 
 xcfa-configuser.o: configuser.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-configuser.o -MD -MP -MF $(DEPDIR)/xcfa-configuser.Tpo -c -o xcfa-configuser.o `test -f 'configuser.c' || echo '$(srcdir)/'`configuser.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-configuser.Tpo $(DEPDIR)/xcfa-configuser.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='configuser.c' object='xcfa-configuser.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='configuser.c' object='xcfa-configuser.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-configuser.o `test -f 'configuser.c' || echo '$(srcdir)/'`configuser.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-configuser.o `test -f 'configuser.c' || echo '$(srcdir)/'`configuser.c
 
 xcfa-configuser.obj: configuser.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-configuser.obj -MD -MP -MF $(DEPDIR)/xcfa-configuser.Tpo -c -o xcfa-configuser.obj `if test -f 'configuser.c'; then $(CYGPATH_W) 'configuser.c'; else $(CYGPATH_W) '$(srcdir)/configuser.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-configuser.Tpo $(DEPDIR)/xcfa-configuser.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='configuser.c' object='xcfa-configuser.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='configuser.c' object='xcfa-configuser.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-configuser.obj `if test -f 'configuser.c'; then $(CYGPATH_W) 'configuser.c'; else $(CYGPATH_W) '$(srcdir)/configuser.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-configuser.obj `if test -f 'configuser.c'; then $(CYGPATH_W) 'configuser.c'; else $(CYGPATH_W) '$(srcdir)/configuser.c'; fi`
 
 xcfa-conv.o: conv.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-conv.o -MD -MP -MF $(DEPDIR)/xcfa-conv.Tpo -c -o xcfa-conv.o `test -f 'conv.c' || echo '$(srcdir)/'`conv.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-conv.Tpo $(DEPDIR)/xcfa-conv.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='conv.c' object='xcfa-conv.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='conv.c' object='xcfa-conv.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-conv.o `test -f 'conv.c' || echo '$(srcdir)/'`conv.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-conv.o `test -f 'conv.c' || echo '$(srcdir)/'`conv.c
 
 xcfa-conv.obj: conv.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-conv.obj -MD -MP -MF $(DEPDIR)/xcfa-conv.Tpo -c -o xcfa-conv.obj `if test -f 'conv.c'; then $(CYGPATH_W) 'conv.c'; else $(CYGPATH_W) '$(srcdir)/conv.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-conv.Tpo $(DEPDIR)/xcfa-conv.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='conv.c' object='xcfa-conv.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='conv.c' object='xcfa-conv.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-conv.obj `if test -f 'conv.c'; then $(CYGPATH_W) 'conv.c'; else $(CYGPATH_W) '$(srcdir)/conv.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-conv.obj `if test -f 'conv.c'; then $(CYGPATH_W) 'conv.c'; else $(CYGPATH_W) '$(srcdir)/conv.c'; fi`
 
 xcfa-cursor.o: cursor.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-cursor.o -MD -MP -MF $(DEPDIR)/xcfa-cursor.Tpo -c -o xcfa-cursor.o `test -f 'cursor.c' || echo '$(srcdir)/'`cursor.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-cursor.Tpo $(DEPDIR)/xcfa-cursor.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cursor.c' object='xcfa-cursor.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cursor.c' object='xcfa-cursor.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cursor.o `test -f 'cursor.c' || echo '$(srcdir)/'`cursor.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cursor.o `test -f 'cursor.c' || echo '$(srcdir)/'`cursor.c
 
 xcfa-cursor.obj: cursor.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-cursor.obj -MD -MP -MF $(DEPDIR)/xcfa-cursor.Tpo -c -o xcfa-cursor.obj `if test -f 'cursor.c'; then $(CYGPATH_W) 'cursor.c'; else $(CYGPATH_W) '$(srcdir)/cursor.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-cursor.Tpo $(DEPDIR)/xcfa-cursor.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cursor.c' object='xcfa-cursor.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cursor.c' object='xcfa-cursor.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cursor.obj `if test -f 'cursor.c'; then $(CYGPATH_W) 'cursor.c'; else $(CYGPATH_W) '$(srcdir)/cursor.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-cursor.obj `if test -f 'cursor.c'; then $(CYGPATH_W) 'cursor.c'; else $(CYGPATH_W) '$(srcdir)/cursor.c'; fi`
 
 xcfa-dvd.o: dvd.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-dvd.o -MD -MP -MF $(DEPDIR)/xcfa-dvd.Tpo -c -o xcfa-dvd.o `test -f 'dvd.c' || echo '$(srcdir)/'`dvd.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-dvd.Tpo $(DEPDIR)/xcfa-dvd.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dvd.c' object='xcfa-dvd.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dvd.c' object='xcfa-dvd.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-dvd.o `test -f 'dvd.c' || echo '$(srcdir)/'`dvd.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-dvd.o `test -f 'dvd.c' || echo '$(srcdir)/'`dvd.c
 
 xcfa-dvd.obj: dvd.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-dvd.obj -MD -MP -MF $(DEPDIR)/xcfa-dvd.Tpo -c -o xcfa-dvd.obj `if test -f 'dvd.c'; then $(CYGPATH_W) 'dvd.c'; else $(CYGPATH_W) '$(srcdir)/dvd.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-dvd.Tpo $(DEPDIR)/xcfa-dvd.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dvd.c' object='xcfa-dvd.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dvd.c' object='xcfa-dvd.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-dvd.obj `if test -f 'dvd.c'; then $(CYGPATH_W) 'dvd.c'; else $(CYGPATH_W) '$(srcdir)/dvd.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-dvd.obj `if test -f 'dvd.c'; then $(CYGPATH_W) 'dvd.c'; else $(CYGPATH_W) '$(srcdir)/dvd.c'; fi`
 
 xcfa-dvd_table.o: dvd_table.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-dvd_table.o -MD -MP -MF $(DEPDIR)/xcfa-dvd_table.Tpo -c -o xcfa-dvd_table.o `test -f 'dvd_table.c' || echo '$(srcdir)/'`dvd_table.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-dvd_table.Tpo $(DEPDIR)/xcfa-dvd_table.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dvd_table.c' object='xcfa-dvd_table.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dvd_table.c' object='xcfa-dvd_table.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-dvd_table.o `test -f 'dvd_table.c' || echo '$(srcdir)/'`dvd_table.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-dvd_table.o `test -f 'dvd_table.c' || echo '$(srcdir)/'`dvd_table.c
 
 xcfa-dvd_table.obj: dvd_table.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-dvd_table.obj -MD -MP -MF $(DEPDIR)/xcfa-dvd_table.Tpo -c -o xcfa-dvd_table.obj `if test -f 'dvd_table.c'; then $(CYGPATH_W) 'dvd_table.c'; else $(CYGPATH_W) '$(srcdir)/dvd_table.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-dvd_table.Tpo $(DEPDIR)/xcfa-dvd_table.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dvd_table.c' object='xcfa-dvd_table.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dvd_table.c' object='xcfa-dvd_table.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-dvd_table.obj `if test -f 'dvd_table.c'; then $(CYGPATH_W) 'dvd_table.c'; else $(CYGPATH_W) '$(srcdir)/dvd_table.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-dvd_table.obj `if test -f 'dvd_table.c'; then $(CYGPATH_W) 'dvd_table.c'; else $(CYGPATH_W) '$(srcdir)/dvd_table.c'; fi`
 
 xcfa-dvd_read.o: dvd_read.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-dvd_read.o -MD -MP -MF $(DEPDIR)/xcfa-dvd_read.Tpo -c -o xcfa-dvd_read.o `test -f 'dvd_read.c' || echo '$(srcdir)/'`dvd_read.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-dvd_read.Tpo $(DEPDIR)/xcfa-dvd_read.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dvd_read.c' object='xcfa-dvd_read.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dvd_read.c' object='xcfa-dvd_read.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-dvd_read.o `test -f 'dvd_read.c' || echo '$(srcdir)/'`dvd_read.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-dvd_read.o `test -f 'dvd_read.c' || echo '$(srcdir)/'`dvd_read.c
 
 xcfa-dvd_read.obj: dvd_read.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-dvd_read.obj -MD -MP -MF $(DEPDIR)/xcfa-dvd_read.Tpo -c -o xcfa-dvd_read.obj `if test -f 'dvd_read.c'; then $(CYGPATH_W) 'dvd_read.c'; else $(CYGPATH_W) '$(srcdir)/dvd_read.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-dvd_read.Tpo $(DEPDIR)/xcfa-dvd_read.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dvd_read.c' object='xcfa-dvd_read.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dvd_read.c' object='xcfa-dvd_read.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-dvd_read.obj `if test -f 'dvd_read.c'; then $(CYGPATH_W) 'dvd_read.c'; else $(CYGPATH_W) '$(srcdir)/dvd_read.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-dvd_read.obj `if test -f 'dvd_read.c'; then $(CYGPATH_W) 'dvd_read.c'; else $(CYGPATH_W) '$(srcdir)/dvd_read.c'; fi`
 
 xcfa-dvd_extract.o: dvd_extract.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-dvd_extract.o -MD -MP -MF $(DEPDIR)/xcfa-dvd_extract.Tpo -c -o xcfa-dvd_extract.o `test -f 'dvd_extract.c' || echo '$(srcdir)/'`dvd_extract.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-dvd_extract.Tpo $(DEPDIR)/xcfa-dvd_extract.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dvd_extract.c' object='xcfa-dvd_extract.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dvd_extract.c' object='xcfa-dvd_extract.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-dvd_extract.o `test -f 'dvd_extract.c' || echo '$(srcdir)/'`dvd_extract.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-dvd_extract.o `test -f 'dvd_extract.c' || echo '$(srcdir)/'`dvd_extract.c
 
 xcfa-dvd_extract.obj: dvd_extract.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-dvd_extract.obj -MD -MP -MF $(DEPDIR)/xcfa-dvd_extract.Tpo -c -o xcfa-dvd_extract.obj `if test -f 'dvd_extract.c'; then $(CYGPATH_W) 'dvd_extract.c'; else $(CYGPATH_W) '$(srcdir)/dvd_extract.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-dvd_extract.Tpo $(DEPDIR)/xcfa-dvd_extract.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dvd_extract.c' object='xcfa-dvd_extract.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dvd_extract.c' object='xcfa-dvd_extract.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-dvd_extract.obj `if test -f 'dvd_extract.c'; then $(CYGPATH_W) 'dvd_extract.c'; else $(CYGPATH_W) '$(srcdir)/dvd_extract.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-dvd_extract.obj `if test -f 'dvd_extract.c'; then $(CYGPATH_W) 'dvd_extract.c'; else $(CYGPATH_W) '$(srcdir)/dvd_extract.c'; fi`
 
 xcfa-dragNdrop.o: dragNdrop.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-dragNdrop.o -MD -MP -MF $(DEPDIR)/xcfa-dragNdrop.Tpo -c -o xcfa-dragNdrop.o `test -f 'dragNdrop.c' || echo '$(srcdir)/'`dragNdrop.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-dragNdrop.Tpo $(DEPDIR)/xcfa-dragNdrop.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dragNdrop.c' object='xcfa-dragNdrop.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dragNdrop.c' object='xcfa-dragNdrop.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-dragNdrop.o `test -f 'dragNdrop.c' || echo '$(srcdir)/'`dragNdrop.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-dragNdrop.o `test -f 'dragNdrop.c' || echo '$(srcdir)/'`dragNdrop.c
 
 xcfa-dragNdrop.obj: dragNdrop.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-dragNdrop.obj -MD -MP -MF $(DEPDIR)/xcfa-dragNdrop.Tpo -c -o xcfa-dragNdrop.obj `if test -f 'dragNdrop.c'; then $(CYGPATH_W) 'dragNdrop.c'; else $(CYGPATH_W) '$(srcdir)/dragNdrop.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-dragNdrop.Tpo $(DEPDIR)/xcfa-dragNdrop.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dragNdrop.c' object='xcfa-dragNdrop.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dragNdrop.c' object='xcfa-dragNdrop.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-dragNdrop.obj `if test -f 'dragNdrop.c'; then $(CYGPATH_W) 'dragNdrop.c'; else $(CYGPATH_W) '$(srcdir)/dragNdrop.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-dragNdrop.obj `if test -f 'dragNdrop.c'; then $(CYGPATH_W) 'dragNdrop.c'; else $(CYGPATH_W) '$(srcdir)/dragNdrop.c'; fi`
 
 xcfa-extra.o: extra.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-extra.o -MD -MP -MF $(DEPDIR)/xcfa-extra.Tpo -c -o xcfa-extra.o `test -f 'extra.c' || echo '$(srcdir)/'`extra.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-extra.Tpo $(DEPDIR)/xcfa-extra.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='extra.c' object='xcfa-extra.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='extra.c' object='xcfa-extra.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-extra.o `test -f 'extra.c' || echo '$(srcdir)/'`extra.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-extra.o `test -f 'extra.c' || echo '$(srcdir)/'`extra.c
 
 xcfa-extra.obj: extra.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-extra.obj -MD -MP -MF $(DEPDIR)/xcfa-extra.Tpo -c -o xcfa-extra.obj `if test -f 'extra.c'; then $(CYGPATH_W) 'extra.c'; else $(CYGPATH_W) '$(srcdir)/extra.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-extra.Tpo $(DEPDIR)/xcfa-extra.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='extra.c' object='xcfa-extra.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='extra.c' object='xcfa-extra.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-extra.obj `if test -f 'extra.c'; then $(CYGPATH_W) 'extra.c'; else $(CYGPATH_W) '$(srcdir)/extra.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-extra.obj `if test -f 'extra.c'; then $(CYGPATH_W) 'extra.c'; else $(CYGPATH_W) '$(srcdir)/extra.c'; fi`
 
 xcfa-file.o: file.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-file.o -MD -MP -MF $(DEPDIR)/xcfa-file.Tpo -c -o xcfa-file.o `test -f 'file.c' || echo '$(srcdir)/'`file.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-file.Tpo $(DEPDIR)/xcfa-file.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file.c' object='xcfa-file.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file.c' object='xcfa-file.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file.o `test -f 'file.c' || echo '$(srcdir)/'`file.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file.o `test -f 'file.c' || echo '$(srcdir)/'`file.c
 
 xcfa-file.obj: file.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-file.obj -MD -MP -MF $(DEPDIR)/xcfa-file.Tpo -c -o xcfa-file.obj `if test -f 'file.c'; then $(CYGPATH_W) 'file.c'; else $(CYGPATH_W) '$(srcdir)/file.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-file.Tpo $(DEPDIR)/xcfa-file.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file.c' object='xcfa-file.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file.c' object='xcfa-file.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file.obj `if test -f 'file.c'; then $(CYGPATH_W) 'file.c'; else $(CYGPATH_W) '$(srcdir)/file.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file.obj `if test -f 'file.c'; then $(CYGPATH_W) 'file.c'; else $(CYGPATH_W) '$(srcdir)/file.c'; fi`
 
 xcfa-file_analyze.o: file_analyze.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-file_analyze.o -MD -MP -MF $(DEPDIR)/xcfa-file_analyze.Tpo -c -o xcfa-file_analyze.o `test -f 'file_analyze.c' || echo '$(srcdir)/'`file_analyze.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-file_analyze.Tpo $(DEPDIR)/xcfa-file_analyze.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file_analyze.c' object='xcfa-file_analyze.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file_analyze.c' object='xcfa-file_analyze.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_analyze.o `test -f 'file_analyze.c' || echo '$(srcdir)/'`file_analyze.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_analyze.o `test -f 'file_analyze.c' || echo '$(srcdir)/'`file_analyze.c
 
 xcfa-file_analyze.obj: file_analyze.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-file_analyze.obj -MD -MP -MF $(DEPDIR)/xcfa-file_analyze.Tpo -c -o xcfa-file_analyze.obj `if test -f 'file_analyze.c'; then $(CYGPATH_W) 'file_analyze.c'; else $(CYGPATH_W) '$(srcdir)/file_analyze.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-file_analyze.Tpo $(DEPDIR)/xcfa-file_analyze.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file_analyze.c' object='xcfa-file_analyze.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file_analyze.c' object='xcfa-file_analyze.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_analyze.obj `if test -f 'file_analyze.c'; then $(CYGPATH_W) 'file_analyze.c'; else $(CYGPATH_W) '$(srcdir)/file_analyze.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_analyze.obj `if test -f 'file_analyze.c'; then $(CYGPATH_W) 'file_analyze.c'; else $(CYGPATH_W) '$(srcdir)/file_analyze.c'; fi`
 
 xcfa-file_wav.o: file_wav.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-file_wav.o -MD -MP -MF $(DEPDIR)/xcfa-file_wav.Tpo -c -o xcfa-file_wav.o `test -f 'file_wav.c' || echo '$(srcdir)/'`file_wav.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-file_wav.Tpo $(DEPDIR)/xcfa-file_wav.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file_wav.c' object='xcfa-file_wav.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file_wav.c' object='xcfa-file_wav.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_wav.o `test -f 'file_wav.c' || echo '$(srcdir)/'`file_wav.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_wav.o `test -f 'file_wav.c' || echo '$(srcdir)/'`file_wav.c
 
 xcfa-file_wav.obj: file_wav.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-file_wav.obj -MD -MP -MF $(DEPDIR)/xcfa-file_wav.Tpo -c -o xcfa-file_wav.obj `if test -f 'file_wav.c'; then $(CYGPATH_W) 'file_wav.c'; else $(CYGPATH_W) '$(srcdir)/file_wav.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-file_wav.Tpo $(DEPDIR)/xcfa-file_wav.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file_wav.c' object='xcfa-file_wav.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file_wav.c' object='xcfa-file_wav.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_wav.obj `if test -f 'file_wav.c'; then $(CYGPATH_W) 'file_wav.c'; else $(CYGPATH_W) '$(srcdir)/file_wav.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_wav.obj `if test -f 'file_wav.c'; then $(CYGPATH_W) 'file_wav.c'; else $(CYGPATH_W) '$(srcdir)/file_wav.c'; fi`
 
 xcfa-file_mp3ogg.o: file_mp3ogg.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-file_mp3ogg.o -MD -MP -MF $(DEPDIR)/xcfa-file_mp3ogg.Tpo -c -o xcfa-file_mp3ogg.o `test -f 'file_mp3ogg.c' || echo '$(srcdir)/'`file_mp3ogg.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-file_mp3ogg.Tpo $(DEPDIR)/xcfa-file_mp3ogg.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file_mp3ogg.c' object='xcfa-file_mp3ogg.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file_mp3ogg.c' object='xcfa-file_mp3ogg.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_mp3ogg.o `test -f 'file_mp3ogg.c' || echo '$(srcdir)/'`file_mp3ogg.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_mp3ogg.o `test -f 'file_mp3ogg.c' || echo '$(srcdir)/'`file_mp3ogg.c
 
 xcfa-file_mp3ogg.obj: file_mp3ogg.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-file_mp3ogg.obj -MD -MP -MF $(DEPDIR)/xcfa-file_mp3ogg.Tpo -c -o xcfa-file_mp3ogg.obj `if test -f 'file_mp3ogg.c'; then $(CYGPATH_W) 'file_mp3ogg.c'; else $(CYGPATH_W) '$(srcdir)/file_mp3ogg.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-file_mp3ogg.Tpo $(DEPDIR)/xcfa-file_mp3ogg.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file_mp3ogg.c' object='xcfa-file_mp3ogg.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file_mp3ogg.c' object='xcfa-file_mp3ogg.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_mp3ogg.obj `if test -f 'file_mp3ogg.c'; then $(CYGPATH_W) 'file_mp3ogg.c'; else $(CYGPATH_W) '$(srcdir)/file_mp3ogg.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_mp3ogg.obj `if test -f 'file_mp3ogg.c'; then $(CYGPATH_W) 'file_mp3ogg.c'; else $(CYGPATH_W) '$(srcdir)/file_mp3ogg.c'; fi`
 
 xcfa-file_tags.o: file_tags.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-file_tags.o -MD -MP -MF $(DEPDIR)/xcfa-file_tags.Tpo -c -o xcfa-file_tags.o `test -f 'file_tags.c' || echo '$(srcdir)/'`file_tags.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-file_tags.Tpo $(DEPDIR)/xcfa-file_tags.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file_tags.c' object='xcfa-file_tags.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file_tags.c' object='xcfa-file_tags.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_tags.o `test -f 'file_tags.c' || echo '$(srcdir)/'`file_tags.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_tags.o `test -f 'file_tags.c' || echo '$(srcdir)/'`file_tags.c
 
 xcfa-file_tags.obj: file_tags.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-file_tags.obj -MD -MP -MF $(DEPDIR)/xcfa-file_tags.Tpo -c -o xcfa-file_tags.obj `if test -f 'file_tags.c'; then $(CYGPATH_W) 'file_tags.c'; else $(CYGPATH_W) '$(srcdir)/file_tags.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-file_tags.Tpo $(DEPDIR)/xcfa-file_tags.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file_tags.c' object='xcfa-file_tags.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file_tags.c' object='xcfa-file_tags.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_tags.obj `if test -f 'file_tags.c'; then $(CYGPATH_W) 'file_tags.c'; else $(CYGPATH_W) '$(srcdir)/file_tags.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_tags.obj `if test -f 'file_tags.c'; then $(CYGPATH_W) 'file_tags.c'; else $(CYGPATH_W) '$(srcdir)/file_tags.c'; fi`
 
 xcfa-file_scan_db.o: file_scan_db.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-file_scan_db.o -MD -MP -MF $(DEPDIR)/xcfa-file_scan_db.Tpo -c -o xcfa-file_scan_db.o `test -f 'file_scan_db.c' || echo '$(srcdir)/'`file_scan_db.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-file_scan_db.Tpo $(DEPDIR)/xcfa-file_scan_db.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file_scan_db.c' object='xcfa-file_scan_db.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file_scan_db.c' object='xcfa-file_scan_db.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_scan_db.o `test -f 'file_scan_db.c' || echo '$(srcdir)/'`file_scan_db.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_scan_db.o `test -f 'file_scan_db.c' || echo '$(srcdir)/'`file_scan_db.c
 
 xcfa-file_scan_db.obj: file_scan_db.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-file_scan_db.obj -MD -MP -MF $(DEPDIR)/xcfa-file_scan_db.Tpo -c -o xcfa-file_scan_db.obj `if test -f 'file_scan_db.c'; then $(CYGPATH_W) 'file_scan_db.c'; else $(CYGPATH_W) '$(srcdir)/file_scan_db.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-file_scan_db.Tpo $(DEPDIR)/xcfa-file_scan_db.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file_scan_db.c' object='xcfa-file_scan_db.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file_scan_db.c' object='xcfa-file_scan_db.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_scan_db.obj `if test -f 'file_scan_db.c'; then $(CYGPATH_W) 'file_scan_db.c'; else $(CYGPATH_W) '$(srcdir)/file_scan_db.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_scan_db.obj `if test -f 'file_scan_db.c'; then $(CYGPATH_W) 'file_scan_db.c'; else $(CYGPATH_W) '$(srcdir)/file_scan_db.c'; fi`
 
 xcfa-file_action.o: file_action.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-file_action.o -MD -MP -MF $(DEPDIR)/xcfa-file_action.Tpo -c -o xcfa-file_action.o `test -f 'file_action.c' || echo '$(srcdir)/'`file_action.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-file_action.Tpo $(DEPDIR)/xcfa-file_action.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file_action.c' object='xcfa-file_action.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file_action.c' object='xcfa-file_action.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_action.o `test -f 'file_action.c' || echo '$(srcdir)/'`file_action.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_action.o `test -f 'file_action.c' || echo '$(srcdir)/'`file_action.c
 
 xcfa-file_action.obj: file_action.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-file_action.obj -MD -MP -MF $(DEPDIR)/xcfa-file_action.Tpo -c -o xcfa-file_action.obj `if test -f 'file_action.c'; then $(CYGPATH_W) 'file_action.c'; else $(CYGPATH_W) '$(srcdir)/file_action.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-file_action.Tpo $(DEPDIR)/xcfa-file_action.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file_action.c' object='xcfa-file_action.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file_action.c' object='xcfa-file_action.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_action.obj `if test -f 'file_action.c'; then $(CYGPATH_W) 'file_action.c'; else $(CYGPATH_W) '$(srcdir)/file_action.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_action.obj `if test -f 'file_action.c'; then $(CYGPATH_W) 'file_action.c'; else $(CYGPATH_W) '$(srcdir)/file_action.c'; fi`
 
 xcfa-file_lc.o: file_lc.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-file_lc.o -MD -MP -MF $(DEPDIR)/xcfa-file_lc.Tpo -c -o xcfa-file_lc.o `test -f 'file_lc.c' || echo '$(srcdir)/'`file_lc.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-file_lc.Tpo $(DEPDIR)/xcfa-file_lc.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file_lc.c' object='xcfa-file_lc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file_lc.c' object='xcfa-file_lc.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_lc.o `test -f 'file_lc.c' || echo '$(srcdir)/'`file_lc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_lc.o `test -f 'file_lc.c' || echo '$(srcdir)/'`file_lc.c
 
 xcfa-file_lc.obj: file_lc.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-file_lc.obj -MD -MP -MF $(DEPDIR)/xcfa-file_lc.Tpo -c -o xcfa-file_lc.obj `if test -f 'file_lc.c'; then $(CYGPATH_W) 'file_lc.c'; else $(CYGPATH_W) '$(srcdir)/file_lc.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-file_lc.Tpo $(DEPDIR)/xcfa-file_lc.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file_lc.c' object='xcfa-file_lc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file_lc.c' object='xcfa-file_lc.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_lc.obj `if test -f 'file_lc.c'; then $(CYGPATH_W) 'file_lc.c'; else $(CYGPATH_W) '$(srcdir)/file_lc.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_lc.obj `if test -f 'file_lc.c'; then $(CYGPATH_W) 'file_lc.c'; else $(CYGPATH_W) '$(srcdir)/file_lc.c'; fi`
 
 xcfa-file_conv.o: file_conv.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-file_conv.o -MD -MP -MF $(DEPDIR)/xcfa-file_conv.Tpo -c -o xcfa-file_conv.o `test -f 'file_conv.c' || echo '$(srcdir)/'`file_conv.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-file_conv.Tpo $(DEPDIR)/xcfa-file_conv.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file_conv.c' object='xcfa-file_conv.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file_conv.c' object='xcfa-file_conv.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_conv.o `test -f 'file_conv.c' || echo '$(srcdir)/'`file_conv.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_conv.o `test -f 'file_conv.c' || echo '$(srcdir)/'`file_conv.c
 
 xcfa-file_conv.obj: file_conv.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-file_conv.obj -MD -MP -MF $(DEPDIR)/xcfa-file_conv.Tpo -c -o xcfa-file_conv.obj `if test -f 'file_conv.c'; then $(CYGPATH_W) 'file_conv.c'; else $(CYGPATH_W) '$(srcdir)/file_conv.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-file_conv.Tpo $(DEPDIR)/xcfa-file_conv.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file_conv.c' object='xcfa-file_conv.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file_conv.c' object='xcfa-file_conv.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_conv.obj `if test -f 'file_conv.c'; then $(CYGPATH_W) 'file_conv.c'; else $(CYGPATH_W) '$(srcdir)/file_conv.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_conv.obj `if test -f 'file_conv.c'; then $(CYGPATH_W) 'file_conv.c'; else $(CYGPATH_W) '$(srcdir)/file_conv.c'; fi`
 
 xcfa-file_wav_conv.o: file_wav_conv.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-file_wav_conv.o -MD -MP -MF $(DEPDIR)/xcfa-file_wav_conv.Tpo -c -o xcfa-file_wav_conv.o `test -f 'file_wav_conv.c' || echo '$(srcdir)/'`file_wav_conv.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-file_wav_conv.Tpo $(DEPDIR)/xcfa-file_wav_conv.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file_wav_conv.c' object='xcfa-file_wav_conv.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file_wav_conv.c' object='xcfa-file_wav_conv.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_wav_conv.o `test -f 'file_wav_conv.c' || echo '$(srcdir)/'`file_wav_conv.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_wav_conv.o `test -f 'file_wav_conv.c' || echo '$(srcdir)/'`file_wav_conv.c
 
 xcfa-file_wav_conv.obj: file_wav_conv.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-file_wav_conv.obj -MD -MP -MF $(DEPDIR)/xcfa-file_wav_conv.Tpo -c -o xcfa-file_wav_conv.obj `if test -f 'file_wav_conv.c'; then $(CYGPATH_W) 'file_wav_conv.c'; else $(CYGPATH_W) '$(srcdir)/file_wav_conv.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-file_wav_conv.Tpo $(DEPDIR)/xcfa-file_wav_conv.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file_wav_conv.c' object='xcfa-file_wav_conv.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file_wav_conv.c' object='xcfa-file_wav_conv.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_wav_conv.obj `if test -f 'file_wav_conv.c'; then $(CYGPATH_W) 'file_wav_conv.c'; else $(CYGPATH_W) '$(srcdir)/file_wav_conv.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_wav_conv.obj `if test -f 'file_wav_conv.c'; then $(CYGPATH_W) 'file_wav_conv.c'; else $(CYGPATH_W) '$(srcdir)/file_wav_conv.c'; fi`
 
 xcfa-file_mp3ogg_conv.o: file_mp3ogg_conv.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-file_mp3ogg_conv.o -MD -MP -MF $(DEPDIR)/xcfa-file_mp3ogg_conv.Tpo -c -o xcfa-file_mp3ogg_conv.o `test -f 'file_mp3ogg_conv.c' || echo '$(srcdir)/'`file_mp3ogg_conv.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-file_mp3ogg_conv.Tpo $(DEPDIR)/xcfa-file_mp3ogg_conv.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file_mp3ogg_conv.c' object='xcfa-file_mp3ogg_conv.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file_mp3ogg_conv.c' object='xcfa-file_mp3ogg_conv.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_mp3ogg_conv.o `test -f 'file_mp3ogg_conv.c' || echo '$(srcdir)/'`file_mp3ogg_conv.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_mp3ogg_conv.o `test -f 'file_mp3ogg_conv.c' || echo '$(srcdir)/'`file_mp3ogg_conv.c
 
 xcfa-file_mp3ogg_conv.obj: file_mp3ogg_conv.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-file_mp3ogg_conv.obj -MD -MP -MF $(DEPDIR)/xcfa-file_mp3ogg_conv.Tpo -c -o xcfa-file_mp3ogg_conv.obj `if test -f 'file_mp3ogg_conv.c'; then $(CYGPATH_W) 'file_mp3ogg_conv.c'; else $(CYGPATH_W) '$(srcdir)/file_mp3ogg_conv.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-file_mp3ogg_conv.Tpo $(DEPDIR)/xcfa-file_mp3ogg_conv.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file_mp3ogg_conv.c' object='xcfa-file_mp3ogg_conv.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file_mp3ogg_conv.c' object='xcfa-file_mp3ogg_conv.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_mp3ogg_conv.obj `if test -f 'file_mp3ogg_conv.c'; then $(CYGPATH_W) 'file_mp3ogg_conv.c'; else $(CYGPATH_W) '$(srcdir)/file_mp3ogg_conv.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_mp3ogg_conv.obj `if test -f 'file_mp3ogg_conv.c'; then $(CYGPATH_W) 'file_mp3ogg_conv.c'; else $(CYGPATH_W) '$(srcdir)/file_mp3ogg_conv.c'; fi`
 
 xcfa-file_trash.o: file_trash.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-file_trash.o -MD -MP -MF $(DEPDIR)/xcfa-file_trash.Tpo -c -o xcfa-file_trash.o `test -f 'file_trash.c' || echo '$(srcdir)/'`file_trash.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-file_trash.Tpo $(DEPDIR)/xcfa-file_trash.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file_trash.c' object='xcfa-file_trash.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file_trash.c' object='xcfa-file_trash.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_trash.o `test -f 'file_trash.c' || echo '$(srcdir)/'`file_trash.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_trash.o `test -f 'file_trash.c' || echo '$(srcdir)/'`file_trash.c
 
 xcfa-file_trash.obj: file_trash.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-file_trash.obj -MD -MP -MF $(DEPDIR)/xcfa-file_trash.Tpo -c -o xcfa-file_trash.obj `if test -f 'file_trash.c'; then $(CYGPATH_W) 'file_trash.c'; else $(CYGPATH_W) '$(srcdir)/file_trash.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-file_trash.Tpo $(DEPDIR)/xcfa-file_trash.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file_trash.c' object='xcfa-file_trash.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file_trash.c' object='xcfa-file_trash.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_trash.obj `if test -f 'file_trash.c'; then $(CYGPATH_W) 'file_trash.c'; else $(CYGPATH_W) '$(srcdir)/file_trash.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-file_trash.obj `if test -f 'file_trash.c'; then $(CYGPATH_W) 'file_trash.c'; else $(CYGPATH_W) '$(srcdir)/file_trash.c'; fi`
 
 xcfa-fileselect.o: fileselect.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-fileselect.o -MD -MP -MF $(DEPDIR)/xcfa-fileselect.Tpo -c -o xcfa-fileselect.o `test -f 'fileselect.c' || echo '$(srcdir)/'`fileselect.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-fileselect.Tpo $(DEPDIR)/xcfa-fileselect.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fileselect.c' object='xcfa-fileselect.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fileselect.c' object='xcfa-fileselect.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-fileselect.o `test -f 'fileselect.c' || echo '$(srcdir)/'`fileselect.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-fileselect.o `test -f 'fileselect.c' || echo '$(srcdir)/'`fileselect.c
 
 xcfa-fileselect.obj: fileselect.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-fileselect.obj -MD -MP -MF $(DEPDIR)/xcfa-fileselect.Tpo -c -o xcfa-fileselect.obj `if test -f 'fileselect.c'; then $(CYGPATH_W) 'fileselect.c'; else $(CYGPATH_W) '$(srcdir)/fileselect.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-fileselect.Tpo $(DEPDIR)/xcfa-fileselect.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fileselect.c' object='xcfa-fileselect.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fileselect.c' object='xcfa-fileselect.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-fileselect.obj `if test -f 'fileselect.c'; then $(CYGPATH_W) 'fileselect.c'; else $(CYGPATH_W) '$(srcdir)/fileselect.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-fileselect.obj `if test -f 'fileselect.c'; then $(CYGPATH_W) 'fileselect.c'; else $(CYGPATH_W) '$(srcdir)/fileselect.c'; fi`
 
 xcfa-get_info.o: get_info.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-get_info.o -MD -MP -MF $(DEPDIR)/xcfa-get_info.Tpo -c -o xcfa-get_info.o `test -f 'get_info.c' || echo '$(srcdir)/'`get_info.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-get_info.Tpo $(DEPDIR)/xcfa-get_info.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='get_info.c' object='xcfa-get_info.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='get_info.c' object='xcfa-get_info.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-get_info.o `test -f 'get_info.c' || echo '$(srcdir)/'`get_info.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-get_info.o `test -f 'get_info.c' || echo '$(srcdir)/'`get_info.c
 
 xcfa-get_info.obj: get_info.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-get_info.obj -MD -MP -MF $(DEPDIR)/xcfa-get_info.Tpo -c -o xcfa-get_info.obj `if test -f 'get_info.c'; then $(CYGPATH_W) 'get_info.c'; else $(CYGPATH_W) '$(srcdir)/get_info.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-get_info.Tpo $(DEPDIR)/xcfa-get_info.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='get_info.c' object='xcfa-get_info.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='get_info.c' object='xcfa-get_info.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-get_info.obj `if test -f 'get_info.c'; then $(CYGPATH_W) 'get_info.c'; else $(CYGPATH_W) '$(srcdir)/get_info.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-get_info.obj `if test -f 'get_info.c'; then $(CYGPATH_W) 'get_info.c'; else $(CYGPATH_W) '$(srcdir)/get_info.c'; fi`
 
 xcfa-mplayer.o: mplayer.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-mplayer.o -MD -MP -MF $(DEPDIR)/xcfa-mplayer.Tpo -c -o xcfa-mplayer.o `test -f 'mplayer.c' || echo '$(srcdir)/'`mplayer.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-mplayer.Tpo $(DEPDIR)/xcfa-mplayer.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mplayer.c' object='xcfa-mplayer.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mplayer.c' object='xcfa-mplayer.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-mplayer.o `test -f 'mplayer.c' || echo '$(srcdir)/'`mplayer.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-mplayer.o `test -f 'mplayer.c' || echo '$(srcdir)/'`mplayer.c
 
 xcfa-mplayer.obj: mplayer.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-mplayer.obj -MD -MP -MF $(DEPDIR)/xcfa-mplayer.Tpo -c -o xcfa-mplayer.obj `if test -f 'mplayer.c'; then $(CYGPATH_W) 'mplayer.c'; else $(CYGPATH_W) '$(srcdir)/mplayer.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-mplayer.Tpo $(DEPDIR)/xcfa-mplayer.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mplayer.c' object='xcfa-mplayer.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mplayer.c' object='xcfa-mplayer.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-mplayer.obj `if test -f 'mplayer.c'; then $(CYGPATH_W) 'mplayer.c'; else $(CYGPATH_W) '$(srcdir)/mplayer.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-mplayer.obj `if test -f 'mplayer.c'; then $(CYGPATH_W) 'mplayer.c'; else $(CYGPATH_W) '$(srcdir)/mplayer.c'; fi`
 
 xcfa-normalise.o: normalise.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-normalise.o -MD -MP -MF $(DEPDIR)/xcfa-normalise.Tpo -c -o xcfa-normalise.o `test -f 'normalise.c' || echo '$(srcdir)/'`normalise.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-normalise.Tpo $(DEPDIR)/xcfa-normalise.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='normalise.c' object='xcfa-normalise.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='normalise.c' object='xcfa-normalise.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-normalise.o `test -f 'normalise.c' || echo '$(srcdir)/'`normalise.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-normalise.o `test -f 'normalise.c' || echo '$(srcdir)/'`normalise.c
 
 xcfa-normalise.obj: normalise.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-normalise.obj -MD -MP -MF $(DEPDIR)/xcfa-normalise.Tpo -c -o xcfa-normalise.obj `if test -f 'normalise.c'; then $(CYGPATH_W) 'normalise.c'; else $(CYGPATH_W) '$(srcdir)/normalise.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-normalise.Tpo $(DEPDIR)/xcfa-normalise.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='normalise.c' object='xcfa-normalise.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='normalise.c' object='xcfa-normalise.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-normalise.obj `if test -f 'normalise.c'; then $(CYGPATH_W) 'normalise.c'; else $(CYGPATH_W) '$(srcdir)/normalise.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-normalise.obj `if test -f 'normalise.c'; then $(CYGPATH_W) 'normalise.c'; else $(CYGPATH_W) '$(srcdir)/normalise.c'; fi`
 
 xcfa-notify_send.o: notify_send.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-notify_send.o -MD -MP -MF $(DEPDIR)/xcfa-notify_send.Tpo -c -o xcfa-notify_send.o `test -f 'notify_send.c' || echo '$(srcdir)/'`notify_send.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-notify_send.Tpo $(DEPDIR)/xcfa-notify_send.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='notify_send.c' object='xcfa-notify_send.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='notify_send.c' object='xcfa-notify_send.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-notify_send.o `test -f 'notify_send.c' || echo '$(srcdir)/'`notify_send.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-notify_send.o `test -f 'notify_send.c' || echo '$(srcdir)/'`notify_send.c
 
 xcfa-notify_send.obj: notify_send.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-notify_send.obj -MD -MP -MF $(DEPDIR)/xcfa-notify_send.Tpo -c -o xcfa-notify_send.obj `if test -f 'notify_send.c'; then $(CYGPATH_W) 'notify_send.c'; else $(CYGPATH_W) '$(srcdir)/notify_send.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-notify_send.Tpo $(DEPDIR)/xcfa-notify_send.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='notify_send.c' object='xcfa-notify_send.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='notify_send.c' object='xcfa-notify_send.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-notify_send.obj `if test -f 'notify_send.c'; then $(CYGPATH_W) 'notify_send.c'; else $(CYGPATH_W) '$(srcdir)/notify_send.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-notify_send.obj `if test -f 'notify_send.c'; then $(CYGPATH_W) 'notify_send.c'; else $(CYGPATH_W) '$(srcdir)/notify_send.c'; fi`
 
 xcfa-options.o: options.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-options.o -MD -MP -MF $(DEPDIR)/xcfa-options.Tpo -c -o xcfa-options.o `test -f 'options.c' || echo '$(srcdir)/'`options.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-options.Tpo $(DEPDIR)/xcfa-options.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='options.c' object='xcfa-options.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='options.c' object='xcfa-options.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options.o `test -f 'options.c' || echo '$(srcdir)/'`options.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options.o `test -f 'options.c' || echo '$(srcdir)/'`options.c
 
 xcfa-options.obj: options.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-options.obj -MD -MP -MF $(DEPDIR)/xcfa-options.Tpo -c -o xcfa-options.obj `if test -f 'options.c'; then $(CYGPATH_W) 'options.c'; else $(CYGPATH_W) '$(srcdir)/options.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-options.Tpo $(DEPDIR)/xcfa-options.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='options.c' object='xcfa-options.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='options.c' object='xcfa-options.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options.obj `if test -f 'options.c'; then $(CYGPATH_W) 'options.c'; else $(CYGPATH_W) '$(srcdir)/options.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options.obj `if test -f 'options.c'; then $(CYGPATH_W) 'options.c'; else $(CYGPATH_W) '$(srcdir)/options.c'; fi`
 
 xcfa-options_cd.o: options_cd.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-options_cd.o -MD -MP -MF $(DEPDIR)/xcfa-options_cd.Tpo -c -o xcfa-options_cd.o `test -f 'options_cd.c' || echo '$(srcdir)/'`options_cd.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-options_cd.Tpo $(DEPDIR)/xcfa-options_cd.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='options_cd.c' object='xcfa-options_cd.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='options_cd.c' object='xcfa-options_cd.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_cd.o `test -f 'options_cd.c' || echo '$(srcdir)/'`options_cd.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_cd.o `test -f 'options_cd.c' || echo '$(srcdir)/'`options_cd.c
 
 xcfa-options_cd.obj: options_cd.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-options_cd.obj -MD -MP -MF $(DEPDIR)/xcfa-options_cd.Tpo -c -o xcfa-options_cd.obj `if test -f 'options_cd.c'; then $(CYGPATH_W) 'options_cd.c'; else $(CYGPATH_W) '$(srcdir)/options_cd.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-options_cd.Tpo $(DEPDIR)/xcfa-options_cd.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='options_cd.c' object='xcfa-options_cd.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='options_cd.c' object='xcfa-options_cd.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_cd.obj `if test -f 'options_cd.c'; then $(CYGPATH_W) 'options_cd.c'; else $(CYGPATH_W) '$(srcdir)/options_cd.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_cd.obj `if test -f 'options_cd.c'; then $(CYGPATH_W) 'options_cd.c'; else $(CYGPATH_W) '$(srcdir)/options_cd.c'; fi`
 
 xcfa-options_mp3.o: options_mp3.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-options_mp3.o -MD -MP -MF $(DEPDIR)/xcfa-options_mp3.Tpo -c -o xcfa-options_mp3.o `test -f 'options_mp3.c' || echo '$(srcdir)/'`options_mp3.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-options_mp3.Tpo $(DEPDIR)/xcfa-options_mp3.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='options_mp3.c' object='xcfa-options_mp3.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='options_mp3.c' object='xcfa-options_mp3.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_mp3.o `test -f 'options_mp3.c' || echo '$(srcdir)/'`options_mp3.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_mp3.o `test -f 'options_mp3.c' || echo '$(srcdir)/'`options_mp3.c
 
 xcfa-options_mp3.obj: options_mp3.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-options_mp3.obj -MD -MP -MF $(DEPDIR)/xcfa-options_mp3.Tpo -c -o xcfa-options_mp3.obj `if test -f 'options_mp3.c'; then $(CYGPATH_W) 'options_mp3.c'; else $(CYGPATH_W) '$(srcdir)/options_mp3.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-options_mp3.Tpo $(DEPDIR)/xcfa-options_mp3.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='options_mp3.c' object='xcfa-options_mp3.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='options_mp3.c' object='xcfa-options_mp3.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_mp3.obj `if test -f 'options_mp3.c'; then $(CYGPATH_W) 'options_mp3.c'; else $(CYGPATH_W) '$(srcdir)/options_mp3.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_mp3.obj `if test -f 'options_mp3.c'; then $(CYGPATH_W) 'options_mp3.c'; else $(CYGPATH_W) '$(srcdir)/options_mp3.c'; fi`
 
 xcfa-options_oggenc.o: options_oggenc.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-options_oggenc.o -MD -MP -MF $(DEPDIR)/xcfa-options_oggenc.Tpo -c -o xcfa-options_oggenc.o `test -f 'options_oggenc.c' || echo '$(srcdir)/'`options_oggenc.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-options_oggenc.Tpo $(DEPDIR)/xcfa-options_oggenc.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='options_oggenc.c' object='xcfa-options_oggenc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='options_oggenc.c' object='xcfa-options_oggenc.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_oggenc.o `test -f 'options_oggenc.c' || echo '$(srcdir)/'`options_oggenc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_oggenc.o `test -f 'options_oggenc.c' || echo '$(srcdir)/'`options_oggenc.c
 
 xcfa-options_oggenc.obj: options_oggenc.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-options_oggenc.obj -MD -MP -MF $(DEPDIR)/xcfa-options_oggenc.Tpo -c -o xcfa-options_oggenc.obj `if test -f 'options_oggenc.c'; then $(CYGPATH_W) 'options_oggenc.c'; else $(CYGPATH_W) '$(srcdir)/options_oggenc.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-options_oggenc.Tpo $(DEPDIR)/xcfa-options_oggenc.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='options_oggenc.c' object='xcfa-options_oggenc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='options_oggenc.c' object='xcfa-options_oggenc.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_oggenc.obj `if test -f 'options_oggenc.c'; then $(CYGPATH_W) 'options_oggenc.c'; else $(CYGPATH_W) '$(srcdir)/options_oggenc.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_oggenc.obj `if test -f 'options_oggenc.c'; then $(CYGPATH_W) 'options_oggenc.c'; else $(CYGPATH_W) '$(srcdir)/options_oggenc.c'; fi`
 
 xcfa-options_flac.o: options_flac.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-options_flac.o -MD -MP -MF $(DEPDIR)/xcfa-options_flac.Tpo -c -o xcfa-options_flac.o `test -f 'options_flac.c' || echo '$(srcdir)/'`options_flac.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-options_flac.Tpo $(DEPDIR)/xcfa-options_flac.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='options_flac.c' object='xcfa-options_flac.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='options_flac.c' object='xcfa-options_flac.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_flac.o `test -f 'options_flac.c' || echo '$(srcdir)/'`options_flac.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_flac.o `test -f 'options_flac.c' || echo '$(srcdir)/'`options_flac.c
 
 xcfa-options_flac.obj: options_flac.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-options_flac.obj -MD -MP -MF $(DEPDIR)/xcfa-options_flac.Tpo -c -o xcfa-options_flac.obj `if test -f 'options_flac.c'; then $(CYGPATH_W) 'options_flac.c'; else $(CYGPATH_W) '$(srcdir)/options_flac.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-options_flac.Tpo $(DEPDIR)/xcfa-options_flac.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='options_flac.c' object='xcfa-options_flac.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='options_flac.c' object='xcfa-options_flac.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_flac.obj `if test -f 'options_flac.c'; then $(CYGPATH_W) 'options_flac.c'; else $(CYGPATH_W) '$(srcdir)/options_flac.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_flac.obj `if test -f 'options_flac.c'; then $(CYGPATH_W) 'options_flac.c'; else $(CYGPATH_W) '$(srcdir)/options_flac.c'; fi`
 
 xcfa-options_mac.o: options_mac.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-options_mac.o -MD -MP -MF $(DEPDIR)/xcfa-options_mac.Tpo -c -o xcfa-options_mac.o `test -f 'options_mac.c' || echo '$(srcdir)/'`options_mac.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-options_mac.Tpo $(DEPDIR)/xcfa-options_mac.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='options_mac.c' object='xcfa-options_mac.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='options_mac.c' object='xcfa-options_mac.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_mac.o `test -f 'options_mac.c' || echo '$(srcdir)/'`options_mac.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_mac.o `test -f 'options_mac.c' || echo '$(srcdir)/'`options_mac.c
 
 xcfa-options_mac.obj: options_mac.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-options_mac.obj -MD -MP -MF $(DEPDIR)/xcfa-options_mac.Tpo -c -o xcfa-options_mac.obj `if test -f 'options_mac.c'; then $(CYGPATH_W) 'options_mac.c'; else $(CYGPATH_W) '$(srcdir)/options_mac.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-options_mac.Tpo $(DEPDIR)/xcfa-options_mac.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='options_mac.c' object='xcfa-options_mac.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='options_mac.c' object='xcfa-options_mac.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_mac.obj `if test -f 'options_mac.c'; then $(CYGPATH_W) 'options_mac.c'; else $(CYGPATH_W) '$(srcdir)/options_mac.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_mac.obj `if test -f 'options_mac.c'; then $(CYGPATH_W) 'options_mac.c'; else $(CYGPATH_W) '$(srcdir)/options_mac.c'; fi`
 
 xcfa-options_wavpack.o: options_wavpack.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-options_wavpack.o -MD -MP -MF $(DEPDIR)/xcfa-options_wavpack.Tpo -c -o xcfa-options_wavpack.o `test -f 'options_wavpack.c' || echo '$(srcdir)/'`options_wavpack.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-options_wavpack.Tpo $(DEPDIR)/xcfa-options_wavpack.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='options_wavpack.c' object='xcfa-options_wavpack.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='options_wavpack.c' object='xcfa-options_wavpack.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_wavpack.o `test -f 'options_wavpack.c' || echo '$(srcdir)/'`options_wavpack.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_wavpack.o `test -f 'options_wavpack.c' || echo '$(srcdir)/'`options_wavpack.c
 
 xcfa-options_wavpack.obj: options_wavpack.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-options_wavpack.obj -MD -MP -MF $(DEPDIR)/xcfa-options_wavpack.Tpo -c -o xcfa-options_wavpack.obj `if test -f 'options_wavpack.c'; then $(CYGPATH_W) 'options_wavpack.c'; else $(CYGPATH_W) '$(srcdir)/options_wavpack.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-options_wavpack.Tpo $(DEPDIR)/xcfa-options_wavpack.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='options_wavpack.c' object='xcfa-options_wavpack.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='options_wavpack.c' object='xcfa-options_wavpack.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_wavpack.obj `if test -f 'options_wavpack.c'; then $(CYGPATH_W) 'options_wavpack.c'; else $(CYGPATH_W) '$(srcdir)/options_wavpack.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_wavpack.obj `if test -f 'options_wavpack.c'; then $(CYGPATH_W) 'options_wavpack.c'; else $(CYGPATH_W) '$(srcdir)/options_wavpack.c'; fi`
 
 xcfa-options_musepack.o: options_musepack.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-options_musepack.o -MD -MP -MF $(DEPDIR)/xcfa-options_musepack.Tpo -c -o xcfa-options_musepack.o `test -f 'options_musepack.c' || echo '$(srcdir)/'`options_musepack.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-options_musepack.Tpo $(DEPDIR)/xcfa-options_musepack.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='options_musepack.c' object='xcfa-options_musepack.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='options_musepack.c' object='xcfa-options_musepack.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_musepack.o `test -f 'options_musepack.c' || echo '$(srcdir)/'`options_musepack.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_musepack.o `test -f 'options_musepack.c' || echo '$(srcdir)/'`options_musepack.c
 
 xcfa-options_musepack.obj: options_musepack.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-options_musepack.obj -MD -MP -MF $(DEPDIR)/xcfa-options_musepack.Tpo -c -o xcfa-options_musepack.obj `if test -f 'options_musepack.c'; then $(CYGPATH_W) 'options_musepack.c'; else $(CYGPATH_W) '$(srcdir)/options_musepack.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-options_musepack.Tpo $(DEPDIR)/xcfa-options_musepack.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='options_musepack.c' object='xcfa-options_musepack.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='options_musepack.c' object='xcfa-options_musepack.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_musepack.obj `if test -f 'options_musepack.c'; then $(CYGPATH_W) 'options_musepack.c'; else $(CYGPATH_W) '$(srcdir)/options_musepack.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_musepack.obj `if test -f 'options_musepack.c'; then $(CYGPATH_W) 'options_musepack.c'; else $(CYGPATH_W) '$(srcdir)/options_musepack.c'; fi`
 
 xcfa-options_faac.o: options_faac.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-options_faac.o -MD -MP -MF $(DEPDIR)/xcfa-options_faac.Tpo -c -o xcfa-options_faac.o `test -f 'options_faac.c' || echo '$(srcdir)/'`options_faac.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-options_faac.Tpo $(DEPDIR)/xcfa-options_faac.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='options_faac.c' object='xcfa-options_faac.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='options_faac.c' object='xcfa-options_faac.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_faac.o `test -f 'options_faac.c' || echo '$(srcdir)/'`options_faac.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_faac.o `test -f 'options_faac.c' || echo '$(srcdir)/'`options_faac.c
 
 xcfa-options_faac.obj: options_faac.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-options_faac.obj -MD -MP -MF $(DEPDIR)/xcfa-options_faac.Tpo -c -o xcfa-options_faac.obj `if test -f 'options_faac.c'; then $(CYGPATH_W) 'options_faac.c'; else $(CYGPATH_W) '$(srcdir)/options_faac.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-options_faac.Tpo $(DEPDIR)/xcfa-options_faac.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='options_faac.c' object='xcfa-options_faac.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='options_faac.c' object='xcfa-options_faac.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_faac.obj `if test -f 'options_faac.c'; then $(CYGPATH_W) 'options_faac.c'; else $(CYGPATH_W) '$(srcdir)/options_faac.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_faac.obj `if test -f 'options_faac.c'; then $(CYGPATH_W) 'options_faac.c'; else $(CYGPATH_W) '$(srcdir)/options_faac.c'; fi`
 
 xcfa-options_aacplusenc.o: options_aacplusenc.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-options_aacplusenc.o -MD -MP -MF $(DEPDIR)/xcfa-options_aacplusenc.Tpo -c -o xcfa-options_aacplusenc.o `test -f 'options_aacplusenc.c' || echo '$(srcdir)/'`options_aacplusenc.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-options_aacplusenc.Tpo $(DEPDIR)/xcfa-options_aacplusenc.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='options_aacplusenc.c' object='xcfa-options_aacplusenc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='options_aacplusenc.c' object='xcfa-options_aacplusenc.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_aacplusenc.o `test -f 'options_aacplusenc.c' || echo '$(srcdir)/'`options_aacplusenc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_aacplusenc.o `test -f 'options_aacplusenc.c' || echo '$(srcdir)/'`options_aacplusenc.c
 
 xcfa-options_aacplusenc.obj: options_aacplusenc.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-options_aacplusenc.obj -MD -MP -MF $(DEPDIR)/xcfa-options_aacplusenc.Tpo -c -o xcfa-options_aacplusenc.obj `if test -f 'options_aacplusenc.c'; then $(CYGPATH_W) 'options_aacplusenc.c'; else $(CYGPATH_W) '$(srcdir)/options_aacplusenc.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-options_aacplusenc.Tpo $(DEPDIR)/xcfa-options_aacplusenc.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='options_aacplusenc.c' object='xcfa-options_aacplusenc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='options_aacplusenc.c' object='xcfa-options_aacplusenc.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_aacplusenc.obj `if test -f 'options_aacplusenc.c'; then $(CYGPATH_W) 'options_aacplusenc.c'; else $(CYGPATH_W) '$(srcdir)/options_aacplusenc.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_aacplusenc.obj `if test -f 'options_aacplusenc.c'; then $(CYGPATH_W) 'options_aacplusenc.c'; else $(CYGPATH_W) '$(srcdir)/options_aacplusenc.c'; fi`
 
 xcfa-options_tags.o: options_tags.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-options_tags.o -MD -MP -MF $(DEPDIR)/xcfa-options_tags.Tpo -c -o xcfa-options_tags.o `test -f 'options_tags.c' || echo '$(srcdir)/'`options_tags.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-options_tags.Tpo $(DEPDIR)/xcfa-options_tags.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='options_tags.c' object='xcfa-options_tags.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='options_tags.c' object='xcfa-options_tags.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_tags.o `test -f 'options_tags.c' || echo '$(srcdir)/'`options_tags.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_tags.o `test -f 'options_tags.c' || echo '$(srcdir)/'`options_tags.c
 
 xcfa-options_tags.obj: options_tags.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-options_tags.obj -MD -MP -MF $(DEPDIR)/xcfa-options_tags.Tpo -c -o xcfa-options_tags.obj `if test -f 'options_tags.c'; then $(CYGPATH_W) 'options_tags.c'; else $(CYGPATH_W) '$(srcdir)/options_tags.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-options_tags.Tpo $(DEPDIR)/xcfa-options_tags.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='options_tags.c' object='xcfa-options_tags.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='options_tags.c' object='xcfa-options_tags.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_tags.obj `if test -f 'options_tags.c'; then $(CYGPATH_W) 'options_tags.c'; else $(CYGPATH_W) '$(srcdir)/options_tags.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_tags.obj `if test -f 'options_tags.c'; then $(CYGPATH_W) 'options_tags.c'; else $(CYGPATH_W) '$(srcdir)/options_tags.c'; fi`
 
 xcfa-options_internal.o: options_internal.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-options_internal.o -MD -MP -MF $(DEPDIR)/xcfa-options_internal.Tpo -c -o xcfa-options_internal.o `test -f 'options_internal.c' || echo '$(srcdir)/'`options_internal.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-options_internal.Tpo $(DEPDIR)/xcfa-options_internal.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='options_internal.c' object='xcfa-options_internal.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='options_internal.c' object='xcfa-options_internal.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_internal.o `test -f 'options_internal.c' || echo '$(srcdir)/'`options_internal.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_internal.o `test -f 'options_internal.c' || echo '$(srcdir)/'`options_internal.c
 
 xcfa-options_internal.obj: options_internal.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-options_internal.obj -MD -MP -MF $(DEPDIR)/xcfa-options_internal.Tpo -c -o xcfa-options_internal.obj `if test -f 'options_internal.c'; then $(CYGPATH_W) 'options_internal.c'; else $(CYGPATH_W) '$(srcdir)/options_internal.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-options_internal.Tpo $(DEPDIR)/xcfa-options_internal.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='options_internal.c' object='xcfa-options_internal.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='options_internal.c' object='xcfa-options_internal.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_internal.obj `if test -f 'options_internal.c'; then $(CYGPATH_W) 'options_internal.c'; else $(CYGPATH_W) '$(srcdir)/options_internal.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-options_internal.obj `if test -f 'options_internal.c'; then $(CYGPATH_W) 'options_internal.c'; else $(CYGPATH_W) '$(srcdir)/options_internal.c'; fi`
 
 xcfa-parse.o: parse.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-parse.o -MD -MP -MF $(DEPDIR)/xcfa-parse.Tpo -c -o xcfa-parse.o `test -f 'parse.c' || echo '$(srcdir)/'`parse.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-parse.Tpo $(DEPDIR)/xcfa-parse.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='parse.c' object='xcfa-parse.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='parse.c' object='xcfa-parse.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-parse.o `test -f 'parse.c' || echo '$(srcdir)/'`parse.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-parse.o `test -f 'parse.c' || echo '$(srcdir)/'`parse.c
 
 xcfa-parse.obj: parse.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-parse.obj -MD -MP -MF $(DEPDIR)/xcfa-parse.Tpo -c -o xcfa-parse.obj `if test -f 'parse.c'; then $(CYGPATH_W) 'parse.c'; else $(CYGPATH_W) '$(srcdir)/parse.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-parse.Tpo $(DEPDIR)/xcfa-parse.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='parse.c' object='xcfa-parse.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='parse.c' object='xcfa-parse.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-parse.obj `if test -f 'parse.c'; then $(CYGPATH_W) 'parse.c'; else $(CYGPATH_W) '$(srcdir)/parse.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-parse.obj `if test -f 'parse.c'; then $(CYGPATH_W) 'parse.c'; else $(CYGPATH_W) '$(srcdir)/parse.c'; fi`
 
 xcfa-play_file.o: play_file.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-play_file.o -MD -MP -MF $(DEPDIR)/xcfa-play_file.Tpo -c -o xcfa-play_file.o `test -f 'play_file.c' || echo '$(srcdir)/'`play_file.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-play_file.Tpo $(DEPDIR)/xcfa-play_file.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='play_file.c' object='xcfa-play_file.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='play_file.c' object='xcfa-play_file.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-play_file.o `test -f 'play_file.c' || echo '$(srcdir)/'`play_file.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-play_file.o `test -f 'play_file.c' || echo '$(srcdir)/'`play_file.c
 
 xcfa-play_file.obj: play_file.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-play_file.obj -MD -MP -MF $(DEPDIR)/xcfa-play_file.Tpo -c -o xcfa-play_file.obj `if test -f 'play_file.c'; then $(CYGPATH_W) 'play_file.c'; else $(CYGPATH_W) '$(srcdir)/play_file.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-play_file.Tpo $(DEPDIR)/xcfa-play_file.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='play_file.c' object='xcfa-play_file.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='play_file.c' object='xcfa-play_file.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-play_file.obj `if test -f 'play_file.c'; then $(CYGPATH_W) 'play_file.c'; else $(CYGPATH_W) '$(srcdir)/play_file.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-play_file.obj `if test -f 'play_file.c'; then $(CYGPATH_W) 'play_file.c'; else $(CYGPATH_W) '$(srcdir)/play_file.c'; fi`
 
 xcfa-poche.o: poche.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-poche.o -MD -MP -MF $(DEPDIR)/xcfa-poche.Tpo -c -o xcfa-poche.o `test -f 'poche.c' || echo '$(srcdir)/'`poche.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-poche.Tpo $(DEPDIR)/xcfa-poche.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='poche.c' object='xcfa-poche.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='poche.c' object='xcfa-poche.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-poche.o `test -f 'poche.c' || echo '$(srcdir)/'`poche.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-poche.o `test -f 'poche.c' || echo '$(srcdir)/'`poche.c
 
 xcfa-poche.obj: poche.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-poche.obj -MD -MP -MF $(DEPDIR)/xcfa-poche.Tpo -c -o xcfa-poche.obj `if test -f 'poche.c'; then $(CYGPATH_W) 'poche.c'; else $(CYGPATH_W) '$(srcdir)/poche.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-poche.Tpo $(DEPDIR)/xcfa-poche.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='poche.c' object='xcfa-poche.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='poche.c' object='xcfa-poche.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-poche.obj `if test -f 'poche.c'; then $(CYGPATH_W) 'poche.c'; else $(CYGPATH_W) '$(srcdir)/poche.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-poche.obj `if test -f 'poche.c'; then $(CYGPATH_W) 'poche.c'; else $(CYGPATH_W) '$(srcdir)/poche.c'; fi`
 
 xcfa-poche_dir.o: poche_dir.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-poche_dir.o -MD -MP -MF $(DEPDIR)/xcfa-poche_dir.Tpo -c -o xcfa-poche_dir.o `test -f 'poche_dir.c' || echo '$(srcdir)/'`poche_dir.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-poche_dir.Tpo $(DEPDIR)/xcfa-poche_dir.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='poche_dir.c' object='xcfa-poche_dir.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='poche_dir.c' object='xcfa-poche_dir.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-poche_dir.o `test -f 'poche_dir.c' || echo '$(srcdir)/'`poche_dir.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-poche_dir.o `test -f 'poche_dir.c' || echo '$(srcdir)/'`poche_dir.c
 
 xcfa-poche_dir.obj: poche_dir.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-poche_dir.obj -MD -MP -MF $(DEPDIR)/xcfa-poche_dir.Tpo -c -o xcfa-poche_dir.obj `if test -f 'poche_dir.c'; then $(CYGPATH_W) 'poche_dir.c'; else $(CYGPATH_W) '$(srcdir)/poche_dir.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-poche_dir.Tpo $(DEPDIR)/xcfa-poche_dir.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='poche_dir.c' object='xcfa-poche_dir.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='poche_dir.c' object='xcfa-poche_dir.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-poche_dir.obj `if test -f 'poche_dir.c'; then $(CYGPATH_W) 'poche_dir.c'; else $(CYGPATH_W) '$(srcdir)/poche_dir.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-poche_dir.obj `if test -f 'poche_dir.c'; then $(CYGPATH_W) 'poche_dir.c'; else $(CYGPATH_W) '$(srcdir)/poche_dir.c'; fi`
 
 xcfa-poche_draw.o: poche_draw.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-poche_draw.o -MD -MP -MF $(DEPDIR)/xcfa-poche_draw.Tpo -c -o xcfa-poche_draw.o `test -f 'poche_draw.c' || echo '$(srcdir)/'`poche_draw.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-poche_draw.Tpo $(DEPDIR)/xcfa-poche_draw.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='poche_draw.c' object='xcfa-poche_draw.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='poche_draw.c' object='xcfa-poche_draw.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-poche_draw.o `test -f 'poche_draw.c' || echo '$(srcdir)/'`poche_draw.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-poche_draw.o `test -f 'poche_draw.c' || echo '$(srcdir)/'`poche_draw.c
 
 xcfa-poche_draw.obj: poche_draw.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-poche_draw.obj -MD -MP -MF $(DEPDIR)/xcfa-poche_draw.Tpo -c -o xcfa-poche_draw.obj `if test -f 'poche_draw.c'; then $(CYGPATH_W) 'poche_draw.c'; else $(CYGPATH_W) '$(srcdir)/poche_draw.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-poche_draw.Tpo $(DEPDIR)/xcfa-poche_draw.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='poche_draw.c' object='xcfa-poche_draw.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='poche_draw.c' object='xcfa-poche_draw.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-poche_draw.obj `if test -f 'poche_draw.c'; then $(CYGPATH_W) 'poche_draw.c'; else $(CYGPATH_W) '$(srcdir)/poche_draw.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-poche_draw.obj `if test -f 'poche_draw.c'; then $(CYGPATH_W) 'poche_draw.c'; else $(CYGPATH_W) '$(srcdir)/poche_draw.c'; fi`
 
 xcfa-poche_save.o: poche_save.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-poche_save.o -MD -MP -MF $(DEPDIR)/xcfa-poche_save.Tpo -c -o xcfa-poche_save.o `test -f 'poche_save.c' || echo '$(srcdir)/'`poche_save.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-poche_save.Tpo $(DEPDIR)/xcfa-poche_save.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='poche_save.c' object='xcfa-poche_save.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='poche_save.c' object='xcfa-poche_save.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-poche_save.o `test -f 'poche_save.c' || echo '$(srcdir)/'`poche_save.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-poche_save.o `test -f 'poche_save.c' || echo '$(srcdir)/'`poche_save.c
 
 xcfa-poche_save.obj: poche_save.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-poche_save.obj -MD -MP -MF $(DEPDIR)/xcfa-poche_save.Tpo -c -o xcfa-poche_save.obj `if test -f 'poche_save.c'; then $(CYGPATH_W) 'poche_save.c'; else $(CYGPATH_W) '$(srcdir)/poche_save.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-poche_save.Tpo $(DEPDIR)/xcfa-poche_save.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='poche_save.c' object='xcfa-poche_save.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='poche_save.c' object='xcfa-poche_save.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-poche_save.obj `if test -f 'poche_save.c'; then $(CYGPATH_W) 'poche_save.c'; else $(CYGPATH_W) '$(srcdir)/poche_save.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-poche_save.obj `if test -f 'poche_save.c'; then $(CYGPATH_W) 'poche_save.c'; else $(CYGPATH_W) '$(srcdir)/poche_save.c'; fi`
 
 xcfa-poche_txt.o: poche_txt.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-poche_txt.o -MD -MP -MF $(DEPDIR)/xcfa-poche_txt.Tpo -c -o xcfa-poche_txt.o `test -f 'poche_txt.c' || echo '$(srcdir)/'`poche_txt.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-poche_txt.Tpo $(DEPDIR)/xcfa-poche_txt.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='poche_txt.c' object='xcfa-poche_txt.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='poche_txt.c' object='xcfa-poche_txt.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-poche_txt.o `test -f 'poche_txt.c' || echo '$(srcdir)/'`poche_txt.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-poche_txt.o `test -f 'poche_txt.c' || echo '$(srcdir)/'`poche_txt.c
 
 xcfa-poche_txt.obj: poche_txt.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-poche_txt.obj -MD -MP -MF $(DEPDIR)/xcfa-poche_txt.Tpo -c -o xcfa-poche_txt.obj `if test -f 'poche_txt.c'; then $(CYGPATH_W) 'poche_txt.c'; else $(CYGPATH_W) '$(srcdir)/poche_txt.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-poche_txt.Tpo $(DEPDIR)/xcfa-poche_txt.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='poche_txt.c' object='xcfa-poche_txt.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='poche_txt.c' object='xcfa-poche_txt.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-poche_txt.obj `if test -f 'poche_txt.c'; then $(CYGPATH_W) 'poche_txt.c'; else $(CYGPATH_W) '$(srcdir)/poche_txt.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-poche_txt.obj `if test -f 'poche_txt.c'; then $(CYGPATH_W) 'poche_txt.c'; else $(CYGPATH_W) '$(srcdir)/poche_txt.c'; fi`
 
 xcfa-poche_web.o: poche_web.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-poche_web.o -MD -MP -MF $(DEPDIR)/xcfa-poche_web.Tpo -c -o xcfa-poche_web.o `test -f 'poche_web.c' || echo '$(srcdir)/'`poche_web.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-poche_web.Tpo $(DEPDIR)/xcfa-poche_web.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='poche_web.c' object='xcfa-poche_web.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='poche_web.c' object='xcfa-poche_web.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-poche_web.o `test -f 'poche_web.c' || echo '$(srcdir)/'`poche_web.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-poche_web.o `test -f 'poche_web.c' || echo '$(srcdir)/'`poche_web.c
 
 xcfa-poche_web.obj: poche_web.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-poche_web.obj -MD -MP -MF $(DEPDIR)/xcfa-poche_web.Tpo -c -o xcfa-poche_web.obj `if test -f 'poche_web.c'; then $(CYGPATH_W) 'poche_web.c'; else $(CYGPATH_W) '$(srcdir)/poche_web.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-poche_web.Tpo $(DEPDIR)/xcfa-poche_web.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='poche_web.c' object='xcfa-poche_web.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='poche_web.c' object='xcfa-poche_web.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-poche_web.obj `if test -f 'poche_web.c'; then $(CYGPATH_W) 'poche_web.c'; else $(CYGPATH_W) '$(srcdir)/poche_web.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-poche_web.obj `if test -f 'poche_web.c'; then $(CYGPATH_W) 'poche_web.c'; else $(CYGPATH_W) '$(srcdir)/poche_web.c'; fi`
 
 xcfa-popup.o: popup.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-popup.o -MD -MP -MF $(DEPDIR)/xcfa-popup.Tpo -c -o xcfa-popup.o `test -f 'popup.c' || echo '$(srcdir)/'`popup.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-popup.Tpo $(DEPDIR)/xcfa-popup.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='popup.c' object='xcfa-popup.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='popup.c' object='xcfa-popup.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-popup.o `test -f 'popup.c' || echo '$(srcdir)/'`popup.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-popup.o `test -f 'popup.c' || echo '$(srcdir)/'`popup.c
 
 xcfa-popup.obj: popup.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-popup.obj -MD -MP -MF $(DEPDIR)/xcfa-popup.Tpo -c -o xcfa-popup.obj `if test -f 'popup.c'; then $(CYGPATH_W) 'popup.c'; else $(CYGPATH_W) '$(srcdir)/popup.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-popup.Tpo $(DEPDIR)/xcfa-popup.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='popup.c' object='xcfa-popup.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='popup.c' object='xcfa-popup.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-popup.obj `if test -f 'popup.c'; then $(CYGPATH_W) 'popup.c'; else $(CYGPATH_W) '$(srcdir)/popup.c'; fi`
-
-xcfa-popup_systray.o: popup_systray.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-popup_systray.o -MD -MP -MF $(DEPDIR)/xcfa-popup_systray.Tpo -c -o xcfa-popup_systray.o `test -f 'popup_systray.c' || echo '$(srcdir)/'`popup_systray.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-popup_systray.Tpo $(DEPDIR)/xcfa-popup_systray.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='popup_systray.c' object='xcfa-popup_systray.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-popup_systray.o `test -f 'popup_systray.c' || echo '$(srcdir)/'`popup_systray.c
-
-xcfa-popup_systray.obj: popup_systray.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-popup_systray.obj -MD -MP -MF $(DEPDIR)/xcfa-popup_systray.Tpo -c -o xcfa-popup_systray.obj `if test -f 'popup_systray.c'; then $(CYGPATH_W) 'popup_systray.c'; else $(CYGPATH_W) '$(srcdir)/popup_systray.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-popup_systray.Tpo $(DEPDIR)/xcfa-popup_systray.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='popup_systray.c' object='xcfa-popup_systray.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-popup_systray.obj `if test -f 'popup_systray.c'; then $(CYGPATH_W) 'popup_systray.c'; else $(CYGPATH_W) '$(srcdir)/popup_systray.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-popup.obj `if test -f 'popup.c'; then $(CYGPATH_W) 'popup.c'; else $(CYGPATH_W) '$(srcdir)/popup.c'; fi`
 
 xcfa-prg_init.o: prg_init.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-prg_init.o -MD -MP -MF $(DEPDIR)/xcfa-prg_init.Tpo -c -o xcfa-prg_init.o `test -f 'prg_init.c' || echo '$(srcdir)/'`prg_init.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-prg_init.Tpo $(DEPDIR)/xcfa-prg_init.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='prg_init.c' object='xcfa-prg_init.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='prg_init.c' object='xcfa-prg_init.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-prg_init.o `test -f 'prg_init.c' || echo '$(srcdir)/'`prg_init.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-prg_init.o `test -f 'prg_init.c' || echo '$(srcdir)/'`prg_init.c
 
 xcfa-prg_init.obj: prg_init.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-prg_init.obj -MD -MP -MF $(DEPDIR)/xcfa-prg_init.Tpo -c -o xcfa-prg_init.obj `if test -f 'prg_init.c'; then $(CYGPATH_W) 'prg_init.c'; else $(CYGPATH_W) '$(srcdir)/prg_init.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-prg_init.Tpo $(DEPDIR)/xcfa-prg_init.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='prg_init.c' object='xcfa-prg_init.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='prg_init.c' object='xcfa-prg_init.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-prg_init.obj `if test -f 'prg_init.c'; then $(CYGPATH_W) 'prg_init.c'; else $(CYGPATH_W) '$(srcdir)/prg_init.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-prg_init.obj `if test -f 'prg_init.c'; then $(CYGPATH_W) 'prg_init.c'; else $(CYGPATH_W) '$(srcdir)/prg_init.c'; fi`
 
 xcfa-proc.o: proc.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-proc.o -MD -MP -MF $(DEPDIR)/xcfa-proc.Tpo -c -o xcfa-proc.o `test -f 'proc.c' || echo '$(srcdir)/'`proc.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-proc.Tpo $(DEPDIR)/xcfa-proc.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='proc.c' object='xcfa-proc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='proc.c' object='xcfa-proc.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-proc.o `test -f 'proc.c' || echo '$(srcdir)/'`proc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-proc.o `test -f 'proc.c' || echo '$(srcdir)/'`proc.c
 
 xcfa-proc.obj: proc.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-proc.obj -MD -MP -MF $(DEPDIR)/xcfa-proc.Tpo -c -o xcfa-proc.obj `if test -f 'proc.c'; then $(CYGPATH_W) 'proc.c'; else $(CYGPATH_W) '$(srcdir)/proc.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-proc.Tpo $(DEPDIR)/xcfa-proc.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='proc.c' object='xcfa-proc.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-proc.obj `if test -f 'proc.c'; then $(CYGPATH_W) 'proc.c'; else $(CYGPATH_W) '$(srcdir)/proc.c'; fi`
-
-xcfa-process.o: process.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-process.o -MD -MP -MF $(DEPDIR)/xcfa-process.Tpo -c -o xcfa-process.o `test -f 'process.c' || echo '$(srcdir)/'`process.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-process.Tpo $(DEPDIR)/xcfa-process.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='process.c' object='xcfa-process.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-process.o `test -f 'process.c' || echo '$(srcdir)/'`process.c
-
-xcfa-process.obj: process.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-process.obj -MD -MP -MF $(DEPDIR)/xcfa-process.Tpo -c -o xcfa-process.obj `if test -f 'process.c'; then $(CYGPATH_W) 'process.c'; else $(CYGPATH_W) '$(srcdir)/process.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-process.Tpo $(DEPDIR)/xcfa-process.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='process.c' object='xcfa-process.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='proc.c' object='xcfa-proc.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-process.obj `if test -f 'process.c'; then $(CYGPATH_W) 'process.c'; else $(CYGPATH_W) '$(srcdir)/process.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-proc.obj `if test -f 'proc.c'; then $(CYGPATH_W) 'proc.c'; else $(CYGPATH_W) '$(srcdir)/proc.c'; fi`
 
 xcfa-replaygain.o: replaygain.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-replaygain.o -MD -MP -MF $(DEPDIR)/xcfa-replaygain.Tpo -c -o xcfa-replaygain.o `test -f 'replaygain.c' || echo '$(srcdir)/'`replaygain.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-replaygain.Tpo $(DEPDIR)/xcfa-replaygain.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='replaygain.c' object='xcfa-replaygain.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='replaygain.c' object='xcfa-replaygain.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-replaygain.o `test -f 'replaygain.c' || echo '$(srcdir)/'`replaygain.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-replaygain.o `test -f 'replaygain.c' || echo '$(srcdir)/'`replaygain.c
 
 xcfa-replaygain.obj: replaygain.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-replaygain.obj -MD -MP -MF $(DEPDIR)/xcfa-replaygain.Tpo -c -o xcfa-replaygain.obj `if test -f 'replaygain.c'; then $(CYGPATH_W) 'replaygain.c'; else $(CYGPATH_W) '$(srcdir)/replaygain.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-replaygain.Tpo $(DEPDIR)/xcfa-replaygain.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='replaygain.c' object='xcfa-replaygain.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='replaygain.c' object='xcfa-replaygain.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-replaygain.obj `if test -f 'replaygain.c'; then $(CYGPATH_W) 'replaygain.c'; else $(CYGPATH_W) '$(srcdir)/replaygain.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-replaygain.obj `if test -f 'replaygain.c'; then $(CYGPATH_W) 'replaygain.c'; else $(CYGPATH_W) '$(srcdir)/replaygain.c'; fi`
 
 xcfa-scan.o: scan.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-scan.o -MD -MP -MF $(DEPDIR)/xcfa-scan.Tpo -c -o xcfa-scan.o `test -f 'scan.c' || echo '$(srcdir)/'`scan.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-scan.Tpo $(DEPDIR)/xcfa-scan.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='scan.c' object='xcfa-scan.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='scan.c' object='xcfa-scan.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-scan.o `test -f 'scan.c' || echo '$(srcdir)/'`scan.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-scan.o `test -f 'scan.c' || echo '$(srcdir)/'`scan.c
 
 xcfa-scan.obj: scan.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-scan.obj -MD -MP -MF $(DEPDIR)/xcfa-scan.Tpo -c -o xcfa-scan.obj `if test -f 'scan.c'; then $(CYGPATH_W) 'scan.c'; else $(CYGPATH_W) '$(srcdir)/scan.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-scan.Tpo $(DEPDIR)/xcfa-scan.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='scan.c' object='xcfa-scan.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='scan.c' object='xcfa-scan.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-scan.obj `if test -f 'scan.c'; then $(CYGPATH_W) 'scan.c'; else $(CYGPATH_W) '$(srcdir)/scan.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-scan.obj `if test -f 'scan.c'; then $(CYGPATH_W) 'scan.c'; else $(CYGPATH_W) '$(srcdir)/scan.c'; fi`
 
 xcfa-split.o: split.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-split.o -MD -MP -MF $(DEPDIR)/xcfa-split.Tpo -c -o xcfa-split.o `test -f 'split.c' || echo '$(srcdir)/'`split.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-split.Tpo $(DEPDIR)/xcfa-split.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='split.c' object='xcfa-split.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='split.c' object='xcfa-split.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-split.o `test -f 'split.c' || echo '$(srcdir)/'`split.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-split.o `test -f 'split.c' || echo '$(srcdir)/'`split.c
 
 xcfa-split.obj: split.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-split.obj -MD -MP -MF $(DEPDIR)/xcfa-split.Tpo -c -o xcfa-split.obj `if test -f 'split.c'; then $(CYGPATH_W) 'split.c'; else $(CYGPATH_W) '$(srcdir)/split.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-split.Tpo $(DEPDIR)/xcfa-split.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='split.c' object='xcfa-split.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='split.c' object='xcfa-split.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-split.obj `if test -f 'split.c'; then $(CYGPATH_W) 'split.c'; else $(CYGPATH_W) '$(srcdir)/split.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-split.obj `if test -f 'split.c'; then $(CYGPATH_W) 'split.c'; else $(CYGPATH_W) '$(srcdir)/split.c'; fi`
 
 xcfa-split_selector.o: split_selector.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-split_selector.o -MD -MP -MF $(DEPDIR)/xcfa-split_selector.Tpo -c -o xcfa-split_selector.o `test -f 'split_selector.c' || echo '$(srcdir)/'`split_selector.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-split_selector.Tpo $(DEPDIR)/xcfa-split_selector.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='split_selector.c' object='xcfa-split_selector.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='split_selector.c' object='xcfa-split_selector.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-split_selector.o `test -f 'split_selector.c' || echo '$(srcdir)/'`split_selector.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-split_selector.o `test -f 'split_selector.c' || echo '$(srcdir)/'`split_selector.c
 
 xcfa-split_selector.obj: split_selector.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-split_selector.obj -MD -MP -MF $(DEPDIR)/xcfa-split_selector.Tpo -c -o xcfa-split_selector.obj `if test -f 'split_selector.c'; then $(CYGPATH_W) 'split_selector.c'; else $(CYGPATH_W) '$(srcdir)/split_selector.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-split_selector.Tpo $(DEPDIR)/xcfa-split_selector.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='split_selector.c' object='xcfa-split_selector.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='split_selector.c' object='xcfa-split_selector.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-split_selector.obj `if test -f 'split_selector.c'; then $(CYGPATH_W) 'split_selector.c'; else $(CYGPATH_W) '$(srcdir)/split_selector.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-split_selector.obj `if test -f 'split_selector.c'; then $(CYGPATH_W) 'split_selector.c'; else $(CYGPATH_W) '$(srcdir)/split_selector.c'; fi`
 
 xcfa-split_spectre.o: split_spectre.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-split_spectre.o -MD -MP -MF $(DEPDIR)/xcfa-split_spectre.Tpo -c -o xcfa-split_spectre.o `test -f 'split_spectre.c' || echo '$(srcdir)/'`split_spectre.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-split_spectre.Tpo $(DEPDIR)/xcfa-split_spectre.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='split_spectre.c' object='xcfa-split_spectre.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='split_spectre.c' object='xcfa-split_spectre.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-split_spectre.o `test -f 'split_spectre.c' || echo '$(srcdir)/'`split_spectre.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-split_spectre.o `test -f 'split_spectre.c' || echo '$(srcdir)/'`split_spectre.c
 
 xcfa-split_spectre.obj: split_spectre.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-split_spectre.obj -MD -MP -MF $(DEPDIR)/xcfa-split_spectre.Tpo -c -o xcfa-split_spectre.obj `if test -f 'split_spectre.c'; then $(CYGPATH_W) 'split_spectre.c'; else $(CYGPATH_W) '$(srcdir)/split_spectre.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-split_spectre.Tpo $(DEPDIR)/xcfa-split_spectre.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='split_spectre.c' object='xcfa-split_spectre.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='split_spectre.c' object='xcfa-split_spectre.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-split_spectre.obj `if test -f 'split_spectre.c'; then $(CYGPATH_W) 'split_spectre.c'; else $(CYGPATH_W) '$(srcdir)/split_spectre.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-split_spectre.obj `if test -f 'split_spectre.c'; then $(CYGPATH_W) 'split_spectre.c'; else $(CYGPATH_W) '$(srcdir)/split_spectre.c'; fi`
 
 xcfa-split_cue.o: split_cue.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-split_cue.o -MD -MP -MF $(DEPDIR)/xcfa-split_cue.Tpo -c -o xcfa-split_cue.o `test -f 'split_cue.c' || echo '$(srcdir)/'`split_cue.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-split_cue.Tpo $(DEPDIR)/xcfa-split_cue.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='split_cue.c' object='xcfa-split_cue.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='split_cue.c' object='xcfa-split_cue.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-split_cue.o `test -f 'split_cue.c' || echo '$(srcdir)/'`split_cue.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-split_cue.o `test -f 'split_cue.c' || echo '$(srcdir)/'`split_cue.c
 
 xcfa-split_cue.obj: split_cue.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-split_cue.obj -MD -MP -MF $(DEPDIR)/xcfa-split_cue.Tpo -c -o xcfa-split_cue.obj `if test -f 'split_cue.c'; then $(CYGPATH_W) 'split_cue.c'; else $(CYGPATH_W) '$(srcdir)/split_cue.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-split_cue.Tpo $(DEPDIR)/xcfa-split_cue.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='split_cue.c' object='xcfa-split_cue.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='split_cue.c' object='xcfa-split_cue.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-split_cue.obj `if test -f 'split_cue.c'; then $(CYGPATH_W) 'split_cue.c'; else $(CYGPATH_W) '$(srcdir)/split_cue.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-split_cue.obj `if test -f 'split_cue.c'; then $(CYGPATH_W) 'split_cue.c'; else $(CYGPATH_W) '$(srcdir)/split_cue.c'; fi`
 
 xcfa-split_conv.o: split_conv.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-split_conv.o -MD -MP -MF $(DEPDIR)/xcfa-split_conv.Tpo -c -o xcfa-split_conv.o `test -f 'split_conv.c' || echo '$(srcdir)/'`split_conv.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-split_conv.Tpo $(DEPDIR)/xcfa-split_conv.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='split_conv.c' object='xcfa-split_conv.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='split_conv.c' object='xcfa-split_conv.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-split_conv.o `test -f 'split_conv.c' || echo '$(srcdir)/'`split_conv.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-split_conv.o `test -f 'split_conv.c' || echo '$(srcdir)/'`split_conv.c
 
 xcfa-split_conv.obj: split_conv.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-split_conv.obj -MD -MP -MF $(DEPDIR)/xcfa-split_conv.Tpo -c -o xcfa-split_conv.obj `if test -f 'split_conv.c'; then $(CYGPATH_W) 'split_conv.c'; else $(CYGPATH_W) '$(srcdir)/split_conv.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-split_conv.Tpo $(DEPDIR)/xcfa-split_conv.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='split_conv.c' object='xcfa-split_conv.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='split_conv.c' object='xcfa-split_conv.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-split_conv.obj `if test -f 'split_conv.c'; then $(CYGPATH_W) 'split_conv.c'; else $(CYGPATH_W) '$(srcdir)/split_conv.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-split_conv.obj `if test -f 'split_conv.c'; then $(CYGPATH_W) 'split_conv.c'; else $(CYGPATH_W) '$(srcdir)/split_conv.c'; fi`
 
 xcfa-split_wav.o: split_wav.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-split_wav.o -MD -MP -MF $(DEPDIR)/xcfa-split_wav.Tpo -c -o xcfa-split_wav.o `test -f 'split_wav.c' || echo '$(srcdir)/'`split_wav.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-split_wav.Tpo $(DEPDIR)/xcfa-split_wav.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='split_wav.c' object='xcfa-split_wav.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='split_wav.c' object='xcfa-split_wav.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-split_wav.o `test -f 'split_wav.c' || echo '$(srcdir)/'`split_wav.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-split_wav.o `test -f 'split_wav.c' || echo '$(srcdir)/'`split_wav.c
 
 xcfa-split_wav.obj: split_wav.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-split_wav.obj -MD -MP -MF $(DEPDIR)/xcfa-split_wav.Tpo -c -o xcfa-split_wav.obj `if test -f 'split_wav.c'; then $(CYGPATH_W) 'split_wav.c'; else $(CYGPATH_W) '$(srcdir)/split_wav.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-split_wav.Tpo $(DEPDIR)/xcfa-split_wav.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='split_wav.c' object='xcfa-split_wav.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='split_wav.c' object='xcfa-split_wav.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-split_wav.obj `if test -f 'split_wav.c'; then $(CYGPATH_W) 'split_wav.c'; else $(CYGPATH_W) '$(srcdir)/split_wav.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-split_wav.obj `if test -f 'split_wav.c'; then $(CYGPATH_W) 'split_wav.c'; else $(CYGPATH_W) '$(srcdir)/split_wav.c'; fi`
 
 xcfa-statusbar.o: statusbar.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-statusbar.o -MD -MP -MF $(DEPDIR)/xcfa-statusbar.Tpo -c -o xcfa-statusbar.o `test -f 'statusbar.c' || echo '$(srcdir)/'`statusbar.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-statusbar.Tpo $(DEPDIR)/xcfa-statusbar.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='statusbar.c' object='xcfa-statusbar.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='statusbar.c' object='xcfa-statusbar.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-statusbar.o `test -f 'statusbar.c' || echo '$(srcdir)/'`statusbar.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-statusbar.o `test -f 'statusbar.c' || echo '$(srcdir)/'`statusbar.c
 
 xcfa-statusbar.obj: statusbar.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-statusbar.obj -MD -MP -MF $(DEPDIR)/xcfa-statusbar.Tpo -c -o xcfa-statusbar.obj `if test -f 'statusbar.c'; then $(CYGPATH_W) 'statusbar.c'; else $(CYGPATH_W) '$(srcdir)/statusbar.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-statusbar.Tpo $(DEPDIR)/xcfa-statusbar.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='statusbar.c' object='xcfa-statusbar.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='statusbar.c' object='xcfa-statusbar.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-statusbar.obj `if test -f 'statusbar.c'; then $(CYGPATH_W) 'statusbar.c'; else $(CYGPATH_W) '$(srcdir)/statusbar.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-statusbar.obj `if test -f 'statusbar.c'; then $(CYGPATH_W) 'statusbar.c'; else $(CYGPATH_W) '$(srcdir)/statusbar.c'; fi`
 
 xcfa-tags.o: tags.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags.o -MD -MP -MF $(DEPDIR)/xcfa-tags.Tpo -c -o xcfa-tags.o `test -f 'tags.c' || echo '$(srcdir)/'`tags.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags.Tpo $(DEPDIR)/xcfa-tags.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags.c' object='xcfa-tags.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags.c' object='xcfa-tags.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags.o `test -f 'tags.c' || echo '$(srcdir)/'`tags.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags.o `test -f 'tags.c' || echo '$(srcdir)/'`tags.c
 
 xcfa-tags.obj: tags.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags.obj -MD -MP -MF $(DEPDIR)/xcfa-tags.Tpo -c -o xcfa-tags.obj `if test -f 'tags.c'; then $(CYGPATH_W) 'tags.c'; else $(CYGPATH_W) '$(srcdir)/tags.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags.Tpo $(DEPDIR)/xcfa-tags.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags.c' object='xcfa-tags.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags.c' object='xcfa-tags.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags.obj `if test -f 'tags.c'; then $(CYGPATH_W) 'tags.c'; else $(CYGPATH_W) '$(srcdir)/tags.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags.obj `if test -f 'tags.c'; then $(CYGPATH_W) 'tags.c'; else $(CYGPATH_W) '$(srcdir)/tags.c'; fi`
 
 xcfa-tags_aac.o: tags_aac.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_aac.o -MD -MP -MF $(DEPDIR)/xcfa-tags_aac.Tpo -c -o xcfa-tags_aac.o `test -f 'tags_aac.c' || echo '$(srcdir)/'`tags_aac.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_aac.Tpo $(DEPDIR)/xcfa-tags_aac.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_aac.c' object='xcfa-tags_aac.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_aac.c' object='xcfa-tags_aac.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_aac.o `test -f 'tags_aac.c' || echo '$(srcdir)/'`tags_aac.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_aac.o `test -f 'tags_aac.c' || echo '$(srcdir)/'`tags_aac.c
 
 xcfa-tags_aac.obj: tags_aac.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_aac.obj -MD -MP -MF $(DEPDIR)/xcfa-tags_aac.Tpo -c -o xcfa-tags_aac.obj `if test -f 'tags_aac.c'; then $(CYGPATH_W) 'tags_aac.c'; else $(CYGPATH_W) '$(srcdir)/tags_aac.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_aac.Tpo $(DEPDIR)/xcfa-tags_aac.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_aac.c' object='xcfa-tags_aac.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_aac.c' object='xcfa-tags_aac.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_aac.obj `if test -f 'tags_aac.c'; then $(CYGPATH_W) 'tags_aac.c'; else $(CYGPATH_W) '$(srcdir)/tags_aac.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_aac.obj `if test -f 'tags_aac.c'; then $(CYGPATH_W) 'tags_aac.c'; else $(CYGPATH_W) '$(srcdir)/tags_aac.c'; fi`
 
 xcfa-tags_aiff.o: tags_aiff.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_aiff.o -MD -MP -MF $(DEPDIR)/xcfa-tags_aiff.Tpo -c -o xcfa-tags_aiff.o `test -f 'tags_aiff.c' || echo '$(srcdir)/'`tags_aiff.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_aiff.Tpo $(DEPDIR)/xcfa-tags_aiff.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_aiff.c' object='xcfa-tags_aiff.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_aiff.c' object='xcfa-tags_aiff.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_aiff.o `test -f 'tags_aiff.c' || echo '$(srcdir)/'`tags_aiff.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_aiff.o `test -f 'tags_aiff.c' || echo '$(srcdir)/'`tags_aiff.c
 
 xcfa-tags_aiff.obj: tags_aiff.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_aiff.obj -MD -MP -MF $(DEPDIR)/xcfa-tags_aiff.Tpo -c -o xcfa-tags_aiff.obj `if test -f 'tags_aiff.c'; then $(CYGPATH_W) 'tags_aiff.c'; else $(CYGPATH_W) '$(srcdir)/tags_aiff.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_aiff.Tpo $(DEPDIR)/xcfa-tags_aiff.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_aiff.c' object='xcfa-tags_aiff.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_aiff.c' object='xcfa-tags_aiff.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_aiff.obj `if test -f 'tags_aiff.c'; then $(CYGPATH_W) 'tags_aiff.c'; else $(CYGPATH_W) '$(srcdir)/tags_aiff.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_aiff.obj `if test -f 'tags_aiff.c'; then $(CYGPATH_W) 'tags_aiff.c'; else $(CYGPATH_W) '$(srcdir)/tags_aiff.c'; fi`
 
 xcfa-tags_ape.o: tags_ape.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_ape.o -MD -MP -MF $(DEPDIR)/xcfa-tags_ape.Tpo -c -o xcfa-tags_ape.o `test -f 'tags_ape.c' || echo '$(srcdir)/'`tags_ape.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_ape.Tpo $(DEPDIR)/xcfa-tags_ape.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_ape.c' object='xcfa-tags_ape.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_ape.c' object='xcfa-tags_ape.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_ape.o `test -f 'tags_ape.c' || echo '$(srcdir)/'`tags_ape.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_ape.o `test -f 'tags_ape.c' || echo '$(srcdir)/'`tags_ape.c
 
 xcfa-tags_ape.obj: tags_ape.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_ape.obj -MD -MP -MF $(DEPDIR)/xcfa-tags_ape.Tpo -c -o xcfa-tags_ape.obj `if test -f 'tags_ape.c'; then $(CYGPATH_W) 'tags_ape.c'; else $(CYGPATH_W) '$(srcdir)/tags_ape.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_ape.Tpo $(DEPDIR)/xcfa-tags_ape.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_ape.c' object='xcfa-tags_ape.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_ape.c' object='xcfa-tags_ape.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_ape.obj `if test -f 'tags_ape.c'; then $(CYGPATH_W) 'tags_ape.c'; else $(CYGPATH_W) '$(srcdir)/tags_ape.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_ape.obj `if test -f 'tags_ape.c'; then $(CYGPATH_W) 'tags_ape.c'; else $(CYGPATH_W) '$(srcdir)/tags_ape.c'; fi`
 
 xcfa-tags_dts.o: tags_dts.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_dts.o -MD -MP -MF $(DEPDIR)/xcfa-tags_dts.Tpo -c -o xcfa-tags_dts.o `test -f 'tags_dts.c' || echo '$(srcdir)/'`tags_dts.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_dts.Tpo $(DEPDIR)/xcfa-tags_dts.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_dts.c' object='xcfa-tags_dts.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_dts.c' object='xcfa-tags_dts.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_dts.o `test -f 'tags_dts.c' || echo '$(srcdir)/'`tags_dts.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_dts.o `test -f 'tags_dts.c' || echo '$(srcdir)/'`tags_dts.c
 
 xcfa-tags_dts.obj: tags_dts.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_dts.obj -MD -MP -MF $(DEPDIR)/xcfa-tags_dts.Tpo -c -o xcfa-tags_dts.obj `if test -f 'tags_dts.c'; then $(CYGPATH_W) 'tags_dts.c'; else $(CYGPATH_W) '$(srcdir)/tags_dts.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_dts.Tpo $(DEPDIR)/xcfa-tags_dts.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_dts.c' object='xcfa-tags_dts.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_dts.c' object='xcfa-tags_dts.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_dts.obj `if test -f 'tags_dts.c'; then $(CYGPATH_W) 'tags_dts.c'; else $(CYGPATH_W) '$(srcdir)/tags_dts.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_dts.obj `if test -f 'tags_dts.c'; then $(CYGPATH_W) 'tags_dts.c'; else $(CYGPATH_W) '$(srcdir)/tags_dts.c'; fi`
 
 xcfa-tags_flac.o: tags_flac.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_flac.o -MD -MP -MF $(DEPDIR)/xcfa-tags_flac.Tpo -c -o xcfa-tags_flac.o `test -f 'tags_flac.c' || echo '$(srcdir)/'`tags_flac.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_flac.Tpo $(DEPDIR)/xcfa-tags_flac.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_flac.c' object='xcfa-tags_flac.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_flac.c' object='xcfa-tags_flac.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_flac.o `test -f 'tags_flac.c' || echo '$(srcdir)/'`tags_flac.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_flac.o `test -f 'tags_flac.c' || echo '$(srcdir)/'`tags_flac.c
 
 xcfa-tags_flac.obj: tags_flac.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_flac.obj -MD -MP -MF $(DEPDIR)/xcfa-tags_flac.Tpo -c -o xcfa-tags_flac.obj `if test -f 'tags_flac.c'; then $(CYGPATH_W) 'tags_flac.c'; else $(CYGPATH_W) '$(srcdir)/tags_flac.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_flac.Tpo $(DEPDIR)/xcfa-tags_flac.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_flac.c' object='xcfa-tags_flac.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_flac.c' object='xcfa-tags_flac.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_flac.obj `if test -f 'tags_flac.c'; then $(CYGPATH_W) 'tags_flac.c'; else $(CYGPATH_W) '$(srcdir)/tags_flac.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_flac.obj `if test -f 'tags_flac.c'; then $(CYGPATH_W) 'tags_flac.c'; else $(CYGPATH_W) '$(srcdir)/tags_flac.c'; fi`
 
 xcfa-tags_m4a.o: tags_m4a.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_m4a.o -MD -MP -MF $(DEPDIR)/xcfa-tags_m4a.Tpo -c -o xcfa-tags_m4a.o `test -f 'tags_m4a.c' || echo '$(srcdir)/'`tags_m4a.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_m4a.Tpo $(DEPDIR)/xcfa-tags_m4a.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_m4a.c' object='xcfa-tags_m4a.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_m4a.c' object='xcfa-tags_m4a.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_m4a.o `test -f 'tags_m4a.c' || echo '$(srcdir)/'`tags_m4a.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_m4a.o `test -f 'tags_m4a.c' || echo '$(srcdir)/'`tags_m4a.c
 
 xcfa-tags_m4a.obj: tags_m4a.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_m4a.obj -MD -MP -MF $(DEPDIR)/xcfa-tags_m4a.Tpo -c -o xcfa-tags_m4a.obj `if test -f 'tags_m4a.c'; then $(CYGPATH_W) 'tags_m4a.c'; else $(CYGPATH_W) '$(srcdir)/tags_m4a.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_m4a.Tpo $(DEPDIR)/xcfa-tags_m4a.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_m4a.c' object='xcfa-tags_m4a.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_m4a.c' object='xcfa-tags_m4a.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_m4a.obj `if test -f 'tags_m4a.c'; then $(CYGPATH_W) 'tags_m4a.c'; else $(CYGPATH_W) '$(srcdir)/tags_m4a.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_m4a.obj `if test -f 'tags_m4a.c'; then $(CYGPATH_W) 'tags_m4a.c'; else $(CYGPATH_W) '$(srcdir)/tags_m4a.c'; fi`
 
 xcfa-tags_mp3.o: tags_mp3.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_mp3.o -MD -MP -MF $(DEPDIR)/xcfa-tags_mp3.Tpo -c -o xcfa-tags_mp3.o `test -f 'tags_mp3.c' || echo '$(srcdir)/'`tags_mp3.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_mp3.Tpo $(DEPDIR)/xcfa-tags_mp3.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_mp3.c' object='xcfa-tags_mp3.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_mp3.c' object='xcfa-tags_mp3.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_mp3.o `test -f 'tags_mp3.c' || echo '$(srcdir)/'`tags_mp3.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_mp3.o `test -f 'tags_mp3.c' || echo '$(srcdir)/'`tags_mp3.c
 
 xcfa-tags_mp3.obj: tags_mp3.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_mp3.obj -MD -MP -MF $(DEPDIR)/xcfa-tags_mp3.Tpo -c -o xcfa-tags_mp3.obj `if test -f 'tags_mp3.c'; then $(CYGPATH_W) 'tags_mp3.c'; else $(CYGPATH_W) '$(srcdir)/tags_mp3.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_mp3.Tpo $(DEPDIR)/xcfa-tags_mp3.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_mp3.c' object='xcfa-tags_mp3.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_mp3.c' object='xcfa-tags_mp3.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_mp3.obj `if test -f 'tags_mp3.c'; then $(CYGPATH_W) 'tags_mp3.c'; else $(CYGPATH_W) '$(srcdir)/tags_mp3.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_mp3.obj `if test -f 'tags_mp3.c'; then $(CYGPATH_W) 'tags_mp3.c'; else $(CYGPATH_W) '$(srcdir)/tags_mp3.c'; fi`
 
 xcfa-tags_mpc.o: tags_mpc.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_mpc.o -MD -MP -MF $(DEPDIR)/xcfa-tags_mpc.Tpo -c -o xcfa-tags_mpc.o `test -f 'tags_mpc.c' || echo '$(srcdir)/'`tags_mpc.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_mpc.Tpo $(DEPDIR)/xcfa-tags_mpc.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_mpc.c' object='xcfa-tags_mpc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_mpc.c' object='xcfa-tags_mpc.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_mpc.o `test -f 'tags_mpc.c' || echo '$(srcdir)/'`tags_mpc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_mpc.o `test -f 'tags_mpc.c' || echo '$(srcdir)/'`tags_mpc.c
 
 xcfa-tags_mpc.obj: tags_mpc.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_mpc.obj -MD -MP -MF $(DEPDIR)/xcfa-tags_mpc.Tpo -c -o xcfa-tags_mpc.obj `if test -f 'tags_mpc.c'; then $(CYGPATH_W) 'tags_mpc.c'; else $(CYGPATH_W) '$(srcdir)/tags_mpc.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_mpc.Tpo $(DEPDIR)/xcfa-tags_mpc.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_mpc.c' object='xcfa-tags_mpc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_mpc.c' object='xcfa-tags_mpc.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_mpc.obj `if test -f 'tags_mpc.c'; then $(CYGPATH_W) 'tags_mpc.c'; else $(CYGPATH_W) '$(srcdir)/tags_mpc.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_mpc.obj `if test -f 'tags_mpc.c'; then $(CYGPATH_W) 'tags_mpc.c'; else $(CYGPATH_W) '$(srcdir)/tags_mpc.c'; fi`
 
 xcfa-tags_ogg.o: tags_ogg.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_ogg.o -MD -MP -MF $(DEPDIR)/xcfa-tags_ogg.Tpo -c -o xcfa-tags_ogg.o `test -f 'tags_ogg.c' || echo '$(srcdir)/'`tags_ogg.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_ogg.Tpo $(DEPDIR)/xcfa-tags_ogg.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_ogg.c' object='xcfa-tags_ogg.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_ogg.c' object='xcfa-tags_ogg.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_ogg.o `test -f 'tags_ogg.c' || echo '$(srcdir)/'`tags_ogg.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_ogg.o `test -f 'tags_ogg.c' || echo '$(srcdir)/'`tags_ogg.c
 
 xcfa-tags_ogg.obj: tags_ogg.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_ogg.obj -MD -MP -MF $(DEPDIR)/xcfa-tags_ogg.Tpo -c -o xcfa-tags_ogg.obj `if test -f 'tags_ogg.c'; then $(CYGPATH_W) 'tags_ogg.c'; else $(CYGPATH_W) '$(srcdir)/tags_ogg.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_ogg.Tpo $(DEPDIR)/xcfa-tags_ogg.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_ogg.c' object='xcfa-tags_ogg.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_ogg.c' object='xcfa-tags_ogg.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_ogg.obj `if test -f 'tags_ogg.c'; then $(CYGPATH_W) 'tags_ogg.c'; else $(CYGPATH_W) '$(srcdir)/tags_ogg.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_ogg.obj `if test -f 'tags_ogg.c'; then $(CYGPATH_W) 'tags_ogg.c'; else $(CYGPATH_W) '$(srcdir)/tags_ogg.c'; fi`
 
 xcfa-tags_rm.o: tags_rm.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_rm.o -MD -MP -MF $(DEPDIR)/xcfa-tags_rm.Tpo -c -o xcfa-tags_rm.o `test -f 'tags_rm.c' || echo '$(srcdir)/'`tags_rm.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_rm.Tpo $(DEPDIR)/xcfa-tags_rm.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_rm.c' object='xcfa-tags_rm.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_rm.c' object='xcfa-tags_rm.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_rm.o `test -f 'tags_rm.c' || echo '$(srcdir)/'`tags_rm.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_rm.o `test -f 'tags_rm.c' || echo '$(srcdir)/'`tags_rm.c
 
 xcfa-tags_rm.obj: tags_rm.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_rm.obj -MD -MP -MF $(DEPDIR)/xcfa-tags_rm.Tpo -c -o xcfa-tags_rm.obj `if test -f 'tags_rm.c'; then $(CYGPATH_W) 'tags_rm.c'; else $(CYGPATH_W) '$(srcdir)/tags_rm.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_rm.Tpo $(DEPDIR)/xcfa-tags_rm.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_rm.c' object='xcfa-tags_rm.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_rm.c' object='xcfa-tags_rm.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_rm.obj `if test -f 'tags_rm.c'; then $(CYGPATH_W) 'tags_rm.c'; else $(CYGPATH_W) '$(srcdir)/tags_rm.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_rm.obj `if test -f 'tags_rm.c'; then $(CYGPATH_W) 'tags_rm.c'; else $(CYGPATH_W) '$(srcdir)/tags_rm.c'; fi`
 
 xcfa-tags_shn.o: tags_shn.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_shn.o -MD -MP -MF $(DEPDIR)/xcfa-tags_shn.Tpo -c -o xcfa-tags_shn.o `test -f 'tags_shn.c' || echo '$(srcdir)/'`tags_shn.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_shn.Tpo $(DEPDIR)/xcfa-tags_shn.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_shn.c' object='xcfa-tags_shn.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_shn.c' object='xcfa-tags_shn.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_shn.o `test -f 'tags_shn.c' || echo '$(srcdir)/'`tags_shn.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_shn.o `test -f 'tags_shn.c' || echo '$(srcdir)/'`tags_shn.c
 
 xcfa-tags_shn.obj: tags_shn.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_shn.obj -MD -MP -MF $(DEPDIR)/xcfa-tags_shn.Tpo -c -o xcfa-tags_shn.obj `if test -f 'tags_shn.c'; then $(CYGPATH_W) 'tags_shn.c'; else $(CYGPATH_W) '$(srcdir)/tags_shn.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_shn.Tpo $(DEPDIR)/xcfa-tags_shn.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_shn.c' object='xcfa-tags_shn.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_shn.c' object='xcfa-tags_shn.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_shn.obj `if test -f 'tags_shn.c'; then $(CYGPATH_W) 'tags_shn.c'; else $(CYGPATH_W) '$(srcdir)/tags_shn.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_shn.obj `if test -f 'tags_shn.c'; then $(CYGPATH_W) 'tags_shn.c'; else $(CYGPATH_W) '$(srcdir)/tags_shn.c'; fi`
 
 xcfa-tags_wav.o: tags_wav.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_wav.o -MD -MP -MF $(DEPDIR)/xcfa-tags_wav.Tpo -c -o xcfa-tags_wav.o `test -f 'tags_wav.c' || echo '$(srcdir)/'`tags_wav.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_wav.Tpo $(DEPDIR)/xcfa-tags_wav.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_wav.c' object='xcfa-tags_wav.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_wav.c' object='xcfa-tags_wav.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_wav.o `test -f 'tags_wav.c' || echo '$(srcdir)/'`tags_wav.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_wav.o `test -f 'tags_wav.c' || echo '$(srcdir)/'`tags_wav.c
 
 xcfa-tags_wav.obj: tags_wav.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_wav.obj -MD -MP -MF $(DEPDIR)/xcfa-tags_wav.Tpo -c -o xcfa-tags_wav.obj `if test -f 'tags_wav.c'; then $(CYGPATH_W) 'tags_wav.c'; else $(CYGPATH_W) '$(srcdir)/tags_wav.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_wav.Tpo $(DEPDIR)/xcfa-tags_wav.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_wav.c' object='xcfa-tags_wav.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_wav.c' object='xcfa-tags_wav.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_wav.obj `if test -f 'tags_wav.c'; then $(CYGPATH_W) 'tags_wav.c'; else $(CYGPATH_W) '$(srcdir)/tags_wav.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_wav.obj `if test -f 'tags_wav.c'; then $(CYGPATH_W) 'tags_wav.c'; else $(CYGPATH_W) '$(srcdir)/tags_wav.c'; fi`
 
 xcfa-tags_wavpack.o: tags_wavpack.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_wavpack.o -MD -MP -MF $(DEPDIR)/xcfa-tags_wavpack.Tpo -c -o xcfa-tags_wavpack.o `test -f 'tags_wavpack.c' || echo '$(srcdir)/'`tags_wavpack.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_wavpack.Tpo $(DEPDIR)/xcfa-tags_wavpack.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_wavpack.c' object='xcfa-tags_wavpack.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_wavpack.c' object='xcfa-tags_wavpack.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_wavpack.o `test -f 'tags_wavpack.c' || echo '$(srcdir)/'`tags_wavpack.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_wavpack.o `test -f 'tags_wavpack.c' || echo '$(srcdir)/'`tags_wavpack.c
 
 xcfa-tags_wavpack.obj: tags_wavpack.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_wavpack.obj -MD -MP -MF $(DEPDIR)/xcfa-tags_wavpack.Tpo -c -o xcfa-tags_wavpack.obj `if test -f 'tags_wavpack.c'; then $(CYGPATH_W) 'tags_wavpack.c'; else $(CYGPATH_W) '$(srcdir)/tags_wavpack.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_wavpack.Tpo $(DEPDIR)/xcfa-tags_wavpack.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_wavpack.c' object='xcfa-tags_wavpack.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_wavpack.c' object='xcfa-tags_wavpack.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_wavpack.obj `if test -f 'tags_wavpack.c'; then $(CYGPATH_W) 'tags_wavpack.c'; else $(CYGPATH_W) '$(srcdir)/tags_wavpack.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_wavpack.obj `if test -f 'tags_wavpack.c'; then $(CYGPATH_W) 'tags_wavpack.c'; else $(CYGPATH_W) '$(srcdir)/tags_wavpack.c'; fi`
 
 xcfa-tags_wma.o: tags_wma.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_wma.o -MD -MP -MF $(DEPDIR)/xcfa-tags_wma.Tpo -c -o xcfa-tags_wma.o `test -f 'tags_wma.c' || echo '$(srcdir)/'`tags_wma.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_wma.Tpo $(DEPDIR)/xcfa-tags_wma.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_wma.c' object='xcfa-tags_wma.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_wma.c' object='xcfa-tags_wma.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_wma.o `test -f 'tags_wma.c' || echo '$(srcdir)/'`tags_wma.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_wma.o `test -f 'tags_wma.c' || echo '$(srcdir)/'`tags_wma.c
 
 xcfa-tags_wma.obj: tags_wma.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_wma.obj -MD -MP -MF $(DEPDIR)/xcfa-tags_wma.Tpo -c -o xcfa-tags_wma.obj `if test -f 'tags_wma.c'; then $(CYGPATH_W) 'tags_wma.c'; else $(CYGPATH_W) '$(srcdir)/tags_wma.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_wma.Tpo $(DEPDIR)/xcfa-tags_wma.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_wma.c' object='xcfa-tags_wma.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_wma.c' object='xcfa-tags_wma.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_wma.obj `if test -f 'tags_wma.c'; then $(CYGPATH_W) 'tags_wma.c'; else $(CYGPATH_W) '$(srcdir)/tags_wma.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_wma.obj `if test -f 'tags_wma.c'; then $(CYGPATH_W) 'tags_wma.c'; else $(CYGPATH_W) '$(srcdir)/tags_wma.c'; fi`
 
 xcfa-tags_ac3.o: tags_ac3.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_ac3.o -MD -MP -MF $(DEPDIR)/xcfa-tags_ac3.Tpo -c -o xcfa-tags_ac3.o `test -f 'tags_ac3.c' || echo '$(srcdir)/'`tags_ac3.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_ac3.Tpo $(DEPDIR)/xcfa-tags_ac3.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_ac3.c' object='xcfa-tags_ac3.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_ac3.c' object='xcfa-tags_ac3.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_ac3.o `test -f 'tags_ac3.c' || echo '$(srcdir)/'`tags_ac3.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_ac3.o `test -f 'tags_ac3.c' || echo '$(srcdir)/'`tags_ac3.c
 
 xcfa-tags_ac3.obj: tags_ac3.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-tags_ac3.obj -MD -MP -MF $(DEPDIR)/xcfa-tags_ac3.Tpo -c -o xcfa-tags_ac3.obj `if test -f 'tags_ac3.c'; then $(CYGPATH_W) 'tags_ac3.c'; else $(CYGPATH_W) '$(srcdir)/tags_ac3.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-tags_ac3.Tpo $(DEPDIR)/xcfa-tags_ac3.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tags_ac3.c' object='xcfa-tags_ac3.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tags_ac3.c' object='xcfa-tags_ac3.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_ac3.obj `if test -f 'tags_ac3.c'; then $(CYGPATH_W) 'tags_ac3.c'; else $(CYGPATH_W) '$(srcdir)/tags_ac3.c'; fi`
-
-xcfa-translate.o: translate.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-translate.o -MD -MP -MF $(DEPDIR)/xcfa-translate.Tpo -c -o xcfa-translate.o `test -f 'translate.c' || echo '$(srcdir)/'`translate.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-translate.Tpo $(DEPDIR)/xcfa-translate.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='translate.c' object='xcfa-translate.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-translate.o `test -f 'translate.c' || echo '$(srcdir)/'`translate.c
-
-xcfa-translate.obj: translate.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-translate.obj -MD -MP -MF $(DEPDIR)/xcfa-translate.Tpo -c -o xcfa-translate.obj `if test -f 'translate.c'; then $(CYGPATH_W) 'translate.c'; else $(CYGPATH_W) '$(srcdir)/translate.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-translate.Tpo $(DEPDIR)/xcfa-translate.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='translate.c' object='xcfa-translate.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-translate.obj `if test -f 'translate.c'; then $(CYGPATH_W) 'translate.c'; else $(CYGPATH_W) '$(srcdir)/translate.c'; fi`
-
-xcfa-treeview.o: treeview.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-treeview.o -MD -MP -MF $(DEPDIR)/xcfa-treeview.Tpo -c -o xcfa-treeview.o `test -f 'treeview.c' || echo '$(srcdir)/'`treeview.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-treeview.Tpo $(DEPDIR)/xcfa-treeview.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='treeview.c' object='xcfa-treeview.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-treeview.o `test -f 'treeview.c' || echo '$(srcdir)/'`treeview.c
-
-xcfa-treeview.obj: treeview.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-treeview.obj -MD -MP -MF $(DEPDIR)/xcfa-treeview.Tpo -c -o xcfa-treeview.obj `if test -f 'treeview.c'; then $(CYGPATH_W) 'treeview.c'; else $(CYGPATH_W) '$(srcdir)/treeview.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-treeview.Tpo $(DEPDIR)/xcfa-treeview.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='treeview.c' object='xcfa-treeview.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-treeview.obj `if test -f 'treeview.c'; then $(CYGPATH_W) 'treeview.c'; else $(CYGPATH_W) '$(srcdir)/treeview.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-tags_ac3.obj `if test -f 'tags_ac3.c'; then $(CYGPATH_W) 'tags_ac3.c'; else $(CYGPATH_W) '$(srcdir)/tags_ac3.c'; fi`
 
 xcfa-web.o: web.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-web.o -MD -MP -MF $(DEPDIR)/xcfa-web.Tpo -c -o xcfa-web.o `test -f 'web.c' || echo '$(srcdir)/'`web.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-web.Tpo $(DEPDIR)/xcfa-web.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='web.c' object='xcfa-web.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='web.c' object='xcfa-web.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-web.o `test -f 'web.c' || echo '$(srcdir)/'`web.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-web.o `test -f 'web.c' || echo '$(srcdir)/'`web.c
 
 xcfa-web.obj: web.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-web.obj -MD -MP -MF $(DEPDIR)/xcfa-web.Tpo -c -o xcfa-web.obj `if test -f 'web.c'; then $(CYGPATH_W) 'web.c'; else $(CYGPATH_W) '$(srcdir)/web.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-web.Tpo $(DEPDIR)/xcfa-web.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='web.c' object='xcfa-web.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='web.c' object='xcfa-web.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-web.obj `if test -f 'web.c'; then $(CYGPATH_W) 'web.c'; else $(CYGPATH_W) '$(srcdir)/web.c'; fi`
+
+xcfa-win_treeview.o: win_treeview.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-win_treeview.o -MD -MP -MF $(DEPDIR)/xcfa-win_treeview.Tpo -c -o xcfa-win_treeview.o `test -f 'win_treeview.c' || echo '$(srcdir)/'`win_treeview.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-win_treeview.Tpo $(DEPDIR)/xcfa-win_treeview.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='win_treeview.c' object='xcfa-win_treeview.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-web.obj `if test -f 'web.c'; then $(CYGPATH_W) 'web.c'; else $(CYGPATH_W) '$(srcdir)/web.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-win_treeview.o `test -f 'win_treeview.c' || echo '$(srcdir)/'`win_treeview.c
+
+xcfa-win_treeview.obj: win_treeview.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-win_treeview.obj -MD -MP -MF $(DEPDIR)/xcfa-win_treeview.Tpo -c -o xcfa-win_treeview.obj `if test -f 'win_treeview.c'; then $(CYGPATH_W) 'win_treeview.c'; else $(CYGPATH_W) '$(srcdir)/win_treeview.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-win_treeview.Tpo $(DEPDIR)/xcfa-win_treeview.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='win_treeview.c' object='xcfa-win_treeview.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-win_treeview.obj `if test -f 'win_treeview.c'; then $(CYGPATH_W) 'win_treeview.c'; else $(CYGPATH_W) '$(srcdir)/win_treeview.c'; fi`
 
 xcfa-win_about.o: win_about.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-win_about.o -MD -MP -MF $(DEPDIR)/xcfa-win_about.Tpo -c -o xcfa-win_about.o `test -f 'win_about.c' || echo '$(srcdir)/'`win_about.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-win_about.Tpo $(DEPDIR)/xcfa-win_about.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='win_about.c' object='xcfa-win_about.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='win_about.c' object='xcfa-win_about.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-win_about.o `test -f 'win_about.c' || echo '$(srcdir)/'`win_about.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-win_about.o `test -f 'win_about.c' || echo '$(srcdir)/'`win_about.c
 
 xcfa-win_about.obj: win_about.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-win_about.obj -MD -MP -MF $(DEPDIR)/xcfa-win_about.Tpo -c -o xcfa-win_about.obj `if test -f 'win_about.c'; then $(CYGPATH_W) 'win_about.c'; else $(CYGPATH_W) '$(srcdir)/win_about.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-win_about.Tpo $(DEPDIR)/xcfa-win_about.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='win_about.c' object='xcfa-win_about.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='win_about.c' object='xcfa-win_about.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-win_about.obj `if test -f 'win_about.c'; then $(CYGPATH_W) 'win_about.c'; else $(CYGPATH_W) '$(srcdir)/win_about.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-win_about.obj `if test -f 'win_about.c'; then $(CYGPATH_W) 'win_about.c'; else $(CYGPATH_W) '$(srcdir)/win_about.c'; fi`
 
 xcfa-win_info.o: win_info.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-win_info.o -MD -MP -MF $(DEPDIR)/xcfa-win_info.Tpo -c -o xcfa-win_info.o `test -f 'win_info.c' || echo '$(srcdir)/'`win_info.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-win_info.Tpo $(DEPDIR)/xcfa-win_info.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='win_info.c' object='xcfa-win_info.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='win_info.c' object='xcfa-win_info.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-win_info.o `test -f 'win_info.c' || echo '$(srcdir)/'`win_info.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-win_info.o `test -f 'win_info.c' || echo '$(srcdir)/'`win_info.c
 
 xcfa-win_info.obj: win_info.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-win_info.obj -MD -MP -MF $(DEPDIR)/xcfa-win_info.Tpo -c -o xcfa-win_info.obj `if test -f 'win_info.c'; then $(CYGPATH_W) 'win_info.c'; else $(CYGPATH_W) '$(srcdir)/win_info.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-win_info.Tpo $(DEPDIR)/xcfa-win_info.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='win_info.c' object='xcfa-win_info.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='win_info.c' object='xcfa-win_info.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-win_info.obj `if test -f 'win_info.c'; then $(CYGPATH_W) 'win_info.c'; else $(CYGPATH_W) '$(srcdir)/win_info.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-win_info.obj `if test -f 'win_info.c'; then $(CYGPATH_W) 'win_info.c'; else $(CYGPATH_W) '$(srcdir)/win_info.c'; fi`
 
 xcfa-win_reader.o: win_reader.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-win_reader.o -MD -MP -MF $(DEPDIR)/xcfa-win_reader.Tpo -c -o xcfa-win_reader.o `test -f 'win_reader.c' || echo '$(srcdir)/'`win_reader.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-win_reader.Tpo $(DEPDIR)/xcfa-win_reader.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='win_reader.c' object='xcfa-win_reader.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='win_reader.c' object='xcfa-win_reader.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-win_reader.o `test -f 'win_reader.c' || echo '$(srcdir)/'`win_reader.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-win_reader.o `test -f 'win_reader.c' || echo '$(srcdir)/'`win_reader.c
 
 xcfa-win_reader.obj: win_reader.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-win_reader.obj -MD -MP -MF $(DEPDIR)/xcfa-win_reader.Tpo -c -o xcfa-win_reader.obj `if test -f 'win_reader.c'; then $(CYGPATH_W) 'win_reader.c'; else $(CYGPATH_W) '$(srcdir)/win_reader.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-win_reader.Tpo $(DEPDIR)/xcfa-win_reader.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='win_reader.c' object='xcfa-win_reader.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='win_reader.c' object='xcfa-win_reader.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-win_reader.obj `if test -f 'win_reader.c'; then $(CYGPATH_W) 'win_reader.c'; else $(CYGPATH_W) '$(srcdir)/win_reader.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-win_reader.obj `if test -f 'win_reader.c'; then $(CYGPATH_W) 'win_reader.c'; else $(CYGPATH_W) '$(srcdir)/win_reader.c'; fi`
 
 xcfa-win_scan.o: win_scan.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-win_scan.o -MD -MP -MF $(DEPDIR)/xcfa-win_scan.Tpo -c -o xcfa-win_scan.o `test -f 'win_scan.c' || echo '$(srcdir)/'`win_scan.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-win_scan.Tpo $(DEPDIR)/xcfa-win_scan.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='win_scan.c' object='xcfa-win_scan.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='win_scan.c' object='xcfa-win_scan.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-win_scan.o `test -f 'win_scan.c' || echo '$(srcdir)/'`win_scan.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-win_scan.o `test -f 'win_scan.c' || echo '$(srcdir)/'`win_scan.c
 
 xcfa-win_scan.obj: win_scan.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-win_scan.obj -MD -MP -MF $(DEPDIR)/xcfa-win_scan.Tpo -c -o xcfa-win_scan.obj `if test -f 'win_scan.c'; then $(CYGPATH_W) 'win_scan.c'; else $(CYGPATH_W) '$(srcdir)/win_scan.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-win_scan.Tpo $(DEPDIR)/xcfa-win_scan.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='win_scan.c' object='xcfa-win_scan.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='win_scan.c' object='xcfa-win_scan.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-win_scan.obj `if test -f 'win_scan.c'; then $(CYGPATH_W) 'win_scan.c'; else $(CYGPATH_W) '$(srcdir)/win_scan.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-win_scan.obj `if test -f 'win_scan.c'; then $(CYGPATH_W) 'win_scan.c'; else $(CYGPATH_W) '$(srcdir)/win_scan.c'; fi`
 
 xcfa-win_vte.o: win_vte.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-win_vte.o -MD -MP -MF $(DEPDIR)/xcfa-win_vte.Tpo -c -o xcfa-win_vte.o `test -f 'win_vte.c' || echo '$(srcdir)/'`win_vte.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-win_vte.Tpo $(DEPDIR)/xcfa-win_vte.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='win_vte.c' object='xcfa-win_vte.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='win_vte.c' object='xcfa-win_vte.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-win_vte.o `test -f 'win_vte.c' || echo '$(srcdir)/'`win_vte.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-win_vte.o `test -f 'win_vte.c' || echo '$(srcdir)/'`win_vte.c
 
 xcfa-win_vte.obj: win_vte.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xcfa-win_vte.obj -MD -MP -MF $(DEPDIR)/xcfa-win_vte.Tpo -c -o xcfa-win_vte.obj `if test -f 'win_vte.c'; then $(CYGPATH_W) 'win_vte.c'; else $(CYGPATH_W) '$(srcdir)/win_vte.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xcfa-win_vte.Tpo $(DEPDIR)/xcfa-win_vte.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='win_vte.c' object='xcfa-win_vte.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='win_vte.c' object='xcfa-win_vte.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-win_vte.obj `if test -f 'win_vte.c'; then $(CYGPATH_W) 'win_vte.c'; else $(CYGPATH_W) '$(srcdir)/win_vte.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xcfa_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xcfa-win_vte.obj `if test -f 'win_vte.c'; then $(CYGPATH_W) 'win_vte.c'; else $(CYGPATH_W) '$(srcdir)/win_vte.c'; fi`
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
 
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	 test -n "$$unique" || unique=$$empty_fix; \
@@ -2034,15 +1894,11 @@
 	 $$unique; \
 	 fi; \
 	fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	 $$unique
@@ -2051,6 +1907,21 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	 && $(am__cd) $(top_srcdir) \
 	 && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	 [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	 *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	 if test -f "$$i"; then \
+	 echo "$(subdir)/$$i"; \
+	 else \
+	 echo "$$sdir/$$i"; \
+	 fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -2102,10 +1973,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	 `test -z '$(STRIP)' || \
-	 echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 install; \
+	else \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -2188,18 +2064,21 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic ctags distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
+	distclean distclean-compile distclean-generic distclean-tags \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-binPROGRAMS install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-binPROGRAMS
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

xcfa-4.2.8.tar.gz/src/alsa_audio.c -> xcfa-5.0.2.tar.gz/src/alsa_audio.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : alsa_audio.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -38,11 +38,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 
 #include <errno.h>
@@ -58,29 +53,29 @@
 
 
 VAR_ALSA VarAlsa = {
-	NULL,		// snd_pcm_t	*playback_handle;			// Handle
-	0,		// guint	bytesPerFrame;				// 8, 16, 24, 32, 64 ...
-	0,		// guint	channels;				// 1, 2, 4 ...
-	0,		// gint		SampleRate;				// Frequence: 44100 ...
-	0,		// gint		TotalChunckSize;			// 
-	NULL,		// guchar	*buffer;				// Pointeur de buffer
-	0,		// guint	SizeBuffer;				// Taille requise du buffer
-	0,		// gint		Sec;					// Duree total en secondes
-	0.0,		// gdouble	Percent;				// Poucentage en retour sur la duree total
-	0.0,		// gdouble	PercentSel;				// Poucentage en retour depuis la selection
+	NULL,		// snd_pcm_t	*playback_handle;					// Handle
+	0,			// guint	bytesPerFrame;							// 8, 16, 24, 32, 64 ...
+	0,			// guint	channels;								// 1, 2, 4 ...
+	0,			// gint		SampleRate;								// Frequence: 44100 ...
+	0,			// gint		TotalChunckSize;						// 
+	NULL,		// guchar	*buffer;								// Pointeur de buffer
+	0,			// guint	SizeBuffer;								// Taille requise du buffer
+	0,			// gint		Sec;									// Duree total en secondes
+	0.0,		// gdouble	Percent;								// Poucentage en retour sur la duree total
+	0.0,		// gdouble	PercentSel;								// Poucentage en retour depuis la selection
 	
-	0.0,		// gdouble	PercentBegin;				// 
-	0.0,		// gdouble	PercentEnd;				// 
+	0.0,		// gdouble	PercentBegin;							// 
+	0.0,		// gdouble	PercentEnd;								// 
 	
-	FALSE,		// gboolean	BoolThreadEnd;				// 
-	0,		// guint	HandlerTimeout;				// 
+	FALSE,		// gboolean	BoolThreadEnd;							// 
+	0,			// guint	HandlerTimeout;							// 
 	
-	TRUE,		// gboolean	StopPlay;				// 
-	TRUE,		// gboolean	PauseAlsa;				// 
+	TRUE,		// gboolean	StopPlay;								// 
+	TRUE,		// gboolean	PauseAlsa;								// 
 	NULL,		// void		(*FuncSetValueTime) (gdouble p_value);	// 
-	NULL,		// void		(*FuncIconeStop) (void);		// 
+	NULL,		// void		(*FuncIconeStop) (void);				// 
 	
-	NULL		// FILE		*pFile;					// Handler du fichier ouvert
+	NULL		// FILE		*pFile;									// Handler du fichier ouvert
 };
 
 
@@ -169,9 +164,9 @@
 gboolean AlsaAudio_open_device(
 	const gchar *audio_dev,		// "default"
 	gint p_bitsPerSample,		// 8, 16, 24, ...
-	gint p_channels,		// 1, 2, 4, , ...
+	gint p_channels,			// 1, 2, 4, , ...
 	guint p_samplesPerSec,		// 44100, ...
-	guint *p_bufferSize		// Taille buffer retournee
+	guint *p_bufferSize			// Taille buffer retournee
 	)
 {
 	gint err;
@@ -207,7 +202,8 @@
 	}
 	else {
 		PRINT_FUNC_LF();
-		g_print("Format de bitrate [ %d ] non prit en charge\n", p_bitsPerSample);
+		if( TRUE == OptionsCommandLine.BoolVerboseMode )
+			g_print("Format de bitrate [ %d ] non prit en charge\n", p_bitsPerSample);
 		return (FALSE);	
 	}
 	
@@ -218,19 +214,22 @@
 	/* setup dsp device */
 	err = snd_pcm_open(&VarAlsa.playback_handle, audio_dev, SND_PCM_STREAM_PLAYBACK, 0);
 	if (err < 0 ) {
-		fprintf(stderr, "cannot open audio device %s (%s)\n", audio_dev, snd_strerror(err));
+		if( TRUE == OptionsCommandLine.BoolVerboseMode )
+			fprintf(stderr, "cannot open audio device %s (%s)\n", audio_dev, snd_strerror(err));
 		return (FALSE);
 	}
 
 	err = snd_pcm_hw_params_malloc(&hw_params);
 	if (err < 0 ) {
-		fprintf(stderr, "cannot allocate hardware parameter structure (%s)\n", snd_strerror(err));
+		if( TRUE == OptionsCommandLine.BoolVerboseMode )
+			fprintf(stderr, "cannot allocate hardware parameter structure (%s)\n", snd_strerror(err));
 		return (FALSE);
 	}
 
 	err = snd_pcm_hw_params_any(VarAlsa.playback_handle, hw_params);
 	if (err < 0 ) {
-		fprintf(stderr, "cannot initialize hardware parameter structure (%s)\n", snd_strerror(err));
+		if( TRUE == OptionsCommandLine.BoolVerboseMode )
+			fprintf(stderr, "cannot initialize hardware parameter structure (%s)\n", snd_strerror(err));
 		return (FALSE);
 	}
 
@@ -243,7 +242,8 @@
 	/* set format */
 	err = snd_pcm_hw_params_set_format(VarAlsa.playback_handle, hw_params, format);
 	if (err < 0 ) {
-		fprintf(stderr, "cannot set sample format (%s)\n", snd_strerror(err));
+		if( TRUE == OptionsCommandLine.BoolVerboseMode )
+			fprintf(stderr, "cannot set sample format (%s)\n", snd_strerror(err));
 		return (FALSE);
 	}
 
@@ -251,47 +251,54 @@
 	rrate = rate;
 	err = snd_pcm_hw_params_set_rate_near(VarAlsa.playback_handle, hw_params, &rrate, 0);
 	if (err < 0 ) {
-		fprintf(stderr, "cannot set sample rate (%s)\n", snd_strerror(err));
+		if( TRUE == OptionsCommandLine.BoolVerboseMode )
+			fprintf(stderr, "cannot set sample rate (%s)\n", snd_strerror(err));
 		return (FALSE);
 	}
 
 	/* set channels */
 	err = snd_pcm_hw_params_set_channels(VarAlsa.playback_handle, hw_params, VarAlsa.channels);
 	if (err < 0 ) {
-		fprintf(stderr, "cannot set channel count (%s)\n", snd_strerror(err));
+		if( TRUE == OptionsCommandLine.BoolVerboseMode )
+			fprintf(stderr, "cannot set channel count (%s)\n", snd_strerror(err));
 		return (FALSE);
 	}
 
 	/* set the buffer time */
 	err = snd_pcm_hw_params_set_buffer_time_near(VarAlsa.playback_handle, hw_params, &buffer_time, &dir);
 	if (err < 0 ) {
-		printf("Unable to set buffer time %i for playback: %s\n", buffer_time, snd_strerror(err));
+		if( TRUE == OptionsCommandLine.BoolVerboseMode )
+			printf("Unable to set buffer time %i for playback: %s\n", buffer_time, snd_strerror(err));
 		return (FALSE);
 	}
 
 	/* set the period time */
 	err = snd_pcm_hw_params_set_period_time_near(VarAlsa.playback_handle, hw_params, &period_time, &dir);
 	if (err < 0 ) {
-		printf("Unable to set period time %i for playback: %s\n", period_time, snd_strerror(err));
+		if( TRUE == OptionsCommandLine.BoolVerboseMode )
+			printf("Unable to set period time %i for playback: %s\n", period_time, snd_strerror(err));
 		return (FALSE);
 	}
 
 	/* commit parameters */
 	err = snd_pcm_hw_params(VarAlsa.playback_handle, hw_params);
 	if (err < 0 ) {
-		fprintf(stderr, "cannot set parameters (%s)\n", snd_strerror(err));
+		if( TRUE == OptionsCommandLine.BoolVerboseMode )
+			fprintf(stderr, "cannot set parameters (%s)\n", snd_strerror(err));
 		return (FALSE);
 	}
 
 	err = snd_pcm_hw_params_get_buffer_size(hw_params, &buffer_size);
 	if (err < 0 ) {
-		printf("Unable to get buffer size for playback: %s\n", snd_strerror(err));
+		if( TRUE == OptionsCommandLine.BoolVerboseMode )
+			printf("Unable to get buffer size for playback: %s\n", snd_strerror(err));
 		return (FALSE);
 	}
 
 	err = snd_pcm_hw_params_get_period_size(hw_params, &period_size, 0);
 	if (err < 0 ) {
-		printf("Unable to get period size for playback: %s\n", snd_strerror(err));
+		if( TRUE == OptionsCommandLine.BoolVerboseMode )
+			printf("Unable to get period size for playback: %s\n", snd_strerror(err));
 		return (FALSE);
 	}
 	*p_bufferSize = snd_pcm_frames_to_bytes(VarAlsa.playback_handle, period_size);
@@ -300,7 +307,8 @@
 
 	err = snd_pcm_prepare(VarAlsa.playback_handle);
 	if (err < 0 ) {
-		fprintf(stderr, "cannot prepare audio interface for use (%s)\n", snd_strerror(err));
+		if( TRUE == OptionsCommandLine.BoolVerboseMode )
+			fprintf(stderr, "cannot prepare audio interface for use (%s)\n", snd_strerror(err));
 		return (FALSE);
 	}

xcfa-4.2.8.tar.gz/src/alsa_audio.h -> xcfa-5.0.2.tar.gz/src/alsa_audio.h Changed

@@ -1,9 +1,9 @@
 /*
 * file : alsa_audio.h
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -41,39 +41,39 @@
 #include <alsa/asoundlib.h>
 
 typedef struct {
-	snd_pcm_t	*playback_handle;			// Handle
-	guint		bytesPerFrame;				// 8, 16, 24, 32, 64 ...
-	guint		channels;				// 1, 2, 4 ...
-	gint		SampleRate;				// Frequence: 44100 ...
-	gint		TotalChunckSize;			// 
-	guchar		*buffer;				// Pointeur de buffer
-	guint		SizeBuffer;				// Taille requise du buffer
-	gint		Sec;					// Duree total en secondes
-	gdouble		Percent;				// Poucentage en retour sur la duree total
-	gdouble		PercentSel;				// Poucentage en retour depuis la selection
+	snd_pcm_t	*playback_handle;							// Handle
+	guint		bytesPerFrame;								// 8, 16, 24, 32, 64 ...
+	guint		channels;									// 1, 2, 4 ...
+	gint		SampleRate;									// Frequence: 44100 ...
+	gint		TotalChunckSize;							// 
+	guchar		*buffer;									// Pointeur de buffer
+	guint		SizeBuffer;									// Taille requise du buffer
+	gint		Sec;										// Duree total en secondes
+	gdouble		Percent;									// Poucentage en retour sur la duree total
+	gdouble		PercentSel;									// Poucentage en retour depuis la selection
 	
-	gdouble		PercentBegin;				// 
-	gdouble		PercentEnd;				// 
+	gdouble		PercentBegin;								// 
+	gdouble		PercentEnd;									// 
 	
-	gboolean	BoolThreadEnd;				// 
-	guint		HandlerTimeout;				// 
+	gboolean	BoolThreadEnd;								// 
+	guint		HandlerTimeout;								// 
 	
-	gboolean	StopPlay;				// 
-	gboolean	PauseAlsa;				// 
-	void		(*FuncSetValueTime) (gdouble p_value);	// 
-	void		(*FuncIconeStop) (void);		// 
+	gboolean	StopPlay;									// 
+	gboolean	PauseAlsa;									// 
+	void		(*FuncSetValueTime) (gdouble p_value);
+	void		(*FuncIconeStop) (void);					// 
 	
-	FILE		*pFile;					// Handler du fichier ouvert
+	FILE		*pFile;										// Handler du fichier ouvert
 } VAR_ALSA;
 
 extern VAR_ALSA VarAlsa;
 
 void AlsaAudio_close_device (void);
 gboolean AlsaAudio_open_device (const gchar *audio_dev,		// default
-				gint p_bitsPerSample,		// 8, 16, 24, ...
-				gint p_channels,		// 1, 2, 4, ...
-				guint p_samplesPerSec,		// 44100, ...
-				guint *p_bufferSize);		// Taille buffer retournee
+				gint p_bitsPerSample,						// 8, 16, 24, ...
+				gint p_channels,							// 1, 2, 4, ...
+				guint p_samplesPerSec,						// 44100, ...
+				guint *p_bufferSize);						// Taille buffer retournee
 gboolean AlsaAudio_write (gint size);

xcfa-4.2.8.tar.gz/src/alsa_play.c -> xcfa-5.0.2.tar.gz/src/alsa_play.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : alsa_play.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -30,11 +30,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <string.h>
@@ -89,7 +84,7 @@
 	AlsaPlay_TRet = 0.0;
 	
 	while ((Ret = fread (VarAlsa.buffer, 1, VarAlsa.SizeBuffer, VarAlsa.pFile)) > 0) {
-		
+				
 		if (VarAlsa.StopPlay == TRUE) break;
 				
 		AlsaPlay_TRet += Ret;
@@ -147,7 +142,7 @@
 		fclose (VarAlsa.pFile);
 		VarAlsa.pFile = NULL;
 		AlsaAudio_close_device ();
-		gtk_timeout_remove (VarAlsa.HandlerTimeout);
+		g_source_remove (VarAlsa.HandlerTimeout);
 
 		if (NULL != VarAlsa.FuncSetValueTime) (*VarAlsa.FuncSetValueTime) (VarAlsa.PercentSel);
 		if (NULL != VarAlsa.FuncIconeStop) (*VarAlsa.FuncIconeStop) ();
@@ -222,11 +217,11 @@
 	
 	// TEST OUVERTURE DEVICE
 	BoolOpenDevice = AlsaAudio_open_device(
-			"default",				// const char *audio_dev,		default
+			"default",							// const char *audio_dev,		default
 			WaveHeader.FMT.BitsPerSample,		// int p_bitsPerSample,			8, 16, 24, ...
-			WaveHeader.FMT.NumChannels,		// int p_channels,			1, 2, 4, ...
-			WaveHeader.FMT.SampleRate,		// unsigned int p_samplesPerSec		44100, ...
-			&VarAlsa.SizeBuffer			// unsigned int *p_bufferSize,		Taille buffer retournee
+			WaveHeader.FMT.NumChannels,			// int p_channels,			1, 2, 4, ...
+			WaveHeader.FMT.SampleRate,			// unsigned int p_samplesPerSec		44100, ...
+			&VarAlsa.SizeBuffer					// unsigned int *p_bufferSize,		Taille buffer retournee
 			);
 	
 	if (BoolOpenDevice == TRUE) {
@@ -241,7 +236,7 @@
 			g_print ("\t%s\n", NameFile);
 		pthread_create (&nmr_tid, NULL ,(void *)AlsaPlay_thread, (void *)NULL);
 		PRINT("DEBUT TIMEOUT ALSA");
-		VarAlsa.HandlerTimeout = gtk_timeout_add (100, AlsaPlay_timeout, 0);
+		VarAlsa.HandlerTimeout = g_timeout_add (100, AlsaPlay_timeout, 0);
 	}
 	else {
 		fclose (VarAlsa.pFile);

xcfa-4.2.8.tar.gz/src/alsa_play.h -> xcfa-5.0.2.tar.gz/src/alsa_play.h Changed

xcfa-5.0.2.tar.gz/src/builder.c Added

@@ -0,0 +1,104 @@
+/*
+ * file : src/builder.c
+ * project : xcfa
+ * copyright : (C) 2015 by BULIN Claude
+ * 
+ * This file is part of xcfa project
+ * 
+ * xcfa is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ * 
+ * xcfa is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+#include <gtk/gtk.h>
+#include <string.h>
+
+#ifdef ENABLE_STATIC_LIBRARY
+	#include "../lib/lib.h"
+#endif
+
+#include "global.h"
+
+GtkBuilder *Builder_open( gchar *p_name_glade, GtkBuilder *p_GtkBuilder )
+{
+	GError			*p_err = NULL;
+	gchar			*CurrentDir = g_get_current_dir ();
+	gchar			*PathCurrentDir = NULL;
+	gchar			*PathShareProjet = NULL;
+	gchar			*Path = NULL;
+	GtkBuilder		*GtkBuilderLocal = NULL;
+	// if exist alloc return ok
+	if( NULL != p_GtkBuilder ) {
+		return( p_GtkBuilder );
+	}
+	// if not init return
+	if( NULL == ( GtkBuilderLocal = gtk_builder_new() )) {
+		return( NULL );
+	}
+	gtk_builder_set_translation_domain( GtkBuilderLocal, GETTEXT_PACKAGE );
+	PathCurrentDir = g_strdup_printf( "%s/glade/%s", CurrentDir, p_name_glade );
+	g_free( CurrentDir );
+	CurrentDir = NULL;
+/**
+#ifdef ENABLE_XDG
+	printf(" SEARCH WITH XDG\n" );
+	PathShareProjet = xdg_search_data_xdg( p_name_glade );
+#else
+	printf(" SEARCH WITH-OUT XDG\n" );
+	PathShareProjet = g_strdup_printf( "%s/%s/%s", DATA_DIR, PACKAGE_NAME, p_name_glade );
+#endif
+*/
+	if( NULL == (PathShareProjet = xdg_search_data_xdg( p_name_glade )))
+		PathShareProjet = g_strdup_printf( "%s/%s/%s", DATA_DIR, PACKAGE_NAME, p_name_glade );
+	
+	if( FALSE == g_file_test( PathCurrentDir, G_FILE_TEST_EXISTS ) && FALSE == g_file_test( PathShareProjet, G_FILE_TEST_EXISTS )) {
+		g_print( "!---------------------------------------------------------------------------------------------------\n" );
+		g_print( "! LE FICHIER XML: [ %s ] N'EXISTE PAS !!!\n", PathCurrentDir );
+		g_print( "!---------------------------------------------------------------------------------------------------\n" );
+		g_print( "! LE FICHIER XML: [ %s ] N'EXISTE PAS !!!\n", PathShareProjet );
+		g_print( "!---------------------------------------------------------------------------------------------------\n" );
+		g_free( PathCurrentDir );
+		PathCurrentDir = NULL;
+		g_free( PathShareProjet );
+		PathShareProjet = NULL;
+		return( NULL );
+	}
+	else if( TRUE == g_file_test( PathCurrentDir, G_FILE_TEST_EXISTS )) {
+		Path = PathCurrentDir;
+	}
+	else if( TRUE == g_file_test( PathShareProjet, G_FILE_TEST_EXISTS )) {
+		Path = PathShareProjet;
+	}
+	// g_print( "\nPATHNAME FILE %s: %s\n\n", p_name_glade, Path );
+	if( gtk_builder_add_from_file( GtkBuilderLocal, Path, &p_err) <= 0 ) {
+		g_warning( "Couldn't load builder file: %s", p_err->message );
+		g_error_free( p_err );
+		g_free( PathCurrentDir );
+		PathCurrentDir = NULL;
+		g_free( PathShareProjet );
+		PathShareProjet = NULL;
+		Path = NULL;
+		return( NULL );
+	}
+	g_free( PathCurrentDir );
+	PathCurrentDir = NULL;
+	g_free( PathShareProjet );
+	PathShareProjet = NULL;
+	Path = NULL;
+	return( GtkBuilderLocal );
+}
+

xcfa-4.2.8.tar.gz/src/cd_audio.c -> xcfa-5.0.2.tar.gz/src/cd_audio.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : cd_audio.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -30,11 +30,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <string.h>
@@ -129,9 +124,9 @@
 
 } ARTICLES_CD;
 
-GArray *Articles_cd = NULL;			/* */
-VAR_CD var_cd;				/* */
-ENTETE_CD EnteteCD;				/* */
+GArray *Articles_cd = NULL;
+VAR_CD var_cd;
+ENTETE_CD EnteteCD;
 
 gboolean BoolPathCaractersStrip = FALSE;
 
@@ -573,8 +568,8 @@
 	gint NumTrack = -1;
 	GdkPixbuf *Pixbuf = NULL;
 	gint Pos_X, Pos_Y;
-	gboolean bool_key_Control = (keys.keyval == GDK_Control_L || keys.keyval == GDK_Control_R);
-	gboolean bool_key_Shift = (keys.keyval == GDK_Shift_L || keys.keyval == GDK_Shift_R);
+	gboolean bool_key_Control = (keys.keyval == GDK_KEY_Control_L || keys.keyval == GDK_KEY_Control_R);
+	gboolean bool_key_Shift = (keys.keyval == GDK_KEY_Shift_L || keys.keyval == GDK_KEY_Shift_R);
 	gboolean bool_key_Release = (bool_key_Control == FALSE && bool_key_Shift == FALSE);
 	gboolean bool_click_droit = (event->button == 3);
 	gboolean bool_click_gauche = (event->button == 1);
@@ -638,19 +633,19 @@
 			/* g_print ("\tNUM IS: %d\n", i); */
 			switch ( i ) {
 			case NUM_TREE_CDAUDIO_PLAY :		BoolSelectColPlay		= TRUE;	break;
-			case NUM_TREE_CDAUDIO_WAV :		BoolSelectColWav		= TRUE;	break;
+			case NUM_TREE_CDAUDIO_WAV :			BoolSelectColWav		= TRUE;	break;
 			case NUM_TREE_CDAUDIO_FLAC :		BoolSelectColFlac		= TRUE;	break;
-			case NUM_TREE_CDAUDIO_APE :		BoolSelectColApe		= TRUE;	break;
+			case NUM_TREE_CDAUDIO_APE :			BoolSelectColApe		= TRUE;	break;
 			case NUM_TREE_CDAUDIO_WAVP :		BoolSelectColWavP		= TRUE;	break;
-			case NUM_TREE_CDAUDIO_OGG :		BoolSelectColOgg		= TRUE;	break;
-			case NUM_TREE_CDAUDIO_M4A :		BoolSelectColM4a		= TRUE;	break;
-			case NUM_TREE_CDAUDIO_AAC :		BoolSelectColAac		= TRUE;	break;
-			case NUM_TREE_CDAUDIO_MPC :		BoolSelectColMpc		= TRUE;	break;
-			case NUM_TREE_CDAUDIO_MP3 :		BoolSelectColMp3		= TRUE;	break;
-			case NUM_TREE_CDAUDIO_NUM :							break;
+			case NUM_TREE_CDAUDIO_OGG :			BoolSelectColOgg		= TRUE;	break;
+			case NUM_TREE_CDAUDIO_M4A :			BoolSelectColM4a		= TRUE;	break;
+			case NUM_TREE_CDAUDIO_AAC :			BoolSelectColAac		= TRUE;	break;
+			case NUM_TREE_CDAUDIO_MPC :			BoolSelectColMpc		= TRUE;	break;
+			case NUM_TREE_CDAUDIO_MP3 :			BoolSelectColMp3		= TRUE;	break;
+			case NUM_TREE_CDAUDIO_NUM :			break;
 			case NUM_TREE_CDAUDIO_TIME :		BoolSelectColTime		= TRUE;	break;
 			case NUM_TREE_CDAUDIO_NORMALISE :	BoolSelectColNormalise		= TRUE;	break;
-			case NUM_TREE_CDAUDIO_NOM :		BoolSelectColNom		= TRUE;	break;
+			case NUM_TREE_CDAUDIO_NOM :			BoolSelectColNom		= TRUE;	break;
 			
 			default: return (FALSE);
 			}
@@ -658,6 +653,9 @@
 			break;
 		}
 	}
+	// TODO
+	if( BoolSelectColNom );
+	if( BoolSelectColTime );
 	/*
 	BoolSelectColPlay = strcmp(column->title, "Play") == 0 ? TRUE : FALSE;
 	BoolSelectColWav = strcmp(column->title, "Wav") == 0 ? TRUE : FALSE;
@@ -811,9 +809,10 @@
 		
 		if (TRUE == mplayer_is_used ()) {
 
-			wininfo_create (
-				_("MPLAYER deja en action"),
-				_("MPLAYER est deja utilise !!"),
+			wind_info_init (
+				WindMain,
+				_("MPLAYER already in action"),
+				_("MPLAYER is already in use !!"),
 				 "");
 		}
 		else {
@@ -832,7 +831,8 @@
 				StrTitle = g_strdup_printf("CD Read - Track %s", piste);
 				// APPEL DE mplayer_init AVANT WinReader_open ()
 				mplayer_init (LIST_MPLAYER_FROM_CD, 0.0, 0, WinReader_close, WinReader_set_value, cdaudio_set_icone_stop, WinReader_is_close);
-				WinReader_open (StrTitle);
+				// WinReader_open (StrTitle);
+				wind_reader_init( WindMain );
 				g_free (StrTitle);
 				StrTitle = NULL;
 				WinReader_set_pause ();
@@ -1224,28 +1224,28 @@
 	// switch (p_EtatSelectionCd) {
 	switch ( etat ) {
 	case CD_ETAT_NONE :
-		StatusBar_set_mess( NOTEBOOK_CD_AUDIO, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / En attente de selection."));
+		StatusBar_set_mess( NOTEBOOK_CD_AUDIO, _STATUSBAR_SIMPLE_, _("(Right click = Menu) / Waiting for selection."));
 		break;
 	case CD_ETAT_PRG_ABSENT :
-		StatusBar_set_mess( NOTEBOOK_CD_AUDIO, _STATUSBAR_SIMPLE_, _("Le programme externe d'extraction est absent."));
+		StatusBar_set_mess( NOTEBOOK_CD_AUDIO, _STATUSBAR_SIMPLE_, _("The external ripping program is missing."));
 		break;
 	case CD_ETAT_ATTENTE :
-		StatusBar_set_mess( NOTEBOOK_CD_AUDIO, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / En attente de selection."));
+		StatusBar_set_mess( NOTEBOOK_CD_AUDIO, _STATUSBAR_SIMPLE_, _("(Right click = Menu) / Waiting for selection."));
 		break;
 	case CD_ETAT_ATTENTE_EXIST :
-		StatusBar_set_mess( NOTEBOOK_CD_AUDIO, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / En attente de selection. Le fichier existe."));
+		StatusBar_set_mess( NOTEBOOK_CD_AUDIO, _STATUSBAR_SIMPLE_, _("(Right click = Menu) / Waiting for Selection. File exists.."));
 		break;
 	case CD_ETAT_SELECT :
-		StatusBar_set_mess( NOTEBOOK_CD_AUDIO, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / En selection."));
+		StatusBar_set_mess( NOTEBOOK_CD_AUDIO, _STATUSBAR_SIMPLE_, _("(Right click = Menu) / Selected files."));
 		break;
 	case CD_ETAT_SELECT_EXPERT :
-		StatusBar_set_mess( NOTEBOOK_CD_AUDIO, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / Selection avec options expert."));
+		StatusBar_set_mess( NOTEBOOK_CD_AUDIO, _STATUSBAR_SIMPLE_, _("(Right click = Menu) / Selection - expert mode."));
 		break;
 	case CD_ETAT_SELECT_EXIST :
-		StatusBar_set_mess( NOTEBOOK_CD_AUDIO, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / En selection. Le fichier existe."));
+		StatusBar_set_mess( NOTEBOOK_CD_AUDIO, _STATUSBAR_SIMPLE_, _("(Right click = Menu) / Selected files. File exists."));
 		break;
 	case CD_ETAT_SELECT_EXPERT_EXIST :
-		StatusBar_set_mess( NOTEBOOK_CD_AUDIO, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / Selection avec options expert. Le fichier existe."));
+		StatusBar_set_mess( NOTEBOOK_CD_AUDIO, _STATUSBAR_SIMPLE_, _("(Right click = Menu) / Selection - expert mode. File exists."));
 		break;
 	}
 }
@@ -1254,15 +1254,15 @@
 void cdaudio_set_normalise (gboolean p_EtatNormalise)
 {
 	if (FALSE == p_EtatNormalise) {
-		StatusBar_set_mess( NOTEBOOK_CD_AUDIO, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / Possibilite d'ajustement INDIVIDUEL ou COLLECTIF maximal du volume"));
+		StatusBar_set_mess( NOTEBOOK_CD_AUDIO, _STATUSBAR_SIMPLE_, _("(Right click = Menu) / Possibilities for individual adaptation or maximum collection volume"));
 	}
 	else {
 		switch (gtk_combo_box_get_active (GTK_COMBO_BOX (var_cd.Adr_combobox_normalise_cd))) {
 		case 0 : // case CD_NORM_PEAK :
-			StatusBar_set_mess( NOTEBOOK_CD_AUDIO, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / Ajustement INDIVIDUEL maximal du volume"));
+			StatusBar_set_mess( NOTEBOOK_CD_AUDIO, _STATUSBAR_SIMPLE_, _("(Right click = Menu) / INDIVIDUAL maximum volume adjustment"));
 			break;
 		case 1 : // case CD_NORM_PEAK_WAITING :
-			StatusBar_set_mess( NOTEBOOK_CD_AUDIO, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / Ajustement COLLECTIF maximal du volume"));
+			StatusBar_set_mess( NOTEBOOK_CD_AUDIO, _STATUSBAR_SIMPLE_, _("(Right click = Menu) / COLLECTIVE maximum volume adjustment"));
 			break;
 		}
 	}
@@ -1305,7 +1305,10 @@
 	}
 
 	/* Si pas de selection a cet endroit retour */
-	gdk_window_get_pointer (((GdkEventButton*)event)->window, &x, &y, &state);
+	GdkDeviceManager *manager = gdk_display_get_device_manager( gdk_display_get_default() );
+	GdkDevice		 *device = gdk_device_manager_get_client_pointer( manager );
+	gdk_window_get_device_position( ((GdkEventButton*)event)->window, device, &x, &y, &state );
+	// gdk_window_get_pointer (((GdkEventButton*)event)->window, &x, &y, &state);
 	if (!gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW(treeview),
 					 x, y,
 					 &path, &column, &Pos_X, &Pos_Y)) {
@@ -1360,6 +1363,7 @@
 			break;
 		}
 	}
+	if( BoolSelectColTime );
 	
 	if (BoolSelectColNormalise == TRUE) {
 		cdaudio_set_normalise (Audio->EtatNormalise);
@@ -1371,7 +1375,7 @@
 		gchar *pathdest = NULL;
 
 		pathdest = cdaudio_get_result_destination ();
-		path = g_strdup_printf ("%s/%s", pathdest, Audio->NameSong);
+		path = g_strdup_printf ("%s%s", pathdest, Audio->NameSong);
 		g_free (pathdest);
 		pathdest = NULL;
 		StatusBar_set_mess( NOTEBOOK_CD_AUDIO, _STATUSBAR_SIMPLE_, path );
@@ -1502,7 +1506,7 @@
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_cd.Adr_Column_Play =
 	column = gtk_tree_view_column_new_with_attributes (
-							_("Play"),
+							"Play",
 							renderer,
 							"pixbuf", COLUMN_CDAUDIO_PLAY,
 							NULL);
@@ -1543,7 +1547,7 @@
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_cd.Adr_Column_Wav =
 	column = gtk_tree_view_column_new_with_attributes (
-							_("Wav"),
+							"Wav",
 							renderer,
 							"pixbuf", COLUMN_CDAUDIO_WAV,
 							/*"text", COLUMN_CDAUDIO_WAV,*/
@@ -1564,7 +1568,7 @@
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_cd.Adr_Column_Flac =
 	column = gtk_tree_view_column_new_with_attributes (
-							_("Flac"),
+							"Flac",
 						 	renderer,
 							"pixbuf", COLUMN_CDAUDIO_FLAC,
 							NULL);
@@ -1584,7 +1588,7 @@
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_cd.Adr_Column_Ape =
 	column = gtk_tree_view_column_new_with_attributes (
-							_("Ape"),
+							"Ape",
 							renderer,
 							"pixbuf", COLUMN_CDAUDIO_APE,
 							NULL);
@@ -1604,7 +1608,7 @@
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_cd.Adr_Column_Wavpack =
 	column = gtk_tree_view_column_new_with_attributes (
-							_("WavP"),
+							"WavP",
 							renderer,
 							"pixbuf", COLUMN_CDAUDIO_WAVPACK,
 						 	NULL);
@@ -1624,7 +1628,7 @@
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_cd.Adr_Column_Ogg =
 	column = gtk_tree_view_column_new_with_attributes (
-							_("Ogg"),
+							"Ogg",
 							renderer,
 							"pixbuf", COLUMN_CDAUDIO_OGG,
 							/*"text", COLUMN_CDAUDIO_OGG,*/
@@ -1645,7 +1649,7 @@
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_cd.Adr_Column_M4a =
 	column = gtk_tree_view_column_new_with_attributes (
-							_("M4a"),
+							"M4a",
 							renderer,
 							"pixbuf", COLUMN_CDAUDIO_M4A,
 							/*"text", COLUMN_CDAUDIO_OGG,*/
@@ -1666,7 +1670,7 @@
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_cd.Adr_Column_Aac =
 	column = gtk_tree_view_column_new_with_attributes (
-							_("Aac"),
+							"Aac",
 							renderer,
 							"pixbuf", COLUMN_CDAUDIO_AAC,
 							NULL);
@@ -1686,7 +1690,7 @@
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_cd.Adr_Column_Mpc =
 	column = gtk_tree_view_column_new_with_attributes (
-							_("Mpc"),
+							"Mpc",
 							renderer,
 							"pixbuf", COLUMN_CDAUDIO_MPC,
 							NULL);
@@ -1706,7 +1710,7 @@
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_cd.Adr_Column_Mp3 =
 	column = gtk_tree_view_column_new_with_attributes (
-							_("Mp3"),
+							"Mp3",
 							renderer,
 						 	"pixbuf", COLUMN_CDAUDIO_MP3,
 							/*"text", COLUMN_CDAUDIO_MP3,*/
@@ -1727,7 +1731,7 @@
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_cd.Adr_Column_Num =
 	column = gtk_tree_view_column_new_with_attributes (
-							_("Num"),
+							"Num",
 							renderer,
 							"text", COLUMN_CDAUDIO_TRACK_NUM,
 							NULL);
@@ -1742,7 +1746,7 @@
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_cd.Adr_Column_Time =
 	column = gtk_tree_view_column_new_with_attributes (
-							_("Time"),
+							"Time",
 							renderer,
 							"text", COLUMN_CDAUDIO_TRACK_TIME,
 						 	NULL);
@@ -1782,9 +1786,10 @@
 	g_object_set_data (G_OBJECT (renderer), "column", (gint *)COLUMN_CDAUDIO_TRACK_NAME);
 	var_cd.Adr_Column_Nom =
 	column = gtk_tree_view_column_new_with_attributes (
-							_("Nom"),
+							_("Name"),
 							renderer,
 							"markup", COLUMN_CDAUDIO_TRACK_NAME,
+						 // "background-gdk", COLUMN_CDAUDIO_COLOR,
 							/* "editable", CF_COLUMN_EDITABLE */
 						 	NULL);
 	gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
@@ -1837,6 +1842,7 @@
 				G_TYPE_STRING,		// COLUMN_CDAUDIO_TRACK_TIME
 				GDK_TYPE_PIXBUF,	// COLUMN_CDAUDIO_FILE_NORMALIZE
 				G_TYPE_STRING		// COLUMN_CDAUDIO_TRACK_NAME
+				//GDK_TYPE_COLOR		// COLUMN_CDAUDIO_COLOR
 			 );
 
 	var_cd.Adr_Tree_Model = model = GTK_TREE_MODEL (store);
@@ -1845,7 +1851,7 @@
 	 */
 	var_cd.Adr_TreeView =
 	treeview = gtk_tree_view_new_with_model (model);
-	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
+	// gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
 	g_object_unref (model);
 	gtk_container_add (GTK_CONTAINER (widget), treeview);
 	cdaudio_add_columns_scrolledwindow_cd (GTK_TREE_VIEW (treeview));
@@ -1863,15 +1869,15 @@
 	gboolean	 valid;
 	GtkTreeIter	 iter;
 	GList		*List = NULL;
-	gchar		*ptr_template = NULL;
+	// gchar		*ptr_template = NULL;
 	gchar		*ptr = NULL;
 	CD_AUDIO	*Audio = NULL;
 	gchar		*StrLine = NULL;
-	
+
 	if (var_cd.Adr_entry_new_titre_cdaudio == NULL) return;
 	if (EnteteCD.GList_Audio_cd == NULL) return;
 	if (bool_entree_cd_verif_car == FALSE) return;
-	ptr_template = (gchar *)gtk_entry_get_text (GTK_ENTRY (var_cd.Adr_entry_new_titre_cdaudio));
+	// ptr_template = (gchar *)gtk_entry_get_text (GTK_ENTRY (var_cd.Adr_entry_new_titre_cdaudio));
 
 	// 
 	var_cd.Bool_create_file_m3u = FALSE;
@@ -1936,6 +1942,8 @@
 						COLUMN_CDAUDIO_TRACK_NAME,
 						// g_array_index (Articles_cd, ARTICLES_CD, Num_cell).Track_Name,
 						StrLine,
+						// COLUMN_CDAUDIO_COLOR,
+						// &YellowColor,
 						-1);
 			
 			g_free (StrLine);	StrLine = NULL;
@@ -2085,6 +2093,7 @@
 				COLUMN_CDAUDIO_TRACK_TIME,		Foo.Track_Time,
 				COLUMN_CDAUDIO_FILE_NORMALIZE,		Foo.ColumnCDNormalize,
 				COLUMN_CDAUDIO_TRACK_NAME,		Foo.Track_Name,
+				//COLUMN_CDAUDIO_COLOR,			&YellowColor,
 				-1);
 		}
 		List = g_list_next(List);
@@ -2341,6 +2350,8 @@
 	gtk_widget_set_sensitive( GTK_WIDGET(GLADE_GET_OBJECT("vbox_titres_expanderCD")), NULL != EnteteCD.GList_Audio_cd ? TRUE : FALSE );
 	gtk_widget_set_sensitive( GTK_WIDGET(GLADE_GET_OBJECT("button_cue_creation_from_cd")), NULL != EnteteCD.GList_Audio_cd ? TRUE : FALSE );
 	
+	gtk_widget_set_sensitive( GTK_WIDGET(GLADE_GET_OBJECT("button_import_title_cd")), NULL != EnteteCD.GList_Audio_cd ? TRUE : FALSE );
+	
 	StatusBar_puts();
 }
 // Recuperation d'un pointeur de texte sur le contenu du bouton 'destination' qui est
@@ -2358,7 +2369,9 @@
 
 	if ((Audio = cdaudio_get_line_selected ())) {
 		StrTemplate = Parse_get_line( PARSE_TYPE_STOCKAGE_CD, Audio->Num_Track -1 );
-		NameDir = g_strdup_printf ("%s/%s", Config.PathDestinationCD, StrTemplate);
+		if( *StrTemplate == '\0' )
+			NameDir = g_strdup_printf( "%s/%s", Config.PathDestinationCD, StrTemplate );
+		else	NameDir = g_strdup_printf( "%s/%s/", Config.PathDestinationCD, StrTemplate );
 		g_free (StrTemplate);
 		StrTemplate = NULL;
 	}
@@ -2377,12 +2390,10 @@
 	MEDIA *Media = NULL;
 	gint Cpt = 0;
 
-	// libcombo_alloc (GTK_COMBO_BOX (widget));
-	
 	List = g_list_first (scan_get_glist ());
 	while (List) {
 		if ((Media = (MEDIA *)List->data)) {
-			gtk_combo_box_append_text (GTK_COMBO_BOX (widget), (gchar *)Media->Full_Name);
+			gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), (gchar *)Media->Full_Name);
 			Cpt ++;
 		}
 		List = g_list_next(List);
@@ -2450,10 +2461,9 @@
 // 
 void on_cdaudio_combobox_serveur_cd_realize (GtkWidget *widget, gpointer user_data)
 {
-	// libcombo_alloc (GTK_COMBO_BOX (widget));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Auto: freedb");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Param CDDB");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Param PROXY");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Auto: freedb");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Param CDDB");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Param PROXY");
 		
 	var_cd.Adr_combobox_serveur = GTK_COMBO_BOX (widget);
 	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), Config.ServeurCddb);
@@ -2504,7 +2514,7 @@
 		if( SERVER_CDDB_PARAM == Config.ServeurCddb ) {
 			
 			// label101
-			gtk_label_set_markup (GTK_LABEL(GTK_WIDGET (GLADE_GET_OBJECT("label101"))), _(" Parametrage CDDB: [ Nom du serveur ]"));
+			gtk_label_set_markup (GTK_LABEL(GTK_WIDGET (GLADE_GET_OBJECT("label101"))), _(" Setting up CDDB: [ Server name ]"));
 			gtk_widget_show (GTK_WIDGET (GLADE_GET_OBJECT("alignment_cddb_server")));
 			gtk_widget_hide (GTK_WIDGET (GLADE_GET_OBJECT("alignment_cddb_port")));
 			gtk_widget_show (GTK_WIDGET (GLADE_GET_OBJECT("button_init_cddb")));
@@ -2513,7 +2523,7 @@
 		} else if( SERVER_PROXY_PARAM == Config.ServeurCddb ) {
 			
 			// label101
-			gtk_label_set_markup (GTK_LABEL(GTK_WIDGET (GLADE_GET_OBJECT("label101"))), _(" Parametrage PROXY: [ serveur ] [ port ]"));
+			gtk_label_set_markup (GTK_LABEL(GTK_WIDGET (GLADE_GET_OBJECT("label101"))), _(" Proxy settings: [ server ] [ port ] "));
 			gtk_widget_show (GTK_WIDGET (GLADE_GET_OBJECT("alignment_cddb_server")));
 			gtk_widget_show (GTK_WIDGET (GLADE_GET_OBJECT("alignment_cddb_port")));
 			gtk_widget_show (GTK_WIDGET (GLADE_GET_OBJECT("button_init_cddb")));
@@ -2523,7 +2533,7 @@
 		} else {
 			
 			// label101
-			gtk_label_set_markup (GTK_LABEL(GTK_WIDGET (GLADE_GET_OBJECT("label101"))), _(" Serveur "));
+			gtk_label_set_markup (GTK_LABEL(GTK_WIDGET (GLADE_GET_OBJECT("label101"))), _(" Server "));
 			gtk_widget_hide (GTK_WIDGET (GLADE_GET_OBJECT("alignment_cddb_server")));
 			gtk_widget_hide (GTK_WIDGET (GLADE_GET_OBJECT("alignment_cddb_port")));
 			gtk_widget_hide (GTK_WIDGET (GLADE_GET_OBJECT("button_init_cddb")));
@@ -2597,10 +2607,9 @@
 // 
 void on_combobox_normalise_cd_realize (GtkWidget *widget, gpointer user_data)
 {
-	libcombo_alloc (GTK_COMBO_BOX (widget));
 	var_cd.Adr_combobox_normalise_cd = GTK_COMBO_BOX (widget);
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Peak/Album");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Peak");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Peak/Album");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Peak");
 	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
 }
 // 
@@ -2610,7 +2619,17 @@
 	if (NULL == var_cd.Adr_combobox_normalise_cd) return;
 }
 // 
-// 
+// SOLVED
+// 	Debian Bug report logs - #673640
+// 	xcfa: XCFA crashes when the CD is ejected
+// 	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673640
+// 
+void on_button_eject_cd_realize( GtkWidget *widget, gpointer user_data )
+{
+	// g_print( "on_button_eject_cd_realize\n" );
+	// g_print( "\tscan_get_glist() = %p\n", scan_get_glist () );
+	gtk_widget_set_sensitive( widget, scan_get_glist() == NULL ? FALSE : TRUE );
+}
 void on_button_eject_cd_clicked (GtkButton *button, gpointer user_data)
 {
 	cdaudiotoc_button_eject_cd_clicked ();

xcfa-4.2.8.tar.gz/src/cd_audio.h -> xcfa-5.0.2.tar.gz/src/cd_audio.h Changed

@@ -1,9 +1,9 @@
  /*
  *  file      : cd_audio.h
  *  project   : xcfa
- *  with      : Gtk-2
+ *  with      : Gtk-3
  *
- *  copyright : (C) 2003 - 2012 by Claude Bulin
+ *  copyright : (C) 2003 - 2015 by Claude Bulin
  *
  *  xcfa - GTK+ implementation of the GNU shell command
  *  GNU General Public License
@@ -39,57 +39,59 @@
 
 typedef enum {
 	EXTRACT_WITH_CDPARANOIA = 0,
+	EXTRACT_WITH_CDPARANOIA_MODE_2,
 	EXTRACT_WITH_CDPARANOIA_EXPERT,
 	EXTRACT_WITH_CDDA2WAV
 } EXTRACT_WITH;
 
 
 typedef struct {
-	GtkComboBox		*Adr_combobox_discid_cd;		// 
-	GtkComboBox		*Adr_combobox_normalise_cd;		// 
-	GtkComboBox		*Adr_Combo_Box;				// 
-	GtkComboBox		*Adr_combobox_serveur;			// 
+	GtkWidget		*Adr_checkbutton_log_cdparanoia_mode_expert;
+	GtkComboBox		*Adr_combobox_discid_cd;			// 
+	GtkComboBox		*Adr_combobox_normalise_cd;			// 
+	GtkComboBox		*Adr_Combo_Box;						// 
+	GtkComboBox		*Adr_combobox_serveur;				// 
 	GtkWidget		*Adr_button_applique_change;		// 
-	GtkWidget		*Adr_Button_Cancel_cddb;		// 
-	GtkWidget		*Adr_Button_Raffraichir;		// 
-	GtkWidget		*Adr_Label_Duree;			// 
-	GtkWidget		*Adr_Label_Titre;			// 
-	GtkWidget		*Adr_Label_Statusbar;			// 
-	GtkButton		*Adr_Button_Destination;		// 
-	GtkWidget		*Adr_Progressbar;			// 
-	GtkWidget		*Adr_scroll;				// 
-	GtkListStore		*Adr_List_Store;			// 
-	GtkTreeModel		*Adr_Tree_Model;			// 
-	GtkTreeSelection	*Adr_Line_Selected;			// 
-	GtkWidget		*Adr_TreeView;				// 
-	GdkPixbuf		*Pixbuf_Coche;				// coche.png
-	GdkPixbuf		*Pixbuf_Coche_exist;			// coche_exist.png
-	GdkPixbuf		*Pixbuf_Selected;			// selected.png
-	GdkPixbuf		*Pixbuf_Selected_exist;			// selected_exist.png
-	GdkPixbuf		*Pixbuf_Selected_expert;		// selected_expert.png
+	GtkWidget		*Adr_Button_Cancel_cddb;			// 
+	GtkWidget		*Adr_Button_Raffraichir;			// 
+	GtkWidget		*Adr_Label_Duree;					// 
+	GtkWidget		*Adr_Label_Titre;					// 
+	GtkWidget		*Adr_Label_Statusbar;				// 
+	GtkButton		*Adr_Button_Destination;			// 
+	GtkWidget		*Adr_Progressbar;					// 
+	GtkWidget		*Adr_scroll;						// 
+	GtkListStore		*Adr_List_Store;				// 
+	GtkTreeModel		*Adr_Tree_Model;				// 
+	GtkTreeSelection	*Adr_Line_Selected;				// 
+	GtkWidget		*Adr_TreeView;						// 
+	GdkPixbuf		*Pixbuf_Coche;						// coche.png
+	GdkPixbuf		*Pixbuf_Coche_exist;				// coche_exist.png
+	GdkPixbuf		*Pixbuf_Selected;					// selected.png
+	GdkPixbuf		*Pixbuf_Selected_exist;				// selected_exist.png
+	GdkPixbuf		*Pixbuf_Selected_expert;			// selected_expert.png
 	GdkPixbuf		*Pixbuf_Selected_expert_exist;		// selected_expert_exist.png
-	GdkPixbuf		*Pixbuf_CdPlay;				// play.png
-	GdkPixbuf		*Pixbuf_CdStop;				// sol.png
-	GdkPixbuf		*Pixbuf_Normalize;			//  normalize1.png
-	GdkPixbuf		*Pixbuf_Normalize_Coche;		//  normalize2.png
-	GdkPixbuf		*Pixbuf_NotInstall;			// not_install.png
-	gboolean		 Bool_create_file_m3u;			// 
-	gchar			*Pathname_m3u;				// 
-	gchar			*Pathname_xspf;				// 
-	GtkWidget		*Adr_Expander;				// 
-	GtkWidget		*Adr_notebook;				// 
-	GtkWidget		*Adr_entry_tag_titre_album;		// 
-	GtkWidget		*Adr_entry_tag_nom_artiste;		// 
-	GtkWidget		*Adr_spinbutton_tag_annee;		// 
+	GdkPixbuf		*Pixbuf_CdPlay;						// play.png
+	GdkPixbuf		*Pixbuf_CdStop;						// sol.png
+	GdkPixbuf		*Pixbuf_Normalize;					//  normalize1.png
+	GdkPixbuf		*Pixbuf_Normalize_Coche;			//  normalize2.png
+	GdkPixbuf		*Pixbuf_NotInstall;					// not_install.png
+	gboolean		 Bool_create_file_m3u;				// 
+	gchar			*Pathname_m3u;						// 
+	gchar			*Pathname_xspf;						// 
+	GtkWidget		*Adr_Expander;						// 
+	GtkWidget		*Adr_notebook;						// 
+	GtkWidget		*Adr_entry_tag_titre_album;			// 
+	GtkWidget		*Adr_entry_tag_nom_artiste;			// 
+	GtkWidget		*Adr_spinbutton_tag_annee;			// 
 	GtkWidget		*Adr_entry_new_titre_cdaudio;		// 
 	GtkWidget		*Adr_entry_tag_titre_chanson;		// 
 	GtkWidget		*Adr_entry_tag_titre_fichier;		// 
-	GtkWidget		*Adr_entry_tag_commentaire;		// 
-	GtkWidget		*Adr_spinbutton_tag_piste;		// 
+	GtkWidget		*Adr_entry_tag_commentaire;			// 
+	GtkWidget		*Adr_spinbutton_tag_piste;			// 
 	GtkWidget		*Adr_entry_stockage_cdaudio;		// 
 	GtkWidget		*Adr_label_stockage_cdaudio;		// 
-	GtkWidget		*Adr_entry_name_file_cue;		// 
-	TYPE_CUE		 TypeCreateCue;				// TYPE_CUE_NONE | TYPE_CUE_CD | TYPE_CUE_FILE
+	GtkWidget		*Adr_entry_name_file_cue;			// 
+	TYPE_CUE		 TypeCreateCue;						// TYPE_CUE_NONE | TYPE_CUE_CD | TYPE_CUE_FILE
 	GtkTreeViewColumn	*Adr_Column_Play;
 	GtkTreeViewColumn	*Adr_Column_Flac;
 	GtkTreeViewColumn	*Adr_Column_Wav;
@@ -113,10 +115,10 @@
 
 extern VAR_CD var_cd;
 
-typedef enum {								// Pour extraction / conversion */
-	ETAT_CONV_CD_NONE,						// Aucune demande
-	ETAT_CONV_CD_WAITING,						// En attente
-	ETAT_CONV_CD_CONV_OK						// Fait
+typedef enum {											// Pour extraction / conversion */
+	ETAT_CONV_CD_NONE,									// Aucune demande
+	ETAT_CONV_CD_WAITING,								// En attente
+	ETAT_CONV_CD_CONV_OK								// Fait
 } ETAT_CONV_CD;
 
 typedef enum {
@@ -141,8 +143,8 @@
 
 typedef enum {
 	CD_NORM_PEAK_NONE = 0,
-	CD_NORM_PEAK,							// INDIVIDUEL   ajustement maximal du volume
-	CD_NORM_PEAK_WAITING						// COLLECTIF 	ajustement maximal du volume
+	CD_NORM_PEAK,										// INDIVIDUEL   ajustement maximal du volume
+	CD_NORM_PEAK_WAITING								// COLLECTIF 	ajustement maximal du volume
 } ETAT_NORMALISE_CD;
 
 
@@ -174,73 +176,74 @@
 
 typedef struct {
 	LIST_CONV		*ListConv;
-	ETAT_PLAY_CD		 EtatPlay;				// 
-	gboolean		 Bool_Delette_Flac;			// Le fichier provisoir doit etre efface
-	gboolean		 Bool_Delette_Wav;			// 
-	gboolean		 Bool_Delette_Mp3;			// 
-	gboolean		 Bool_Delette_Ogg;			// 
-	gboolean		 Bool_Delette_M4a;			// 
-	gboolean		 Bool_Delette_Aac;			// 
-	gboolean		 Bool_Delette_Mpc;			// 
-	gboolean		 Bool_Delette_Ape;			// 
-	gboolean		 Bool_Delette_WavPack;			// 
+	ETAT_PLAY_CD		 EtatPlay;						// 
+	gboolean		 Bool_Delette_Flac;					// Le fichier provisoir doit etre efface
+	gboolean		 Bool_Delette_Wav;					// 
+	gboolean		 Bool_Delette_Mp3;					// 
+	gboolean		 Bool_Delette_Ogg;					// 
+	gboolean		 Bool_Delette_M4a;					// 
+	gboolean		 Bool_Delette_Aac;					// 
+	gboolean		 Bool_Delette_Mpc;					// 
+	gboolean		 Bool_Delette_Ape;					// 
+	gboolean		 Bool_Delette_WavPack;				// 
 	ETAT_SELECTION_CD	 EtatSelection_Flac;			// 
-	ETAT_SELECTION_CD	 EtatSelection_Wav;			// 
-	ETAT_SELECTION_CD	 EtatSelection_Mp3;			// 
-	ETAT_SELECTION_CD	 EtatSelection_Ogg;			// 
-	ETAT_SELECTION_CD	 EtatSelection_M4a;			// 
-	ETAT_SELECTION_CD	 EtatSelection_Aac;			// 
-	ETAT_SELECTION_CD	 EtatSelection_Mpc;			// 
-	ETAT_SELECTION_CD	 EtatSelection_Ape;			// 
+	ETAT_SELECTION_CD	 EtatSelection_Wav;				// 
+	ETAT_SELECTION_CD	 EtatSelection_Mp3;				// 
+	ETAT_SELECTION_CD	 EtatSelection_Ogg;				// 
+	ETAT_SELECTION_CD	 EtatSelection_M4a;				// 
+	ETAT_SELECTION_CD	 EtatSelection_Aac;				// 
+	ETAT_SELECTION_CD	 EtatSelection_Mpc;				// 
+	ETAT_SELECTION_CD	 EtatSelection_Ape;				// 
 	ETAT_SELECTION_CD	 EtatSelection_WavPack;			// 
-	gint			 Num_Track;				// Numero de piste
-	gchar			*Str_Track;				// 
-	gchar			*NameSong;				// Le nom du futur fichier
-	gchar			*Duree;					// La duree d'ecoute
-	ETAT_CONV_CD		 Etat_Flac;				// Pour extraction / conversion
-	ETAT_CONV_CD		 Etat_Wav;				// 
-	ETAT_CONV_CD		 Etat_Mp3;				// 
-	ETAT_CONV_CD		 Etat_Ogg;				// 
-	ETAT_CONV_CD		 Etat_m4a;				// 
-	ETAT_CONV_CD		 Etat_Aac;				// 
-	ETAT_CONV_CD		 Etat_Mpc;				// 
-	ETAT_CONV_CD		 Etat_Ape;				// 
-	ETAT_CONV_CD		 Etat_WavPack;				// 
+	gint			 Num_Track;							// Numero de piste
+	gchar			*Str_Track;							// 
+	gchar			*NameSong;							// Le nom du futur fichier
+	gchar			*Duree;								// La duree d'ecoute
+	ETAT_CONV_CD		 Etat_Flac;						// Pour extraction / conversion
+	ETAT_CONV_CD		 Etat_Wav;						// 
+	ETAT_CONV_CD		 Etat_Mp3;						// 
+	ETAT_CONV_CD		 Etat_Ogg;						// 
+	ETAT_CONV_CD		 Etat_m4a;						// 
+	ETAT_CONV_CD		 Etat_Aac;						// 
+	ETAT_CONV_CD		 Etat_Mpc;						// 
+	ETAT_CONV_CD		 Etat_Ape;						// 
+	ETAT_CONV_CD		 Etat_WavPack;					// 
 	ETAT_CONV_CD		 Etat_Sox;
 	gboolean		 EtatNormalise;
 	ETAT_NORMALISE_CD	 EtatPeak;
-	gchar			*PathName_Dest_Flac;			// Emplacement du fichier
-	gchar			*PathName_Dest_Wav;			// 
-	gchar			*PathName_Dest_Mp3;			// 
-	gchar			*PathName_Dest_Ogg;			// 
-	gchar			*PathName_Dest_M4a;			// 
-	gchar			*PathName_Dest_Aac;			// 
-	gchar			*PathName_Dest_Mpc;			// 
-	gchar			*PathName_Dest_Ape;			// 
-	gchar			*PathName_Dest_WavPack;			// 
-	TAGS			*tags;					// Tags
+	gchar			*PathName_Dest_Flac;				// Emplacement du fichier
+	gchar			*PathName_Dest_Wav;					// 
+	gchar			*PathName_Dest_Mp3;					// 
+	gchar			*PathName_Dest_Ogg;					// 
+	gchar			*PathName_Dest_M4a;					// 
+	gchar			*PathName_Dest_Aac;					// 
+	gchar			*PathName_Dest_Mpc;					// 
+	gchar			*PathName_Dest_Ape;					// 
+	gchar			*PathName_Dest_WavPack;				// 
+	gchar			*PathName_Dest_Tmp;
+	TAGS			*tags;								// Tags
 	gboolean		 BoolM3uForWav;
-	EXTRACT_EXPERT		 ExtractExpert;
+	EXTRACT_EXPERT	ExtractExpert;
 	gboolean		 EtatBoolWavpack;
 } CD_AUDIO;
 
-typedef struct {							// UN ENTETE POUR LE CD
-	gchar			*TitleCD;				// Titre integral du CD
-	gchar			*Title;					// Titre du CD
-	gchar			*Artiste;				// Nom de l'artiste
-	gboolean		 BoolMultiArtiste;			// 
-	gchar			*StrDureeCd;				// Duree totale du cd
-	gint			 TotalTracks;				// Nombre total de pistes trouvees
-	gint			 NumGenre;				// Genre en numerique
-	gchar			*StrGenre;				// Genre en chaine
-	gint			 NumYear;				// Annee du cd en numerique
-	gchar			*StrYear;				// Annee du cd en chaine
-	GList			*GList_Audio_cd;			// UNE STRUCTURE 'AUDIO' PAR PISTE
-	gboolean		 Bool_Read_Infos_cd;			// TRUE or FALSE
-	gchar			*Message;				// Message pour l'utilisateur
-	gchar			*NameCD_Device;				// Pointeur sur le device en selection 
-	gchar			 Str_Nice [ 10 ];			// Priorite systeme
-	gchar			 Str_Bitrate_Lame [ 10 ];		// Bitrate pour Lame
+typedef struct {										// UN ENTETE POUR LE CD
+	gchar			*TitleCD;							// Titre integral du CD
+	gchar			*Title;								// Titre du CD
+	gchar			*Artiste;							// Nom de l'artiste
+	gboolean		 BoolMultiArtiste;					// 
+	gchar			*StrDureeCd;						// Duree totale du cd
+	gint			 TotalTracks;						// Nombre total de pistes trouvees
+	gint			 NumGenre;							// Genre en numerique
+	gchar			*StrGenre;							// Genre en chaine
+	gint			 NumYear;							// Annee du cd en numerique
+	gchar			*StrYear;							// Annee du cd en chaine
+	GList			*GList_Audio_cd;					// UNE STRUCTURE 'AUDIO' PAR PISTE
+	gboolean		 Bool_Read_Infos_cd;				// TRUE or FALSE
+	gchar			*Message;							// Message pour l'utilisateur
+	gchar			*NameCD_Device;						// Pointeur sur le device en selection 
+	gchar			 Str_Nice [ 10 ];					// Priorite systeme
+	gchar			 Str_Bitrate_Lame [ 10 ];			// Bitrate pour Lame
 	gchar			 Str_Bitrate_oggenc [ 10 ]; 		// Bitrate pour Oggenc
 } ENTETE_CD;

xcfa-4.2.8.tar.gz/src/cd_audio_extract.c -> xcfa-5.0.2.tar.gz/src/cd_audio_extract.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : cd_audio_extract.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -45,11 +45,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <glib.h>
 #include <glib/gstdio.h>
@@ -80,7 +75,6 @@
 #include "cd_cue.h"
 #include "notify_send.h"
 #include "win_scan.h"
-#include "popup_systray.h"
 #include "win_vte.h"
 #include "cd_audio_extract.h"
 
@@ -118,6 +112,8 @@
 	gint		 NbrList;
 	gchar		*PtrDirActuel;
 	
+	gchar		*PathDestinationModeExpert;
+	
 } VAR_CDEXTRACT;
 
 VAR_CDEXTRACT VarCdExtract;
@@ -177,19 +173,19 @@
 }
 // SAUVEGARDE DES POINTEURS
 // 
-void cdaudioextract_save_arg_from_conv (CD_AUDIO *Audio, gint p_Num)
+void cdaudioextract_save_arg_from_conv( gchar **p_PtrTabArgs, CD_AUDIO *Audio, gint p_Num)
 {
 	gint	Pos;
 
-	for (Pos = 0; NULL != conv.ArgConv [ Pos ]; Pos ++) {
-		Audio->ListConv[ p_Num ].Arg [ Pos ] = conv.ArgConv [ Pos ];
-		conv.ArgConv [ Pos ] = NULL;
+	for (Pos = 0; NULL != p_PtrTabArgs [ Pos ]; Pos ++) {
+		Audio->ListConv[ p_Num ].Arg [ Pos ] = p_PtrTabArgs [ Pos ];
+		p_PtrTabArgs [ Pos ] = NULL;
 	}
 	Audio->ListConv[ p_Num ].Arg [ Pos ] = NULL;
 }
 // 
 // 
-void cdaudioextract_save_arg_from_extract (CD_AUDIO *Audio, gint p_Num)
+void cdaudioextract_save_arg_from_extract( CD_AUDIO *Audio, gint p_Num)
 {
 	gint	Pos;
 
@@ -201,15 +197,15 @@
 }
 // RESTITUTION DES POINTEURS
 // 
-void cdaudioextract_restitue_arg_to_conv (CD_AUDIO *Audio, gint p_Num)
+void cdaudioextract_restitue_arg_to_conv( gchar **p_PtrTabArgs, CD_AUDIO *Audio, gint p_Num )
 {
 	gint	Pos;
 
 	for (Pos = 0; NULL != Audio->ListConv[ p_Num ].Arg [ Pos ]; Pos ++) {
-		conv.ArgConv [ Pos ] = Audio->ListConv[ p_Num ].Arg [ Pos ];
+		p_PtrTabArgs [ Pos ] = Audio->ListConv[ p_Num ].Arg [ Pos ];
 		Audio->ListConv[ p_Num ].Arg [ Pos ] = NULL;
 	}
-	conv.ArgConv [ Pos ] = NULL;
+	p_PtrTabArgs [ Pos ] = NULL;
 }
 // 
 // 
@@ -230,6 +226,7 @@
 	GList		*List = NULL;
 	CD_AUDIO	*Audio = NULL;
 	PARAM_FILELC	 param_filelc;
+	gchar		**PtrTabArgs = NULL;
 	
 	List = g_list_first (EnteteCD.GList_Audio_cd);
 	while (List) {
@@ -292,8 +289,9 @@
 				param_filelc.PtrStrBitrate = NULL;
 				
 				Audio->ListConv[ NUM_FLAC ].WithCommandLineUser = param_filelc.With_CommandLineUser;
-				filelc_get_command_line (&param_filelc);
-				cdaudioextract_save_arg_from_conv (Audio, NUM_FLAC);
+				PtrTabArgs = filelc_get_command_line (&param_filelc);
+				cdaudioextract_save_arg_from_conv( PtrTabArgs, Audio, NUM_FLAC );
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 			}
 			if (Audio->Etat_Ape == ETAT_CONV_CD_WAITING) {
 				param_filelc.type_conv = MAC_WAV_TO_APE;
@@ -307,8 +305,9 @@
 				param_filelc.PtrStrBitrate = NULL;
 				
 				Audio->ListConv[ NUM_APE ].WithCommandLineUser = param_filelc.With_CommandLineUser;
-				filelc_get_command_line (&param_filelc);
-				cdaudioextract_save_arg_from_conv (Audio, NUM_APE);
+				PtrTabArgs = filelc_get_command_line (&param_filelc);
+				cdaudioextract_save_arg_from_conv (PtrTabArgs, Audio, NUM_APE);
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 			}
 			if (Audio->Etat_WavPack == ETAT_CONV_CD_WAITING) {
 				param_filelc.type_conv = WAVPACK_WAV_TO_WAVPACK;
@@ -322,8 +321,9 @@
 				param_filelc.PtrStrBitrate = NULL;
 
 				Audio->ListConv[ NUM_WAVPACK ].WithCommandLineUser = param_filelc.With_CommandLineUser;
-				filelc_get_command_line (&param_filelc);
-				cdaudioextract_save_arg_from_conv (Audio, NUM_WAVPACK);
+				PtrTabArgs = filelc_get_command_line (&param_filelc);
+				cdaudioextract_save_arg_from_conv (PtrTabArgs, Audio, NUM_WAVPACK);
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 			}
 			if (Audio->Etat_Sox == ETAT_CONV_CD_WAITING || Audio->Etat_Ogg == ETAT_CONV_CD_WAITING) {
 				param_filelc.type_conv = OGGENC_WAV_TO_OGG;
@@ -342,11 +342,12 @@
 				param_filelc.num_track = NULL;
 				param_filelc.BoolSetBitrate = FALSE;
 				param_filelc.PtrStrBitrate = NULL;
-				param_filelc.PtrStrBitrate = options_get_params (OGGENC_WAV_TO_OGG, NULL);
+				param_filelc.PtrStrBitrate = options_get_params (OGGENC_WAV_TO_OGG);
 
 				Audio->ListConv[ NUM_OGG ].WithCommandLineUser = param_filelc.With_CommandLineUser;
-				filelc_get_command_line (&param_filelc);
-				cdaudioextract_save_arg_from_conv (Audio, NUM_OGG);
+				PtrTabArgs = filelc_get_command_line (&param_filelc);
+				cdaudioextract_save_arg_from_conv (PtrTabArgs, Audio, NUM_OGG);
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 			}
 			if (Audio->Etat_m4a == ETAT_CONV_CD_WAITING) {
 				param_filelc.type_conv = FAAC_WAV_TO_M4A;
@@ -360,8 +361,9 @@
 				param_filelc.PtrStrBitrate = NULL;
 
 				Audio->ListConv[ NUM_M4A ].WithCommandLineUser = param_filelc.With_CommandLineUser;
-				filelc_get_command_line (&param_filelc);
-				cdaudioextract_save_arg_from_conv (Audio, NUM_M4A);
+				PtrTabArgs = filelc_get_command_line (&param_filelc);
+				cdaudioextract_save_arg_from_conv (PtrTabArgs, Audio, NUM_M4A);
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 			}
 			if (Audio->Etat_Aac == ETAT_CONV_CD_WAITING) {
 				param_filelc.type_conv = AACPLUSENC_WAV_TO_AAC;
@@ -373,11 +375,12 @@
 				param_filelc.num_track = NULL;
 				param_filelc.BoolSetBitrate = FALSE;
 				param_filelc.PtrStrBitrate = NULL;
-				param_filelc.PtrStrBitrate = options_get_params (AACPLUSENC_WAV_TO_AAC, NULL);
+				param_filelc.PtrStrBitrate = options_get_params (AACPLUSENC_WAV_TO_AAC);
 
 				Audio->ListConv[ NUM_AAC ].WithCommandLineUser = param_filelc.With_CommandLineUser;
-				filelc_get_command_line (&param_filelc);
-				cdaudioextract_save_arg_from_conv (Audio, NUM_AAC);
+				PtrTabArgs = filelc_get_command_line (&param_filelc);
+				cdaudioextract_save_arg_from_conv (PtrTabArgs, Audio, NUM_AAC);
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 			}
 			if (Audio->Etat_Sox == ETAT_CONV_CD_WAITING || Audio->Etat_Mpc == ETAT_CONV_CD_WAITING) {
 				param_filelc.type_conv = MPPENC_WAV_TO_MPC;
@@ -398,8 +401,9 @@
 				param_filelc.PtrStrBitrate = NULL;
 
 				Audio->ListConv[ NUM_MPC ].WithCommandLineUser = param_filelc.With_CommandLineUser;
-				filelc_get_command_line (&param_filelc);
-				cdaudioextract_save_arg_from_conv (Audio, NUM_MPC);
+				PtrTabArgs = filelc_get_command_line (&param_filelc);
+				cdaudioextract_save_arg_from_conv (PtrTabArgs, Audio, NUM_MPC);
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 			}
 			if (Audio->Etat_Mp3 == ETAT_CONV_CD_WAITING) {
 				param_filelc.type_conv = LAME_WAV_TO_MP3;
@@ -411,11 +415,12 @@
 				param_filelc.num_track = NULL;
 				param_filelc.BoolSetBitrate = FALSE;
 				param_filelc.PtrStrBitrate = NULL;
-				param_filelc.PtrStrBitrate = options_get_params (LAME_WAV_TO_MP3, NULL);
+				param_filelc.PtrStrBitrate = options_get_params (LAME_WAV_TO_MP3);
 
 				Audio->ListConv[ NUM_MP3 ].WithCommandLineUser = param_filelc.With_CommandLineUser;
-				filelc_get_command_line (&param_filelc);
-				cdaudioextract_save_arg_from_conv (Audio, NUM_MP3);
+				PtrTabArgs = filelc_get_command_line (&param_filelc);
+				cdaudioextract_save_arg_from_conv (PtrTabArgs, Audio, NUM_MP3);
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 			}
 		}
 		List = g_list_next(List);
@@ -483,10 +488,18 @@
 				*/
 				switch (Config.ExtractCdWith) {
 				case EXTRACT_WITH_CDPARANOIA :
-					param_filelc.type_conv = CDPARANOIA_CD_TO_WAV;
+				case EXTRACT_WITH_CDPARANOIA_MODE_2 :
+					// 
+					// SUITE MAIL DE: Levis Florian:
+					// TEST EXTRACTION AVEC CDPARANOIA EN MODE EXPERT UNE SEULE PASSE ...
+					// 
+					if( EXTRACT_WITH_CDPARANOIA == Config.ExtractCdWith )
+						param_filelc.type_conv = CDPARANOIA_CD_TO_WAV;
+					else	param_filelc.type_conv = CDPARANOIA_CD_TO_WAV_EXPERT;
 					param_filelc.With_CommandLineUser = FALSE;
 					param_filelc.filesrc = Audio->PathName_Dest_Wav;
-					param_filelc.filedest = Audio->PathName_Dest_Wav;
+					// param_filelc.filedest = Audio->PathName_Dest_Wav;
+					param_filelc.filedest = Audio->PathName_Dest_Tmp;
 					param_filelc.tags = NULL;
 					param_filelc.cdrom = EnteteCD.NameCD_Device;
 					param_filelc.num_track = Audio->Str_Track;
@@ -604,7 +617,6 @@
 	gchar		*Ptr2 = NULL;
 	gchar		 Buf1 [ 2500 ];
 	gchar		 Buf2 [ 2500 ];
-	size_t		 LenFread = 0;
 	gint		 Elem;
 	gint		 Cpt;
 	gint		 TotalElem = LenFile;
@@ -621,8 +633,8 @@
 	fp3 = fopen (PathNameDest, "w");
 	
 	// Lecture des entetes
-	LenFread = fread (Buf1, 1, 44, fp1);
-	LenFread = fread (Buf2, 1, 44, fp2);
+	fread (Buf1, 1, 44, fp1);
+	fread (Buf2, 1, 44, fp2);
 	// Ecriture de l entete du fichier de destination
 	fwrite (Buf1, sizeof(gchar), 44, fp3);
 	
@@ -634,8 +646,8 @@
 		memset (Buf2, '\0', 2498);
 		
 		// Lectures des segments
-		LenFread = fread (Buf1, 1, 2352, fp1);
-		LenFread = fread (Buf2, 1, 2352, fp2);
+		fread (Buf1, 1, 2352, fp1);
+		fread (Buf2, 1, 2352, fp2);
 		
 		/* -------------------------------------------------------------
 		* DEBUG - DEBUG - DEBUG - DEBUG - DEBUG - DEBUG - DEBUG - DEBUG
@@ -658,14 +670,14 @@
 				if (*Ptr1 != *Ptr2) {
 					if (NbrPass <= 4) {
 						// Si le contenu des segments est different
-						Str = g_strdup_printf (_("[Erreur du segment numero: %d]\n%d) Lecture PASS 1/2\n"), Elem, NbrPass);
+						Str = g_strdup_printf (_("[Error on segment #%d] %d) Playing PASS 1/2\n"), Elem, NbrPass);
 						cdaudioextract_set_list_to_vte (Str);
 						g_free (Str);
 						Str = NULL;
 						BoolDiff = TRUE;
 					}
 					else { // NbrPass > 4
-						Str = g_strdup_printf (_("--> Deja %d fois 2 lectures du segment %d!\n Abandon :/\n"), NbrPass, Elem);
+						Str = g_strdup_printf (_("--> Segment %d already read two %d times!\n Abandon :/\n"), NbrPass, Elem);					
 						cdaudioextract_set_list_to_vte (Str);
 						g_free (Str);
 						Str = NULL;
@@ -685,7 +697,7 @@
 			conv_exec_extract (FALSE, CDPARANOIA_CD_TO_WAV_EXPERT_SEGMENT, "CDPARANOIA_CD_TO_WAV_EXPERT_SEGMENT");
 			
 			// Extraction segment 'Elem' PASS 2/2
-			Str = g_strdup_printf (_("%d) Lecture PASS 2/2\n"), NbrPass);
+			Str = g_strdup_printf (_("%d) Read PASS 2/2\n"), NbrPass);
 			cdaudioextract_set_list_to_vte (Str);
 			g_free (Str);
 			Str = NULL;
@@ -696,18 +708,18 @@
 
 			// Lecture segment 'Elem' pour Buf1
 			fpElem = fopen (Name1, "r");
-			LenFread = fread (Buf1, 1, 44, fpElem);
+			fread (Buf1, 1, 44, fpElem);
 			memset (Buf1, '\0', 2498);
-			LenFread = fread (Buf1, 1, 2352, fpElem);
+			fread (Buf1, 1, 2352, fpElem);
 			fclose (fpElem);
 			g_free (Name1);
 			Name1 = NULL;
 			
 			// Lecture segment 'Elem' pour Buf2
 			fpElem = fopen (Name2, "r");
-			LenFread = fread (Buf2, 1, 44, fpElem);
+			fread (Buf2, 1, 44, fpElem);
 			memset (Buf2, '\0', 2498);
-			LenFread = fread (Buf2, 1, 2352, fpElem);
+			fread (Buf2, 1, 2352, fpElem);
 			fclose (fpElem);			
 			g_free (Name2);
 			Name2 = NULL;
@@ -734,8 +746,6 @@
 	
 	PRINT("DEBUT THREAD EXTRACTION");
 	
-	// logs_add_datas_session ("FROM CD");
-		
 	ListOne = g_list_first (EnteteCD.GList_Audio_cd);
 	while (FALSE == conv.bool_stop && NULL != ListOne) {
 
@@ -751,12 +761,15 @@
 				
 				switch (Config.ExtractCdWith) {
 				case EXTRACT_WITH_CDPARANOIA :
+				case EXTRACT_WITH_CDPARANOIA_MODE_2 :
 					if (FALSE == conv.bool_stop) {
 					
-						// logs_writeln_datas ("EXTRACT_WITH_CDPARANOIA: ");
-						
 						cdaudioextract_restitue_arg_to_extract (Audio, NUM_WAV);
 						conv_exec_extract (Audio->ListConv[ NUM_WAV ].WithCommandLineUser, CDPARANOIA_CD_TO_WAV, "CDPARANOIA_CD_TO_WAV");
+						
+						conv_copy_src_to_dest( Audio->PathName_Dest_Tmp, Audio->PathName_Dest_Wav );
+						g_unlink( Audio->PathName_Dest_Tmp );
+						
 					}
 					break;
 				case EXTRACT_WITH_CDPARANOIA_EXPERT :
@@ -764,13 +777,11 @@
 						
 						gchar *Str = NULL;
 						
-						// logs_writeln_datas ("EXTRACT_WITH_CDPARANOIA_EXPERT: ");
-						
-						Str = g_strdup_printf (_("\n[Piste: %d]\n"), Audio->Num_Track);
+						Str = g_strdup_printf (_("\n[Track: %d]\n"), Audio->Num_Track);
 						cdaudioextract_set_list_to_vte (Str);
 						g_free (Str);
 						Str = NULL;
-						Str = g_strdup (_("Extraction mode expert PASS 1/2\n"));
+						Str = g_strdup (_("Ripping expert mode PASS 1/2\n"));
 						cdaudioextract_set_list_to_vte (Str);
 						g_free (Str);
 						Str = NULL;
@@ -781,7 +792,7 @@
 					
 					if (FALSE == conv.bool_stop) {
 						
-						cdaudioextract_set_list_to_vte (_("Extraction mode expert PASS 2/2\n"));
+						cdaudioextract_set_list_to_vte (_("Ripping expert mode PASS 2/2\n"));
 						
 						cdaudioextract_restitue_arg_to_extract (Audio, NUM_WAV_EXPERT_2);
 						conv_exec_extract (Audio->ListConv[ NUM_WAV_EXPERT_2 ].WithCommandLineUser, CDPARANOIA_CD_TO_WAV_EXPERT, "CDPARANOIA_CD_TO_WAV_EXPERT");
@@ -789,7 +800,7 @@
 					
 					if (FALSE == conv.bool_stop) {
 						
-						cdaudioextract_set_list_to_vte (_("Controle du contenu des fichiers extraits\n"));
+						cdaudioextract_set_list_to_vte (_("Control the content of the extracted files\n"));
 						
 						cdaudioextract_copy_src_to_dest (
 								Audio->ExtractExpert.Name1,
@@ -804,13 +815,9 @@
 				case EXTRACT_WITH_CDDA2WAV :
 
 					if (FALSE == conv.bool_stop) {
-						/*g_chdir (conv.TmpRep);*/
-							
-						// logs_writeln_datas ("EXTRACT_WITH_ICEDAX: ");
 							
 						cdaudioextract_restitue_arg_to_extract (Audio, NUM_WAV);
 						conv_exec_extract (Audio->ListConv[ NUM_WAV ].WithCommandLineUser, CDDA2WAV_CD_TO_WAV, "CDDA2WAV_CD_TO_WAV");
-						/*g_chdir (VarCdExtract.PtrDirActuel);*/
 						
 						if (FALSE == conv.bool_stop) {
 							
@@ -832,19 +839,15 @@
 				if (FALSE == conv.bool_stop && TRUE == Audio->EtatNormalise) {
 					switch (VarCdExtract.ComboNumActive) {
 					case 0 :
-						// logs_writeln_datas ("\tNORMALISATION PEAK/ALBUM");
 						Audio->EtatPeak = CD_NORM_PEAK_WAITING;
 						PRINT("ADD PEAK/ALBUM");
 						CdNormalise_add_PeakGroup ();
 						break;
 					case 1 :
-						// logs_writeln_datas ("\tNORMALISATION PEAK");
 						Audio->EtatPeak = CD_NORM_PEAK_WAITING;
 						break;
 					}
 				}
-				// logs_write_datas ("\t");
-				// logs_writeln_datas (Audio->PathName_Dest_Wav);
 				
 				Audio->EtatSelection_Wav = CD_ETAT_ATTENTE;
 
@@ -873,7 +876,6 @@
 	if (FALSE == conv.bool_stop && TRUE == VarCdExtract.BoolListIsPeakAlbum) {
 	
 		PRINT("DEBUT NORMALISATION PEAK/ALBUM");
-		// logs_write_datas ("\tNORMALISATION PEAK/ALBUM with ");
 			
 		if (FALSE == conv.bool_stop &&
 			 CdNormalise_get_is_list_PeakGroup () == TRUE &&
@@ -881,6 +883,7 @@
 			
 			GList				*List2 = NULL;
 			VAR_CD_NORMALISE_ELEMENT	*VarCDNormaliseElement = NULL;
+			gchar				**PtrTabArgs = NULL;
 			
 			// COPIE DES FICHIERS DESTINAION -> TEMPORAIRE
 			
@@ -894,53 +897,50 @@
 			
 			// -- CHERCHER LA MOYENNE PEAK
 			
-			pos = filelc_get_command_line_nice ();
-			conv.ArgConv [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
-			conv.ArgConv [ pos++ ] = g_strdup ("-n");
+			PtrTabArgs = filelc_AllocTabArgs();
+			pos = 3;
+			PtrTabArgs [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
+			PtrTabArgs [ pos++ ] = g_strdup ("-n");
 			
 			// -- AJOUTER LA LISTE DES FICHIERS
 
 			List2 = g_list_first (CdNormalise_get_list_PeakGroup ());
 			while (List2) {
 				if (NULL != (VarCDNormaliseElement = (VAR_CD_NORMALISE_ELEMENT *)List2->data)) {
-					conv.ArgConv [ pos++ ] = g_strdup_printf ("%s", VarCDNormaliseElement->PathNameSrc);
+					PtrTabArgs [ pos++ ] = g_strdup_printf ("%s", VarCDNormaliseElement->PathNameSrc);
 				}
 				List2 = g_list_next(List2);
 			}
-			conv.ArgConv [ pos++ ] = NULL;
+			PtrTabArgs [ pos++ ] = NULL;
 			
 			conv.bool_percent_extract = conv.bool_percent_conv = TRUE;
-			conv_to_convert (FALSE, NORMALISE_GET_LEVEL, "NORMALISE_GET_LEVEL -> PEAK/GROUP");
-			filelc_get_command_line_remove ();
-			
-			// logs_write_double (conv.value_PEAK_RMS_GROUP_ARGS);
-			// logs_writeln_datas ("dB");
+			conv_to_convert (PtrTabArgs, FALSE, NORMALISE_GET_LEVEL, "NORMALISE_GET_LEVEL -> PEAK/GROUP");
+			PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 			
 			// -- APPLIQUER LA MOYENNE PEAK
 			if (FALSE == conv.bool_stop) {
-				pos = filelc_get_command_line_nice ();
-				conv.ArgConv [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
-				conv.ArgConv [ pos++ ] = g_strdup_printf ("--gain=%fdB", conv.value_PEAK_RMS_GROUP_ARGS);
+				PtrTabArgs = filelc_AllocTabArgs();
+				pos = 3;
+				PtrTabArgs [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
+				PtrTabArgs [ pos++ ] = g_strdup_printf ("--gain=%fdB", conv.value_PEAK_RMS_GROUP_ARGS);
 							
 				// -- AJOUTER LA LISTE DES FICHIERS
 				
 				List2 = g_list_first (CdNormalise_get_list_PeakGroup ());
 				while (List2) {
 					if (NULL != (VarCDNormaliseElement = (VAR_CD_NORMALISE_ELEMENT *)List2->data)) {
-						// logs_write_datas ("\t");
-						// logs_writeln_datas (VarCDNormaliseElement->PathNameDest);
-						conv.ArgConv [ pos++ ] = g_strdup_printf ("%s", VarCDNormaliseElement->PathNameSrc);
+						PtrTabArgs [ pos++ ] = g_strdup_printf ("%s", VarCDNormaliseElement->PathNameSrc);
 					}
 					List2 = g_list_next(List2);
 				}
-				conv.ArgConv [ pos++ ] = g_strdup ("--");
-				conv.ArgConv [ pos++ ] = NULL;
+				PtrTabArgs [ pos++ ] = g_strdup ("--");
+				PtrTabArgs [ pos++ ] = NULL;
 				
 				// -- NORMALISATION
 				
 				conv.bool_percent_extract = conv.bool_percent_conv = TRUE;
-				conv_to_convert (FALSE, NORMALISE_EXEC, "NORMALISE_EXEC Wav -> PEAK/GROUP");
-				filelc_get_command_line_remove ();
+				conv_to_convert (PtrTabArgs, FALSE, NORMALISE_EXEC, "NORMALISE_EXEC Wav -> PEAK/GROUP");
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 
 				CdNormalise_set_normalise_ok ();
 
@@ -978,6 +978,7 @@
 	GList		*ListOne = NULL;
 	CD_AUDIO	*Audio = NULL;
 	gint		pos;
+	gchar		**PtrTabArgs = NULL;
 	
 	conv.bool_thread_conv = TRUE;
 	
@@ -1011,11 +1012,13 @@
 				
 				gchar	*Name = NULL;
 				gchar	*Ptr = NULL;
+				gchar	**PtrTabArgs = NULL;
 
 				// Creation de la list
-				pos = filelc_get_command_line_nice ();
-				conv.ArgConv [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
-				conv.ArgConv [ pos++ ] = g_strdup ("--peak");
+				PtrTabArgs = filelc_AllocTabArgs();
+				pos = 3;
+				PtrTabArgs [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
+				PtrTabArgs [ pos++ ] = g_strdup ("--peak");
 								
 				Name = g_strdup_printf ("%s0123456789", Audio->PathName_Dest_Wav);
 				Ptr = strrchr (Name, '/');
@@ -1023,13 +1026,13 @@
 				strcpy (Ptr, "01.wav");
 				conv_copy_src_to_dest (Audio->PathName_Dest_Wav, Name);
 				
-				conv.ArgConv [ pos++ ] = g_strdup_printf ("%s", Name);
-				conv.ArgConv [ pos++ ] = g_strdup ("--");
-				conv.ArgConv [ pos++ ] = NULL;
+				PtrTabArgs [ pos++ ] = g_strdup_printf ("%s", Name);
+				PtrTabArgs [ pos++ ] = g_strdup ("--");
+				PtrTabArgs [ pos++ ] = NULL;
 				
 				// NORMALISATION PEAK
-				conv_to_convert (FALSE, NORMALISE_EXEC, "NORMALISE_EXEC Wav -> Peak");
-				filelc_get_command_line_remove ();
+				conv_to_convert (PtrTabArgs, FALSE, NORMALISE_EXEC, "NORMALISE_EXEC Wav -> Peak");
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 				
 				conv_copy_src_to_dest (Name, Audio->PathName_Dest_Wav);
 				g_unlink (Name);
@@ -1054,6 +1057,7 @@
 			if (VarCdExtract.PassFileUnique >= VarCdExtract.NbrFileUnique) {
 				
 				GList	*list = NULL;
+				gchar	**PtrTabArgs = NULL;
 				
 				// conv_product_name_for_label (Audio->PathName_Dest_Wav);
 				switch (VarCdExtract.ChoiceFileCue) {
@@ -1063,31 +1067,33 @@
 				case 3 : Audio->Etat_Mpc = ETAT_CONV_CD_WAITING; break;
 			 	}
 								
-				pos = filelc_get_command_line_nice ();
-				conv.ArgConv [ pos++ ] = g_strdup ("sox");
+				PtrTabArgs = filelc_AllocTabArgs();
+				pos = 3;
+				PtrTabArgs [ pos++ ] = g_strdup ("sox");
 				list = g_list_first (VarCdExtract.ListFileFormatUnique);
 				while (list) {
 					if (NULL != (gchar *)list->data) {
-						conv.ArgConv [ pos++ ] = g_strdup ((gchar *)list->data);
+						PtrTabArgs [ pos++ ] = g_strdup ((gchar *)list->data);
 					}
 					list = g_list_next (list);
 				}
-				conv.ArgConv [ pos++ ] = g_strdup ("-t");
-				conv.ArgConv [ pos++ ] = g_strdup (".wav");
-				conv.ArgConv [ pos++ ] = g_strdup ("-S");
-				conv.ArgConv [ pos++ ] = g_strdup ("-r");
-				conv.ArgConv [ pos++ ] = g_strdup ("44100");
-				conv.ArgConv [ pos++ ] = g_strdup ("-c");
-				conv.ArgConv [ pos++ ] = g_strdup ("2");
-				conv.ArgConv [ pos++ ] = g_strdup ("-o");
-				conv.ArgConv [ pos++ ] = g_strdup (VarCdExtract.NameFileFormatUnique);
-				conv.ArgConv [ pos++ ] = NULL;
+				PtrTabArgs [ pos++ ] = g_strdup ("-t");
+				PtrTabArgs [ pos++ ] = g_strdup (".wav");
+				PtrTabArgs [ pos++ ] = g_strdup ("-S");
+				PtrTabArgs [ pos++ ] = g_strdup ("-r");
+				PtrTabArgs [ pos++ ] = g_strdup ("44100");
+				PtrTabArgs [ pos++ ] = g_strdup ("-c");
+				PtrTabArgs [ pos++ ] = g_strdup ("2");
+				PtrTabArgs [ pos++ ] = g_strdup ("-o");
+				PtrTabArgs [ pos++ ] = g_strdup (VarCdExtract.NameFileFormatUnique);
+				PtrTabArgs [ pos++ ] = NULL;
 				
-				conv_to_convert (FALSE, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
-				filelc_get_command_line_remove ();
-	PRINT("DEBUG FOR @DZEF");
-if( TRUE == OptionsCommandLine.BoolVerboseMode )
-	g_print("\t%s = %s\n\n", VarCdExtract.NameFileFormatUnique, libutils_test_file_exist (VarCdExtract.NameFileFormatUnique) ? "EXIST" : "NOT FOUND");
+				conv_to_convert (PtrTabArgs, FALSE, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+				
+				PRINT("DEBUG FOR @DZEF");
+				if( TRUE == OptionsCommandLine.BoolVerboseMode )
+					g_print("\t%s = %s\n\n", VarCdExtract.NameFileFormatUnique, libutils_test_file_exist (VarCdExtract.NameFileFormatUnique) ? "EXIST" : "NOT FOUND");
 	
 				conv.Bool_MAJ_select = TRUE;
 			}
@@ -1107,14 +1113,13 @@
 				g_print ("DEST FLAC<%s>\n", Audio->PathName_Dest_Flac);
 			}
 			
-			// logs_write_datas ("\t");
-			// logs_write_datas (Audio->PathName_Dest_Wav);
-			// logs_write_datas (" -> ");
-			// logs_writeln_datas (Audio->PathName_Dest_Flac);
-
-			cdaudioextract_restitue_arg_to_conv (Audio, NUM_FLAC);
-			conv_to_convert (Audio->ListConv[ NUM_FLAC ].WithCommandLineUser, FLAC_WAV_TO_FLAC, "FLAC_WAV_TO_FLAC");
-			filelc_get_command_line_remove ();
+			PtrTabArgs = filelc_AllocTabArgs();
+			g_free( PtrTabArgs[ 0 ] );
+			g_free( PtrTabArgs[ 1 ] );
+			g_free( PtrTabArgs[ 2 ] );
+			cdaudioextract_restitue_arg_to_conv( PtrTabArgs, Audio, NUM_FLAC );
+			conv_to_convert (PtrTabArgs, Audio->ListConv[ NUM_FLAC ].WithCommandLineUser, FLAC_WAV_TO_FLAC, "FLAC_WAV_TO_FLAC");
+			PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 
 			Audio->EtatSelection_Flac = CD_ETAT_ATTENTE;
 
@@ -1134,14 +1139,14 @@
 				g_print ("SOURCE WAV <%s>\n", Audio->PathName_Dest_Wav);
 				g_print ("DEST APE <%s>\n", Audio->PathName_Dest_Ape);
 			}
-			// logs_write_datas ("\t");
-			// logs_write_datas (Audio->PathName_Dest_Wav);
-			// logs_write_datas (" -> ");
-			// logs_writeln_datas (Audio->PathName_Dest_Ape);
 
-			cdaudioextract_restitue_arg_to_conv (Audio, NUM_APE);
-			conv_to_convert (Audio->ListConv[ NUM_APE ].WithCommandLineUser, MAC_WAV_TO_APE, "MAC_WAV_TO_APE");
-			filelc_get_command_line_remove ();
+			PtrTabArgs = filelc_AllocTabArgs();
+			g_free( PtrTabArgs[ 0 ] );
+			g_free( PtrTabArgs[ 1 ] );
+			g_free( PtrTabArgs[ 2 ] );
+			cdaudioextract_restitue_arg_to_conv (PtrTabArgs, Audio, NUM_APE);
+			conv_to_convert (PtrTabArgs, Audio->ListConv[ NUM_APE ].WithCommandLineUser, MAC_WAV_TO_APE, "MAC_WAV_TO_APE");
+			PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 
 			Audio->EtatSelection_Ape = CD_ETAT_ATTENTE;
 
@@ -1165,16 +1170,15 @@
 				g_print ("DEST WAVPACK <%s>\n", Audio->PathName_Dest_WavPack);
 			}
 			
-			// logs_write_datas ("\t");
-			// logs_write_datas (Audio->PathName_Dest_Wav);
-			// logs_write_datas (" -> ");
-			// logs_writeln_datas (Audio->PathName_Dest_WavPack);
-
 			Audio->EtatBoolWavpack = TRUE;
 			
-			cdaudioextract_restitue_arg_to_conv (Audio, NUM_WAVPACK);
-			conv_to_convert (Audio->ListConv[ NUM_WAVPACK ].WithCommandLineUser, WAVPACK_WAV_TO_WAVPACK, "WAVPACK_WAV_TO_WAVPACK");
-			filelc_get_command_line_remove ();
+			PtrTabArgs = filelc_AllocTabArgs();
+			g_free( PtrTabArgs[ 0 ] );
+			g_free( PtrTabArgs[ 1 ] );
+			g_free( PtrTabArgs[ 2 ] );
+			cdaudioextract_restitue_arg_to_conv (PtrTabArgs, Audio, NUM_WAVPACK);
+			conv_to_convert (PtrTabArgs, Audio->ListConv[ NUM_WAVPACK ].WithCommandLineUser, WAVPACK_WAV_TO_WAVPACK, "WAVPACK_WAV_TO_WAVPACK");
+			PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 			
 			Audio->EtatSelection_WavPack = CD_ETAT_ATTENTE;
 
@@ -1209,14 +1213,14 @@
 				g_print ("SOURCE WAV <%s>\n", Audio->PathName_Dest_Wav);
 				g_print ("DEST OGG <%s>\n", Audio->PathName_Dest_Ogg);
 			}
-			// logs_write_datas ("\t");
-			// logs_write_datas (Audio->PathName_Dest_Wav);
-			// logs_write_datas (" -> ");
-			// logs_writeln_datas (Audio->PathName_Dest_Ogg);
-
-			cdaudioextract_restitue_arg_to_conv (Audio, NUM_OGG);
-			conv_to_convert (Audio->ListConv[ NUM_OGG ].WithCommandLineUser, OGGENC_WAV_TO_OGG, "OGGENC_WAV_TO_OGG");
-			filelc_get_command_line_remove ();
+
+			PtrTabArgs = filelc_AllocTabArgs();
+			g_free( PtrTabArgs[ 0 ] );
+			g_free( PtrTabArgs[ 1 ] );
+			g_free( PtrTabArgs[ 2 ] );
+			cdaudioextract_restitue_arg_to_conv (PtrTabArgs, Audio, NUM_OGG);
+			conv_to_convert( PtrTabArgs, Audio->ListConv[ NUM_OGG ].WithCommandLineUser, OGGENC_WAV_TO_OGG, "OGGENC_WAV_TO_OGG");
+			PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 			
 			Audio->EtatSelection_Ogg = CD_ETAT_ATTENTE;
 
@@ -1236,14 +1240,14 @@
 				g_print ("SOURCE WAV <%s>\n", Audio->PathName_Dest_Wav);
 				g_print ("DEST M4A <%s>\n", Audio->PathName_Dest_M4a);
 			}
-			// logs_write_datas ("\t");
-			// logs_write_datas (Audio->PathName_Dest_Wav);
-			// logs_write_datas (" -> ");
-			// logs_writeln_datas (Audio->PathName_Dest_M4a);
 
-			cdaudioextract_restitue_arg_to_conv (Audio, NUM_M4A);
-			conv_to_convert (Audio->ListConv[ NUM_M4A ].WithCommandLineUser, FAAC_WAV_TO_M4A, "FAAC_WAV_TO_M4A");
-			filelc_get_command_line_remove ();
+			PtrTabArgs = filelc_AllocTabArgs();
+			g_free( PtrTabArgs[ 0 ] );
+			g_free( PtrTabArgs[ 1 ] );
+			g_free( PtrTabArgs[ 2 ] );
+			cdaudioextract_restitue_arg_to_conv (PtrTabArgs, Audio, NUM_M4A);
+			conv_to_convert( PtrTabArgs, Audio->ListConv[ NUM_M4A ].WithCommandLineUser, FAAC_WAV_TO_M4A, "FAAC_WAV_TO_M4A");
+			PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 
 			Audio->EtatSelection_M4a = CD_ETAT_ATTENTE;
 
@@ -1263,14 +1267,14 @@
 				g_print ("SOURCE WAV <%s>\n", Audio->PathName_Dest_Wav);
 				g_print ("DEST AAC <%s>\n", Audio->PathName_Dest_Aac);
 			}
-			// logs_write_datas ("\t");
-			// logs_write_datas (Audio->PathName_Dest_Wav);
-			// logs_write_datas (" -> ");
-			// logs_writeln_datas (Audio->PathName_Dest_Aac);
 
-			cdaudioextract_restitue_arg_to_conv (Audio, NUM_AAC);
-			conv_to_convert (Audio->ListConv[ NUM_AAC ].WithCommandLineUser, AACPLUSENC_WAV_TO_AAC, "AACPLUSENC_WAV_TO_AAC");
-			filelc_get_command_line_remove ();
+			PtrTabArgs = filelc_AllocTabArgs();
+			g_free( PtrTabArgs[ 0 ] );
+			g_free( PtrTabArgs[ 1 ] );
+			g_free( PtrTabArgs[ 2 ] );
+			cdaudioextract_restitue_arg_to_conv (PtrTabArgs, Audio, NUM_AAC);
+			conv_to_convert( PtrTabArgs, Audio->ListConv[ NUM_AAC ].WithCommandLineUser, AACPLUSENC_WAV_TO_AAC, "AACPLUSENC_WAV_TO_AAC");
+			PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 
 			Audio->EtatSelection_Aac = CD_ETAT_ATTENTE;
 
@@ -1292,14 +1296,14 @@
 				g_print ("SOURCE WAV <%s>\n", Audio->PathName_Dest_Wav);
 				g_print ("DEST MPC <%s>\n", Audio->PathName_Dest_Mpc);
 			}
-			// logs_write_datas ("\t");
-			// logs_write_datas (Audio->PathName_Dest_Wav);
-			// logs_write_datas (" -> ");
-			// logs_writeln_datas (Audio->PathName_Dest_Mpc);
 
-			cdaudioextract_restitue_arg_to_conv (Audio, NUM_MPC);
-			conv_to_convert (Audio->ListConv[ NUM_MPC ].WithCommandLineUser, MPPENC_WAV_TO_MPC, "MPPENC_WAV_TO_MPC");
-			filelc_get_command_line_remove ();
+			PtrTabArgs = filelc_AllocTabArgs();
+			g_free( PtrTabArgs[ 0 ] );
+			g_free( PtrTabArgs[ 1 ] );
+			g_free( PtrTabArgs[ 2 ] );
+			cdaudioextract_restitue_arg_to_conv (PtrTabArgs, Audio, NUM_MPC);
+			conv_to_convert( PtrTabArgs, Audio->ListConv[ NUM_MPC ].WithCommandLineUser, MPPENC_WAV_TO_MPC, "MPPENC_WAV_TO_MPC");
+			PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 
 			Audio->EtatSelection_Mpc = CD_ETAT_ATTENTE;
 
@@ -1319,14 +1323,14 @@
 				g_print ("SOURCE WAV <%s>\n", Audio->PathName_Dest_Wav);
 				g_print ("DEST MP3 <%s>\n", Audio->PathName_Dest_Mp3);
 			}
-			// logs_write_datas ("\t");
-			// logs_write_datas (Audio->PathName_Dest_Wav);
-			// logs_write_datas (" -> ");
-			// logs_writeln_datas (Audio->PathName_Dest_Mp3);
-
-			cdaudioextract_restitue_arg_to_conv (Audio, NUM_MP3);
-			conv_to_convert (Audio->ListConv[ NUM_MP3 ].WithCommandLineUser, LAME_WAV_TO_MP3, "LAME_WAV_TO_MP3");
-			filelc_get_command_line_remove ();
+
+			PtrTabArgs = filelc_AllocTabArgs();
+			g_free( PtrTabArgs[ 0 ] );
+			g_free( PtrTabArgs[ 1 ] );
+			g_free( PtrTabArgs[ 2 ] );
+			cdaudioextract_restitue_arg_to_conv (PtrTabArgs, Audio, NUM_MP3);
+			conv_to_convert( PtrTabArgs, Audio->ListConv[ NUM_MP3 ].WithCommandLineUser, LAME_WAV_TO_MP3, "LAME_WAV_TO_MP3");
+			PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 			
 			Audio->EtatSelection_Mp3 = CD_ETAT_ATTENTE;
 
@@ -1379,17 +1383,39 @@
 
 		GList		*List = NULL;
 		gchar		*Ptr = NULL;
+		FILE		*fp = NULL;
 		
 	 	if (NULL != (List = g_list_first (conv.ListPutTextview))) {
+	 		
+	 		if( TRUE == OptionsCd_get_save_log_mode_expert()) {
+	 			
+	 			gchar	*StrModeExpert = NULL;
+	 			
+	 			StrModeExpert = g_strdup_printf( "%s/LogExpertMode.txt", VarCdExtract.PathDestinationModeExpert );
+	 			fp = fopen( StrModeExpert, "a" );
+	 			g_free( StrModeExpert );
+	 			StrModeExpert = NULL;
+	 		}
+			
 			while (List) {
 				if (NULL != (Ptr = (gchar *)List->data)) {
 					WinVte_window_write_va( Ptr, NULL );
+					
+					// SAVE LOG FROM CDPARANOIA MODE EXPERT
+					if( TRUE == OptionsCd_get_save_log_mode_expert()) {
+						fprintf( fp, "%s", Ptr );
+					}
+					
 					g_free (Ptr);
 					Ptr = NULL;
 					List->data = NULL;
 				}
 				List = g_list_next(List);
 			}
+	 		
+	 		if( TRUE == OptionsCd_get_save_log_mode_expert())
+				fclose( fp );
+			
 			conv.BoolPutTextview = FALSE;
 		}
 	}
@@ -1447,8 +1473,7 @@
 		GList		*List = NULL;
 		FILE		*fp = NULL;
 
-		PopupSystray_set_BoolMainAction (FALSE);
-		gtk_timeout_remove (conv.handler_timeout_conv);
+		g_source_remove (conv.handler_timeout_conv);
 
 		// Creation du fichier *.m3u
 		if (TRUE == var_cd.Bool_create_file_m3u) {
@@ -1468,7 +1493,7 @@
 
 							if (Audio->Etat_Flac == ETAT_CONV_CD_CONV_OK)	fprintf (fp, "%s\n", Audio->PathName_Dest_Flac);
 							if (Audio->Etat_Wav == ETAT_CONV_CD_CONV_OK &&
-							 Audio->BoolM3uForWav == TRUE)	fprintf (fp, "%s\n", Audio->PathName_Dest_Wav);
+							 Audio->BoolM3uForWav == TRUE)			fprintf (fp, "%s\n", Audio->PathName_Dest_Wav);
 							if (Audio->Etat_Mp3 == ETAT_CONV_CD_CONV_OK)		fprintf (fp, "%s\n", Audio->PathName_Dest_Mp3);
 							if (Audio->Etat_Ogg == ETAT_CONV_CD_CONV_OK)		fprintf (fp, "%s\n", Audio->PathName_Dest_Ogg);
 							if (Audio->Etat_m4a == ETAT_CONV_CD_CONV_OK)		fprintf (fp, "%s\n", Audio->PathName_Dest_M4a);
@@ -1505,9 +1530,10 @@
 						 Audio->Etat_Ape == ETAT_CONV_CD_CONV_OK ||
 						 Audio->Etat_WavPack == ETAT_CONV_CD_CONV_OK) {
 							
-							if (Audio->Etat_Flac == ETAT_CONV_CD_CONV_OK)	fprintf (fp, " <track><location>%s</location></track>\n", Audio->PathName_Dest_Flac);
+							if (Audio->Etat_Flac == ETAT_CONV_CD_CONV_OK)
+														fprintf (fp, " <track><location>%s</location></track>\n", Audio->PathName_Dest_Flac);
 							if (Audio->Etat_Wav == ETAT_CONV_CD_CONV_OK && Audio->BoolM3uForWav == TRUE)
-												fprintf (fp, " <track><location>%s</location></track>\n", Audio->PathName_Dest_Wav);
+														fprintf (fp, " <track><location>%s</location></track>\n", Audio->PathName_Dest_Wav);
 							if (Audio->Etat_Mp3 == ETAT_CONV_CD_CONV_OK)		fprintf (fp, " <track><location>%s</location></track>\n", Audio->PathName_Dest_Mp3);
 							if (Audio->Etat_Ogg == ETAT_CONV_CD_CONV_OK)		fprintf (fp, " <track><location>%s</location></track>\n", Audio->PathName_Dest_Ogg);
 							if (Audio->Etat_m4a == ETAT_CONV_CD_CONV_OK)		fprintf (fp, " <track><location>%s</location></track>\n", Audio->PathName_Dest_M4a);
@@ -1557,7 +1583,7 @@
 					g_free (Audio->PathName_Dest_Wav);
 					Audio->PathName_Dest_Wav = NULL;
 				}
-
+				
 				if (Audio->PathName_Dest_Mp3) {
 					if (Audio->Bool_Delette_Mp3) {
 						if( TRUE == OptionsCommandLine.BoolVerboseMode )
@@ -1627,6 +1653,12 @@
 					g_free (Audio->PathName_Dest_WavPack);
 					Audio->PathName_Dest_WavPack = NULL;
 				}
+				
+				if( Audio->PathName_Dest_Tmp ) {
+					g_free( Audio->PathName_Dest_Tmp );
+					Audio->PathName_Dest_Tmp = NULL;
+				}
+				
 				if (Audio->ExtractExpert.Name1) {
 					g_free (Audio->ExtractExpert.Name1);
 					Audio->ExtractExpert.Name1 = NULL;
@@ -1677,7 +1709,7 @@
 		if (FALSE == conv.bool_stop) {
 			NotifySend_msg (_("XCFA: Extraction CD"), _("Ok"), conv.bool_stop);
 		} else {
-			NotifySend_msg (_("XCFA: Extraction CD"), _("Arret par l'utilisateur"), conv.bool_stop);
+			NotifySend_msg (_("XCFA: Extraction CD"), _("Stop by user"), conv.bool_stop);
 		}
 	}
 	return (TRUE);
@@ -1777,6 +1809,9 @@
 				if (Config.ExtractCdWith == EXTRACT_WITH_CDPARANOIA_EXPERT) {
 					conv.total_rip ++;	// PASS 2
 				}
+				if( Config.ExtractCdWith == EXTRACT_WITH_CDPARANOIA || Config.ExtractCdWith == EXTRACT_WITH_CDPARANOIA_MODE_2 ) {
+					conv.total_rip ++;	// NORMAL PASS
+				}
 				conv.total_rip ++;		// NORMAL PASS
 				cdcue_set_BoolExtract (IndexExtraction, TRUE);
 			}
@@ -1818,16 +1853,25 @@
 			if (NULL == PathDest) {
 				PathDest = cdaudio_get_result_destination ();
 				g_mkdir_with_parents (PathDest, 0700);
+				
+				if( NULL != VarCdExtract.PathDestinationModeExpert ) {
+					g_free( VarCdExtract.PathDestinationModeExpert );
+					VarCdExtract.PathDestinationModeExpert = NULL;
+				}
+				VarCdExtract.PathDestinationModeExpert = g_strdup( PathDest );
 			}
 			// Create tmp rep
-			if (NULL == conv.TmpRep) {
+			if( NULL == conv.TmpRep )
 				conv.TmpRep = libutils_create_temporary_rep (Config.PathnameTMP, PATH_TMP_XCFA_AUDIOCD);
-			}
+			
+			if( NULL == Audio->PathName_Dest_Tmp )
+				Audio->PathName_Dest_Tmp = g_strdup_printf( "%s/TempAudioExtract_%02d.wav", conv.TmpRep, IndexExtraction +1 );
 		
 			if (Audio->Etat_Wav == ETAT_CONV_CD_WAITING) {
 
 				switch (Config.ExtractCdWith) {
 				case EXTRACT_WITH_CDPARANOIA :
+				case EXTRACT_WITH_CDPARANOIA_MODE_2 :
 					if (Audio->EtatSelection_Wav <= CD_ETAT_ATTENTE_EXIST) {
 
 						Audio->PathName_Dest_Wav = g_strdup_printf ("%s/%s.wav", conv.TmpRep, Audio->NameSong);
@@ -1934,9 +1978,10 @@
 		gchar *Ptr = NULL;
 		Ptr = (gchar *)gtk_entry_get_text (GTK_ENTRY (var_cd.Adr_entry_name_file_cue));
 		if (*Ptr == '\0') {
-			wininfo_create (
-				_("Nom de fichier unique absent"),
-				_("Veuillez saisir un nom pour le fichier unique"),
+			wind_info_init (
+				WindMain,
+				_("File name not found"),
+				_("Please enter a file name"),
 				 "");
 			return;
 		}
@@ -1944,6 +1989,8 @@
 
 	if (gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (var_options.Adr_radiobutton_extract_with_cdparanoia)) == TRUE)
 		Config.ExtractCdWith = EXTRACT_WITH_CDPARANOIA;
+	else if (gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (var_options.Adr_radiobutton_cdparanoia_mode_2)) == TRUE)
+		Config.ExtractCdWith = EXTRACT_WITH_CDPARANOIA_MODE_2;
 	else if (gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (var_options.Adr_radiobutton_cdparanoia_mode_expert)) == TRUE)
 		Config.ExtractCdWith = EXTRACT_WITH_CDPARANOIA_EXPERT;
 	else if (gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (var_options.Adr_radiobutton_extract_with_cdda2wav)) == TRUE)
@@ -1963,7 +2010,12 @@
 	BaseIoctl.PathNameDestFileCue = NULL;
 	cdaudioextract_set_flags_before_extraction ();
 
-	WindScan_open ("Extract / Convert from CD", WINDSCAN_PULSE);
+	// WindScan_open ("Extract / Convert from CD", WINDSCAN_PULSE);
+	wind_scan_init(
+		WindMain,
+		"Extract / Convert from CD",
+		WINDSCAN_PULSE
+		);
 	WindScan_set_label ("Extract from CD ...");
 	WindScan_set_pulse ();
 	if (EXTRACT_WITH_CDPARANOIA_EXPERT == Config.ExtractCdWith) {
@@ -1984,15 +2036,13 @@
 
 	VarCdExtract.PtrDirActuel = g_get_current_dir ();
 	g_chdir (conv.TmpRep);
-
-	PopupSystray_set_BoolMainAction (TRUE);
 	
 	conv.bool_thread_conv = TRUE;
 	pthread_create (&nmr_tid, NULL ,(void *)cdaudioextract_thread_conversion_from_cd, (void *)NULL);
 	conv.bool_thread_extract = TRUE;
 	pthread_create (&nmr_tid, NULL ,(void *)cdaudioextract_thread_extraction_from_cd, (void *)NULL);
 	PRINT("DEBUT TIMEOUT");
-	conv.handler_timeout_conv = gtk_timeout_add (50, cdaudioextract_timeout, 0);
+	conv.handler_timeout_conv = g_timeout_add (50, cdaudioextract_timeout, 0);
 }

xcfa-4.2.8.tar.gz/src/cd_audio_extract.h -> xcfa-5.0.2.tar.gz/src/cd_audio_extract.h Changed

xcfa-4.2.8.tar.gz/src/cd_audio_toc.c -> xcfa-5.0.2.tar.gz/src/cd_audio_toc.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : cd_audio_toc.h
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -30,11 +30,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <string.h>
@@ -96,7 +91,7 @@
 	if (var_cd.bool_thread_read_toc_cd == FALSE) {
 
 		// FIN du timeout Update_cdaudio_do_read_toc_cd
-		gtk_timeout_remove (var_cd.handler_timeout_read_toc_cd);
+		g_source_remove (var_cd.handler_timeout_read_toc_cd);
 
 		cdaudio_put_label_duree ("");
 		cdaudio_put_label_titre ("");
@@ -156,19 +151,22 @@
 	
 		PRINT_FUNC_LF();
 		if( FALSE == libutils_find_file( "icedax" ) && FALSE == libutils_find_file( "cdda2wav" )) {
-			wininfo_create (
+			wind_info_init (
+				WindMain,
 				_("cdda2wav and icedax NOT FOUND"),
 				_("Please, install packages [ icedax, cdda2wav ]"),
 			 	"");
 		}
 		else if( FALSE == libutils_find_file( "icedax" )) {
-			wininfo_create (
+			wind_info_init (
+				WindMain,
 				_("icedax NOT FOUND"),
 				_("Please, install package [ icedax ]"),
 			 	"");
 		}
 		else if( FALSE == libutils_find_file( "cdda2wav" )) {
-			wininfo_create (
+			wind_info_init (
+				WindMain,
 				_("cdda2wav NOT FOUND"),
 				_("Please, install package [ cdda2wav ]"),
 			 	"");
@@ -177,14 +175,16 @@
 	}
 	if( FALSE == PrgInit.bool_cdparanoia ) {
 		PRINT_FUNC_LF();
-		wininfo_create (
+		wind_info_init (
+			WindMain,
 			_("cdparanoia NOT FOUND"),
 			_("Please, install package [ cdparanoia ]"),
 		 	"");
 		return;
 	}
 	if( FALSE == PrgInit.bool_cd_discid ) {
-		wininfo_create (
+		wind_info_init (
+			WindMain,
 			_("cd-discid NOT FOUND"),
 			_("Please, install packages [ cd-discid ]"),
 		 	"");
@@ -198,15 +198,21 @@
 		if( '\0' == *Config.entry_proxy_server ) BoolAccess = FALSE;
 		if( '\0' == *Config.entry_proxy_port ) BoolAccess = FALSE;
 		if( FALSE == BoolAccess ) {
-			wininfo_create (
-				_("ERREUR datas proxy"),
-				_("Veuillez renseigner les champs du proxy"),
+			wind_info_init (
+				WindMain,
+				_("ERROR datas proxy"),
+				_("Please complete all fields proxy"),
 			 	"");
 			return;
 		}
 	}
 	
-	WindScan_open ("Scan CD", WINDSCAN_PULSE);
+	// WindScan_open ("Scan CD", WINDSCAN_PULSE);
+	wind_scan_init(
+		WindMain,
+		"Scan CD",
+		WINDSCAN_PULSE
+		);
 	WindScan_show_cancel( FALSE );
 	WindScan_set_label ("Scanning CD ...");
 	WindScan_set_pulse ();
@@ -223,7 +229,7 @@
 	// ACTIVATION de l'update qui attends la fin du thread cd audio
 	var_cd.bool_thread_read_toc_cd = TRUE;
 	var_cd.bool_timeout_read_toc_cd = TRUE;
-	var_cd.handler_timeout_read_toc_cd = gtk_timeout_add (50, cdaudiotoc_timeout_do_read_toc_cd, 0);
+	var_cd.handler_timeout_read_toc_cd = g_timeout_add (50, cdaudiotoc_timeout_do_read_toc_cd, 0);
 	pthread_create (&nmr_tid, NULL ,(void *)cdaudiotoc_thread_do_read_toc_cd, (void *)NULL);
 }
 // 
@@ -232,7 +238,8 @@
 {
 	if (FALSE == libutils_find_file ("eject")) {
 		PRINT_FUNC_LF();
-		wininfo_create (
+		wind_info_init (
+			WindMain,
 			"eject NOT FOUND !",
 			"Please, install package [ eject ]",
 		 	"");

xcfa-4.2.8.tar.gz/src/cd_cue.c -> xcfa-5.0.2.tar.gz/src/cd_cue.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : cd_cue.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -30,11 +30,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <glib/gprintf.h>
 #include <string.h>
@@ -50,6 +45,7 @@
 #include "get_info.h"
 #include "scan.h"
 #include "configuser.h"
+#include "parse.h"
 #include "cd_cue.h"
 
 
@@ -107,16 +103,28 @@
 	}
 	
 	// g_free (BaseIoctl.PathNameDestFileCue);	BaseIoctl.PathNameDestFileCue = NULL;
-	g_free (BaseIoctl.Performer);		BaseIoctl.Performer = NULL;
-	g_free (BaseIoctl.Title);		BaseIoctl.Title = NULL;
-	g_free (BaseIoctl.File);		BaseIoctl.File = NULL;
+	if( NULL != BaseIoctl.Performer ) {
+		g_free (BaseIoctl.Performer);		BaseIoctl.Performer = NULL;
+	}
+	if( NULL != BaseIoctl.Title ) {
+		g_free (BaseIoctl.Title);		BaseIoctl.Title = NULL;
+	}
+	if( NULL != BaseIoctl.File ) {
+		g_free (BaseIoctl.File);		BaseIoctl.File = NULL;
+	}
 	
 	if (BaseIoctl.Cue != NULL) {
 		gint i;
 		for (i = 0; i < BaseIoctl.TotalTracks; i++) {
-			g_free (BaseIoctl.Cue [ i ].Performer);		BaseIoctl.Cue [ i ].Performer = NULL;
-			g_free (BaseIoctl.Cue [ i ].Title);		BaseIoctl.Cue [ i ].Title = NULL;
-			g_free (BaseIoctl.Cue [ i ].Partiel_Title);	BaseIoctl.Cue [ i ].Partiel_Title = NULL;
+			if( NULL != BaseIoctl.Cue [ i ].Performer ) {
+				g_free (BaseIoctl.Cue [ i ].Performer);		BaseIoctl.Cue [ i ].Performer = NULL;
+			}
+			if( NULL != BaseIoctl.Cue [ i ].Title ) {
+				g_free (BaseIoctl.Cue [ i ].Title);		BaseIoctl.Cue [ i ].Title = NULL;
+			}
+			if( NULL != BaseIoctl.Cue [ i ].Partiel_Title ) {
+				g_free (BaseIoctl.Cue [ i ].Partiel_Title);	BaseIoctl.Cue [ i ].Partiel_Title = NULL;
+			}
 		}
 		g_free (BaseIoctl.Cue);
 		BaseIoctl.Cue = NULL;
@@ -150,8 +158,8 @@
 void cdcue_print_base_ioctl (void)
 {
 	gint base;
-	gint TempDiv;
-	gint TempMod;
+	// gint TempDiv;
+	// gint TempMod;
 	
 	if( FALSE == OptionsCommandLine.BoolVerboseMode ) return;
 	
@@ -161,8 +169,8 @@
 	// 20. length 15848 [03:31:23] begin 303192 [67:22:42]	cdparanoia [.303192]-[.15847] -d /dev/sr0 -O 0 "20.wav"
 	g_print(" ------------------ B A S E ---------------------------- ---------------- E X T R A C T I O N -----------------\n" );
 	for (base = 0; base < BaseIoctl.TotalTracks; base++) {
-		TempDiv = BaseIoctl.Datas[ base ].length / 75;
-		TempMod = BaseIoctl.Datas[ base ].length % 75;
+		// TempDiv = BaseIoctl.Datas[ base ].length / 75;
+		// TempMod = BaseIoctl.Datas[ base ].length % 75;
 		
 		g_print(" %2d. ", base +1);
 		g_print("length %7d [%02d:%02d:%02d] ",
@@ -171,8 +179,8 @@
 			BaseIoctl.Datas[ base ].length_sec,
 			BaseIoctl.Datas[ base ].length_cent);
 		
-		TempDiv = BaseIoctl.Datas[ base ].begin / 75;
-		TempMod = BaseIoctl.Datas[ base ].begin % 75;
+		// TempDiv = BaseIoctl.Datas[ base ].begin / 75;
+		// TempMod = BaseIoctl.Datas[ base ].begin % 75;
 	
 		g_print("begin %7d [%02d:%02d:%02d]",
 			BaseIoctl.Datas[ base ].begin,
@@ -197,8 +205,8 @@
 		g_print("\n");
 	}
 
-	TempDiv = BaseIoctl.Datas[ BaseIoctl.TotalTracks ].begin / 75;
-	TempMod = BaseIoctl.Datas[ BaseIoctl.TotalTracks ].begin % 75;
+	// TempDiv = BaseIoctl.Datas[ BaseIoctl.TotalTracks ].begin / 75;
+	// TempMod = BaseIoctl.Datas[ BaseIoctl.TotalTracks ].begin % 75;
 	
 	g_print("TOTAL %7d [%02d:%02d:%02d] ",
 			BaseIoctl.Datas[ BaseIoctl.TotalTracks ].begin,
@@ -244,6 +252,7 @@
 	gint	 piste;
 	gchar	*PathName = NULL;
 	FILE	*fp;
+	gchar	*StrLine = NULL;
 	
 	PathName = g_strdup_printf ("%s/%s.cue", (gchar *)Config.PathDestinationCD, BaseIoctl.Performer);
 	
@@ -260,7 +269,14 @@
 	for (piste = 0; piste < BaseIoctl.TotalTracks; piste ++) {
 		fprintf (fp, " TRACK %02d AUDIO\n", piste +1);
 		fprintf (fp, " PERFORMER \"%s\"\n", BaseIoctl.Cue [ piste ].Performer);
-		fprintf (fp, " TITLE \"%s\"\n", BaseIoctl.Cue [ piste ].Title);
+		
+		// PARSING DU TITRE DE LA PISTE
+		// fprintf (fp, " TITLE \"%s\"\n", BaseIoctl.Cue [ piste ].Title);
+		StrLine = Parse_get_line( PARSE_TYPE_TITLE_CD, piste );
+		fprintf (fp, " TITLE \"%s\"\n", StrLine);
+		g_free( StrLine );
+		StrLine = NULL;
+
 		if (piste > 0)
 		fprintf (fp, " INDEX 00 %02d:%02d:%02d\n", BaseIoctl.Cue [ piste ].EndTime.min, BaseIoctl.Cue [ piste ].EndTime.sec, BaseIoctl.Cue [ piste ].EndTime.cent);
 		fprintf (fp, " INDEX 01 %02d:%02d:%02d\n", BaseIoctl.Cue [ piste ].BeginTime.min, BaseIoctl.Cue [ piste ].BeginTime.sec, BaseIoctl.Cue [ piste ].BeginTime.cent);
@@ -336,6 +352,7 @@
 	gchar	 *Ptr = NULL;
 	FILE	*fp;
 	gchar	*PathName = NULL;
+	gchar	*StrLine = NULL;
 	
 	// Initialisation
 	for (piste = 0; piste < BaseIoctl.TotalTracks; piste ++) {
@@ -349,7 +366,7 @@
 	
 	// init Len
 	for (piste = 0; piste < BaseIoctl.TotalTracks; piste ++) {
-		BaseIoctl.Cue [ piste ].CuePartiel.Len = BaseIoctl.Datas[ piste ].length;
+		BaseIoctl.Cue [ piste ].CuePartiel.Len = BaseIoctl.Datas[ piste ].length;
 	}
 	
 	// Init Start ZERO
@@ -360,8 +377,7 @@
 	for (piste = 0; piste < BaseIoctl.TotalTracks; piste ++) {
 		if (BaseIoctl.Cue [ piste ].BoolExtract == TRUE) {
 			
-			BaseIoctl.Cue [ piste ].CuePartiel.Start = BaseIoctl.Cue [ old_piste ].CuePartiel.Start +
-									BaseIoctl.Cue [ piste ].CuePartiel.Len;
+			BaseIoctl.Cue [ piste ].CuePartiel.Start = BaseIoctl.Cue [ old_piste ].CuePartiel.Start + BaseIoctl.Cue [ piste ].CuePartiel.Len;
 			cdcue_calcul_start (piste, 0);
 			old_piste = piste;
 		}
@@ -408,7 +424,11 @@
 		fprintf (fp, " TRACK %02d AUDIO\n", track +1);
 		
 		fprintf (fp, " PERFORMER \"%s\"\n", BaseIoctl.Cue [ piste ].Performer);
-		fprintf (fp, " TITLE \"%s\"\n", BaseIoctl.Cue [ piste ].Title);
+		// fprintf (fp, " TITLE \"%s\"\n", BaseIoctl.Cue [ piste ].Title);
+		StrLine = Parse_get_line( PARSE_TYPE_TITLE_CD, track );
+		fprintf (fp, " TITLE \"%s\"\n", StrLine );
+		g_free( StrLine );
+		StrLine = NULL;
 		
 		if (track == 0) {
 			fprintf (fp, " INDEX 01 00:00:00\n");
@@ -519,7 +539,7 @@
 		cdcue_write_cue ();
 		
 		// FIN timeout
-		gtk_timeout_remove (cdcue.handler_timeout);
+		g_source_remove (cdcue.handler_timeout);
 	}
 	
 	return (TRUE);
@@ -545,7 +565,7 @@
 		var_cd.bool_timeout_read_toc_cd = TRUE;
 		
 		// Le timer de fin
-		cdcue.handler_timeout = gtk_timeout_add (100, cdcue_timeout, 0);
+		cdcue.handler_timeout = g_timeout_add (100, cdcue_timeout, 0);
 		
 		// Et action
 		cdaudiotoc_reffresh_list_cd ();

xcfa-4.2.8.tar.gz/src/cd_cue.h -> xcfa-5.0.2.tar.gz/src/cd_cue.h Changed

@@ -1,9 +1,9 @@
  /*
  *  file      : cd_cue.h
  *  project   : xcfa
- *  with      : Gtk-2
+ *  with      : Gtk-3
  *
- *  copyright : (C) 2003 - 2012 by Claude Bulin
+ *  copyright : (C) 2003 - 2015 by Claude Bulin
  *
  *  xcfa - GTK+ implementation of the GNU shell command
  *  GNU General Public License
@@ -39,21 +39,21 @@
 
 typedef struct {
 	// 1. length   12375 [02:45:00]  begin      32 [00:00:32]
-	gint	Len;							// 
-  	gint	Start;							// 
-	gint	StartMin;						// 
-	gint	StartSec;						// 
-	gint	StartCent;						// 
+	gint	Len;											// 
+  	gint	Start;											// 
+	gint	StartMin;										// 
+	gint	StartSec;										// 
+	gint	StartCent;										// 
  } CDCUE_PARTIEL;
 	
 typedef struct {
-	gchar			*Performer;				// 
-	gchar			*Title;					// 
-	gboolean		 BoolExtract;				// TRUE si extraction
-	gchar			*Partiel_Title;				// 
-	CUE_TIME		 EndTime;				// 
-	CUE_TIME		 BeginTime;				// 
-	CDCUE_PARTIEL		 CuePartiel;				// 
+	gchar			*Performer;								// 
+	gchar			*Title;									// 
+	gboolean		 BoolExtract;							// TRUE si extraction
+	gchar			*Partiel_Title;							// 
+	CUE_TIME		 EndTime;								// 
+	CUE_TIME		 BeginTime;								// 
+	CDCUE_PARTIEL		 CuePartiel;						// 
 } CDCUE;
 
 // length DIV 75
@@ -62,23 +62,23 @@
 // length MOD 75 = Cent
 typedef struct {
 	
-	gint			 length;				// Longueur totale
+	gint			 length;								// Longueur totale
 	gint			 length_min ,length_sec ,length_cent;	// Details
-	gint			 begin;					// Longueur totale
-	gint			 begin_min ,begin_sec ,begin_cent;	// Details
+	gint			 begin;									// Longueur totale
+	gint			 begin_min ,begin_sec ,begin_cent;		// Details
 
 } BASE_IOCTL_DATAS;
 
 typedef struct {
 	// Base obtenue pae IOCTL ou CDPARANOIA
-	gint			 TotalTracks;				// Nombre total de pistes
-	BASE_IOCTL_DATAS	*Datas;					//
+	gint			 TotalTracks;							// Nombre total de pistes
+	BASE_IOCTL_DATAS	*Datas;								//
 	// CUE
-	gchar			*Performer;				//
-	gchar			*Title;					//
-	gchar			*File;					//
-	CDCUE			*Cue;					//
-	gchar			*PathNameDestFileCue;			//
+	gchar			*Performer;								//
+	gchar			*Title;									//
+	gchar			*File;									//
+	CDCUE			*Cue;									//
+	gchar			*PathNameDestFileCue;					//
 	
 } BASE_IOCTL;

xcfa-4.2.8.tar.gz/src/cd_curl.c -> xcfa-5.0.2.tar.gz/src/cd_curl.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : cd_curl.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -30,11 +30,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <glib.h>
 #include <glib/gstdio.h>
@@ -62,9 +57,10 @@
 
 
 /*
-	ABANDON DES LIBRAIRIES
+	-> ABANDON DES LIBRAIRIES
 		CDDB et CDIO
-	AU PROFIT DE:
+	
+	-> AU PROFIT DE:
 	
 	-- Utilisation de:
 	
@@ -157,22 +153,22 @@
 */
 
 typedef struct {
-	gchar		*NameGenre;		// jazz || rock || ...
+	gchar		*NameGenre;			// jazz || rock || ...
 	gint		NumCdDiscId;		// NUM
 	gchar		*StrCdDiscId;		// STR
 } VAR_LIST_POPUP;
 
 typedef struct {
-	gchar		*Title;			// Titre d'une piste
+	gchar		*Title;				// Titre d'une piste
 	gchar		StrTime[ 10 ];		// Temps ( duree ) d'une piste mm:ss
-	gint		NumSector;		// Numero du secteur corespondant a la piste
+	gint		NumSector;			// Numero du secteur corespondant a la piste
 } LIST_SECTOR;
 
 
 typedef struct {
-	gchar		*StrDiscID;		// STR
+	gchar		*StrDiscID;			// STR
 	GString		*GStrCdDiscID;		// STRING
-	gint		LenDisc;		// EN SECONDES
+	gint		LenDisc;			// EN SECONDES
 	gint		TotalTracks;		// TOTAL TRACKS
 	GList		*ListDiscId;		// VAR_LIST_POPUP
 	LIST_SECTOR	*ListSector;		// CDPARANOIA
@@ -184,9 +180,9 @@
 
 VAR_SECTOR	VarSector;
 
-typedef enum {					// DO_CURL_QUERY CdCurl_discdb_do_query( void )
+typedef enum {						// DO_CURL_QUERY CdCurl_discdb_do_query( void )
 	DO_CURL_QUERY_FALSE = 0,		// NO QUERY
-	DO_CURL_QUERY_TRUE,			// QUERY IS OK
+	DO_CURL_QUERY_TRUE,				// QUERY IS OK
 	DO_CURL_QUERY_REPEAT			// 211 Found inexact matches
 } DO_CURL_QUERY;
 
@@ -329,7 +325,7 @@
 		List = g_list_first( VarSector.ListDiscId );
 		while ( List ) {
 			if( NULL != ( PtrVarList = (VAR_LIST_POPUP *)List->data )) {
-				gtk_combo_box_append_text( GTK_COMBO_BOX(var_cd.Adr_combobox_discid_cd), PtrVarList->NameGenre );
+				gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_cd.Adr_combobox_discid_cd), PtrVarList->NameGenre );
 				NbrOptions ++;
 			}
 			List = g_list_next( List );
@@ -339,8 +335,12 @@
 		if( NbrOptions > 1 )
 			gtk_widget_show( GTK_WIDGET (GLADE_GET_OBJECT("frame_discid")));
 		else	gtk_widget_hide( GTK_WIDGET (GLADE_GET_OBJECT("frame_discid")));
-		if( TRUE == OptionsCommandLine.BoolVerboseMode )
-			g_print( "NbrOptions = %d [ %s ]\n", NbrOptions, NbrOptions > 1 ? "gtk_widget_show" : "gtk_widget_hide" );
+		
+		if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
+			g_print( "CdCurl_set_list_discid()\n" );
+			g_print( "\tNbrOptions = %d [ %s ]\n", NbrOptions, NbrOptions > 1 ? "gtk_widget_show" : "gtk_widget_hide" );
+		}
+		
 		return;
 	}
 	gtk_widget_hide( GTK_WIDGET (GLADE_GET_OBJECT("frame_discid")));
@@ -433,19 +433,22 @@
 //
 void CdCurl_print_glist( void )
 {
-	GList		*List = NULL;
-	VAR_LIST_POPUP	*PtrVarList = NULL;
+	if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
+		
+		GList		*List = NULL;
+		VAR_LIST_POPUP	*PtrVarList = NULL;
 	
-	PRINT_FUNC_LF();
-	if( FALSE == OptionsCommandLine.BoolVerboseMode ) return;
-	List = g_list_first( VarSector.ListDiscId );
-	while( List ) {
-		if( NULL != ( PtrVarList = (VAR_LIST_POPUP *)List->data )) {
-			g_print( "%10x", PtrVarList->NumCdDiscId );
-			g_print( "\t%s", PtrVarList->StrCdDiscId );
-			g_print( "\t%s\n", PtrVarList->NameGenre );
+		PRINT_FUNC_LF();
+
+		List = g_list_first( VarSector.ListDiscId );
+		while( List ) {
+			if( NULL != ( PtrVarList = (VAR_LIST_POPUP *)List->data )) {
+				g_print( "%10x", PtrVarList->NumCdDiscId );
+				g_print( "\t%s", PtrVarList->StrCdDiscId );
+				g_print( "\t%s\n", PtrVarList->NameGenre );
+			}
+			List = g_list_next( List );
 		}
-		List = g_list_next( List );
 	}
 }
 //
@@ -480,7 +483,7 @@
 GString *CdCurl_make_line_request_for_query( gchar *p_StrDiscID, gchar *p_GStrCdDiscID )
 {
 	GString	*Gstr = g_string_new( NULL );
-	g_string_sprintfa(
+	g_string_append_printf(
 			Gstr,
 			// http://freedb.org/~cddb/cddb.cgi?cmd=cddb+query+6f11b918+24+150+20835+32512+47955+62530+74420+89332+100575+113692+126522+133245+145330+159460+170647+186450+199462+219450+233727+247745+262270+276072+288807+310705+325995+4539&hello=private+free.the.cddb+xcfa+4.0.4~beta7&proto=6
 			"http://freedb.org/~cddb/cddb.cgi?cmd=cddb+query+%s+%s&hello=private+free.the.cddb+%s+%s&proto=6",
@@ -496,7 +499,7 @@
 GString *CdCurl_make_line_request_for_read( gchar *p_MusicType, gchar *p_StrDiscID )
 {
 	GString	*Gstr = g_string_new( NULL );
-	g_string_sprintfa(
+	g_string_append_printf(
 			Gstr,
 			// "http://freedb.org/~cddb/cddb.cgi?cmd=cddb+read+jazz+6f11b918&hello=private+free.the.cddb+xcfa+4.0.4~beta7&proto=6",
 			"http://freedb.org/~cddb/cddb.cgi?cmd=cddb+read+%s+%s&hello=private+free.the.cddb+%s+%s&proto=6",
@@ -685,6 +688,18 @@
 }
 //
 //
+gint CdCurl_get_numtrack_next( gchar *StrTitle )
+{
+	if( ! strncasecmp( StrTitle, "TTITLE", 6 )) {
+		
+		StrTitle += 6;
+		return( atoi( StrTitle ));
+	}
+	
+	return( -1 );
+}
+// 
+//
 void CdCurl_discdb_do_read( DO_CURL_QUERY p_DoCurlQuery )
 {
 	GString		*Gstr = NULL;
@@ -696,6 +711,7 @@
 	GString 	*gstr_buffer_title = g_string_new (NULL);
 	GString 	*gstr_buffer_title_time = g_string_new (NULL);
 	GString 	*gstr_buffer_artist_title_time = g_string_new (NULL);
+	gchar	*PtrNameTrack = NULL;
 	
 	EnteteCD.StrDureeCd = g_strdup_printf( "%02d:%02d", 
 			BaseIoctl.Datas[ BaseIoctl.TotalTracks ].begin_min,
@@ -715,7 +731,7 @@
 	}	
 	
 	if( NULL == DatasBuffer ) {
-		EnteteCD.Message = g_strdup( _("La liaison internet est absente") );
+		EnteteCD.Message = g_strdup( _("A web connection is missing") );
 		// MINIMUM D'INFORMATION ET RETOUR
 		// SET Track
 		for( Track = 0; Track < VarSector.TotalTracks; Track ++ ) {
@@ -794,15 +810,31 @@
 		
 		return;
 	}
-	
+
 	Larrbuf = g_strsplit( DatasBuffer, "\n", 0 );
 	if( TRUE == OptionsCommandLine.BoolVerboseMode )
 		g_print( "\nREAD\n" );
 	
+	// SUPPRESSION DES CARACTERES INDELICATS
 	for( Cpt = 0; Larrbuf[ Cpt ]; Cpt ++ ) {
 		
+		if( ! strncasecmp( Larrbuf[ Cpt ], "TTITLE", 6 )) {
+			// 
+			// BUG FIND BY @TICROB: SOLVED
+			// DEL CAR '/' IN STRING
+			//
+			for( PtrNameTrack = Larrbuf[ Cpt ]; *PtrNameTrack; PtrNameTrack ++ ) {
+				if( *PtrNameTrack == '/' ) *PtrNameTrack = '-';
+				if( *PtrNameTrack == '\n' ) *PtrNameTrack = '\0';
+				if( *PtrNameTrack == '\r' ) *PtrNameTrack = '\0';
+			}
+		}
+	}
+	
+	for( Cpt = 0; Larrbuf[ Cpt ]; Cpt ++ ) {
+				
 		if( TRUE == OptionsCommandLine.BoolVerboseMode )
-			g_print( "%s\n", Larrbuf[ Cpt ] );
+			g_print( "%02d %s\n", Cpt, Larrbuf[ Cpt ] );
 		
 		if( ! strncasecmp( Larrbuf[ Cpt ], "DTITLE", 6 )) {
 
@@ -839,15 +871,44 @@
 		}
 		else if( ! strncasecmp( Larrbuf[ Cpt ], "TTITLE", 6 ) && Track < VarSector.TotalTracks ) {
 						
-			gchar	*PtrNameTrack = NULL;
+			gint	NumTrack;
+			GString	*gstr = g_string_new (NULL);
+			
 			
 			// TTITLE0=My Way
 			// TTITLE1=Strangers In The Night
 			// TTITLE2=Theme From New York New York
 			// TTITLE3=I Get A Kick Out Of You
-
+			
+			// 
+			// UNE LIGNE PEUT ETRE SCINDEE SUR PLUSIEURS LIGNES:
+			// -------------------------------------------------
+			// TTITLE3=Paul Buckmaster / Spider Research / Introduccion (We Did It) / The Prop
+			// TTITLE3=osition
+			// TTITLE8=Paul Buckmaster / Introduccion (Escape To Nowhere) / Scanner Room / Cap
+			// TTITLE8=ture And Sedation
+						
+			// STOCKER LE PREMIER TITRE
 			PtrNameTrack = strchr( Larrbuf[ Cpt ], '=' );
 			PtrNameTrack ++;
+			g_string_append_printf( gstr, "%s", PtrNameTrack );
+			
+			// NUMERO DU TTITLE 'xx'
+			NumTrack = CdCurl_get_numtrack_next( Larrbuf[ Cpt ] );
+			
+			// NOUVEL ALGO: BUG TICROB SOLVED
+			while( NumTrack == CdCurl_get_numtrack_next( Larrbuf[ Cpt +1 ] )) {
+							
+				if( TRUE == OptionsCommandLine.BoolVerboseMode )
+					g_print( "%02d %s\n", Cpt, Larrbuf[ Cpt +1 ] );
+				
+				PtrNameTrack = strchr( Larrbuf[ Cpt +1 ], '=' );
+				PtrNameTrack ++;
+				g_string_append_printf( gstr, "%s", PtrNameTrack );
+				Cpt ++;
+			}
+			
+			PtrNameTrack = gstr->str;
 			
 			Audio = ( CD_AUDIO * )g_malloc0( sizeof( CD_AUDIO ));
 			Audio->EtatPlay = CD_ETAT_PLAY_ATTENTE;
@@ -887,10 +948,7 @@
 			Audio->Num_Track		= Track + 1;
 			Audio->Str_Track		= g_strdup_printf ( "%02d", Track + 1 );
 			Audio->Duree			= g_strdup( VarSector.ListSector[ Track ].StrTime );
-			Audio->NameSong			= libutils_dup_chomp( PtrNameTrack );
-			if( NULL != ( PtrNameTrack = strchr( Audio->NameSong, '/' ))) {
-				*PtrNameTrack = '-';
-			}
+			Audio->NameSong			= libutils_dup_chomp( PtrNameTrack );
 
 			VarSector.ListSector[ Track ].Title = g_strdup( Audio->NameSong	);
 		
@@ -942,6 +1000,9 @@
 			view.TitleCD = g_strdup_printf( "%s", EnteteCD.TitleCD );
 			
 			Track ++;
+			
+			g_string_free (gstr, TRUE);
+			gstr = NULL;
 		}
 	}
 	CdCurl_set_datas_buffer( gstr_buffer_title, gstr_buffer_title_time, gstr_buffer_artist_title_time );
@@ -1089,14 +1150,35 @@
 void CdCurl_set_datas_for_cdcue_two( void )
 {
 	gint	Track;
+	gchar	*PtrNameTrack = NULL;
+	
+	PRINT("");
 	
 	BaseIoctl.Performer = g_strdup( EnteteCD . TitleCD );
 	BaseIoctl.Title = g_strdup( EnteteCD . TitleCD );
 	BaseIoctl.File = g_strdup_printf ("%s.wav", EnteteCD . TitleCD);
 	
 	for( Track = 0; Track < VarSector.TotalTracks; Track++ ) {
+		// 
+		// BUG FIND BY @TICROB: SOLVED
+		// TEST ALLOC OF: 
+		// 	BaseIoctl.Cue [ Track ].Performer
+		//	BaseIoctl.Cue [ Track ].Title
+		// 
+		if( NULL != BaseIoctl.Cue [ Track ].Performer ) {
+			g_free( BaseIoctl.Cue [ Track ].Performer );
+			BaseIoctl.Cue [ Track ].Performer = NULL;
+		}
+		if( NULL != BaseIoctl.Cue [ Track ].Title ) {
+			g_free( BaseIoctl.Cue [ Track ].Title );
+			BaseIoctl.Cue [ Track ].Title = NULL;
+		}
 		BaseIoctl.Cue [ Track ].Performer = g_strdup( EnteteCD . TitleCD );
 		BaseIoctl.Cue [ Track ].Title = g_strdup( VarSector.ListSector[ Track ].Title );
+
+		while( NULL != ( PtrNameTrack = strchr( BaseIoctl.Cue [ Track ].Title, '/' ))) {
+			*PtrNameTrack = '-';
+		}
 	}
 	
 	cdcue_print_base_ioctl();
@@ -1132,9 +1214,9 @@
 		VarSector.StrDiscID = g_strdup( Larrbuf[ 0 ] );
 		VarSector.GStrCdDiscID = g_string_new( NULL );
 		for( Cpt = 1; Larrbuf[ Cpt ]; Cpt ++ ) {
-			g_string_sprintfa( VarSector.GStrCdDiscID, "%s", Larrbuf[ Cpt ] );
+			g_string_append_printf( VarSector.GStrCdDiscID, "%s", Larrbuf[ Cpt ] );
 			if( NULL != Larrbuf[ Cpt +1 ] )
-				g_string_sprintfa( VarSector.GStrCdDiscID, "+" );
+				g_string_append_printf( VarSector.GStrCdDiscID, "+" );
 		}
 		VarSector.LenDisc = atoi( Larrbuf[ Cpt -1 ] );
 		g_strfreev( Larrbuf );

xcfa-4.2.8.tar.gz/src/cd_curl.h -> xcfa-5.0.2.tar.gz/src/cd_curl.h Changed

xcfa-4.2.8.tar.gz/src/cd_expander.c -> xcfa-5.0.2.tar.gz/src/cd_expander.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : cd_expander.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -30,11 +30,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <string.h>
@@ -456,6 +451,7 @@
 // 	gint num;
 // 	gchar *name;
 // } STRUCT_TAGS_FILE_MP3;
+/**
 gboolean on_match_select(GtkEntryCompletion *widget, GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data)
 { 
 	if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
@@ -465,7 +461,8 @@
 		g_value_unset(&value);
 	}
 	return FALSE;
-} 
+}
+*/ 
 void on_entry_tag_genre_realize( GtkWidget *widget, gpointer user_data )
 {
 	STRUCT_TAGS_FILE_MP3	*Contact;
@@ -477,7 +474,7 @@
 	completion = gtk_entry_completion_new();
 	gtk_entry_completion_set_text_column( completion, _CONTACT_NAME_ );
 	gtk_entry_set_completion( GTK_ENTRY(widget), completion );
-	g_signal_connect( G_OBJECT(completion), "match-selected", G_CALLBACK(on_match_select), NULL );
+	// g_signal_connect( G_OBJECT(completion), "match-selected", G_CALLBACK(on_match_select), NULL );
 	g_signal_connect( G_OBJECT(widget), "changed", G_CALLBACK(on_entry_tag_genre_changed), widget );
 	model = gtk_list_store_new( 1, G_TYPE_STRING );
 	for( Contact = StructTagsFileMp3; Contact && Contact->name; Contact++ ) {
@@ -592,11 +589,10 @@
 // 
 void on_combobox_choice_file_cue_realize (GtkWidget *widget, gpointer user_data)
 {
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "WAV");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "FLAC");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "OGG");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "MPC");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "WAV");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "FLAC");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "OGG");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "MPC");
 	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
 }
 //

xcfa-4.2.8.tar.gz/src/cd_normalise.c -> xcfa-5.0.2.tar.gz/src/cd_normalise.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : cd_normalise.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -30,11 +30,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <pthread.h>
 #include <unistd.h>
@@ -59,15 +54,15 @@
 typedef struct {
 	GList	*ListPeakGroup;			// Pointeur sur AUDIO
 	gint	MaxElements;			// 
-	gint	NumExtract;			// 
-	gchar	*TmpRep;			// Le dossier temporaire
+	gint	NumExtract;				// 
+	gchar	*TmpRep;				// Le dossier temporaire
 } VAR_CD_NORMALISE;
 
 VAR_CD_NORMALISE VarCdNormalise = {
-		NULL,				// GList	*ListPeakGroup
-		0,				// gint		MaxElements
-		0,				// gint		NumExtract
-		NULL				// gchar	*TmpRep
+		NULL,						// GList	*ListPeakGroup
+		0,							// gint		MaxElements
+		0,							// gint		NumExtract
+		NULL						// gchar	*TmpRep
 		};

xcfa-4.2.8.tar.gz/src/cd_normalise.h -> xcfa-5.0.2.tar.gz/src/cd_normalise.h Changed

xcfa-4.2.8.tar.gz/src/configuser.c -> xcfa-5.0.2.tar.gz/src/configuser.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : configuser_new.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -33,11 +33,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -65,11 +60,12 @@
 VAR_CONFIG ConfigSaveToRest;	// Pour les restitutions par defaut
 VAR_CONFIG Config = {
 	FALSE,		// BoolConfigOk
-	0,		// WinPos_X
-	0,		// WinPos_Y
+	1,			// gulong	UsesOfXcfa;	// 0 to G_MAXULONG ( 18446744073709551615 )
+	0,			// WinPos_X
+	0,			// WinPos_Y
 	800,		// WinWidth
 	520,		// WinHeight
-	0,		// Nice
+	0,			// Nice
 	NULL,		// PathLoadFileAll
 	NULL,		// PathLoadFileWav
 	NULL,		// PathLoadFileMp3Ogg
@@ -89,34 +85,34 @@
 	NULL,		// PathStockeImagesPochette
 	NULL,		// PathDestFilePostScript
 	NULL,		// PathLoadImages
-	0,		// NotebookGeneral
-	0,		// NotebookExpanderCd
-	0,		// NotebookFile
-	0,		// NotebookOptions
-	0,		// NotebookAppExterns
-	0,		// ExtractCdWith = EXTRACT_WITH_CDPARANOIA = 0
-	1,		// BitrateLameIndice
+	0,			// NotebookGeneral
+	0,			// NotebookExpanderCd
+	0,			// NotebookFile
+	0,			// NotebookOptions
+	0,			// NotebookAppExterns
+	0,			// ExtractCdWith = EXTRACT_WITH_CDPARANOIA = 0
+	1,			// BitrateLameIndice
 	{0,8,0,0},	// TabBitrateLame
 	{0,0,0,0},	// TabModeLame
-	15,		// BitrateOggenc
-	1,		// ManagedOggenc
-	1,		// DownmixOggenc
-	5,		// CompressionLevelFlac
-	1,		// CompressionLevelApeMac
-	0,		// CompressionWavpack
-	1,		// SoundWavpack
-	0,		// ModeHybrideWavpack
-	0,		// CorrectionFileWavpack
-	0,		// CompressionMaximumWavpack
-	0,		// SignatureMd5Wavpack
-	0,		// ExtraEncodingWavpack
-	5,		// QualityMppenc
-	0,		// ConteneurFacc
-	0,		// AbrVbrFacc
-	0,		// AbrFaccIndice
-	6,		// VbrFaccIndice
-	7,		// ChoiceMonoAacplusenc
-	4,		// ChoiceStereoAacplusenc 
+	15,			// BitrateOggenc
+	1,			// ManagedOggenc
+	1,			// DownmixOggenc
+	5,			// CompressionLevelFlac
+	1,			// CompressionLevelApeMac
+	0,			// CompressionWavpack
+	1,			// SoundWavpack
+	0,			// ModeHybrideWavpack
+	0,			// CorrectionFileWavpack
+	0,			// CompressionMaximumWavpack
+	0,			// SignatureMd5Wavpack
+	0,			// ExtraEncodingWavpack
+	5,			// QualityMppenc
+	0,			// ConteneurFacc
+	0,			// AbrVbrFacc
+	0,			// AbrFaccIndice
+	6,			// VbrFaccIndice
+	7,			// ChoiceMonoAacplusenc
+	4,			// ChoiceStereoAacplusenc 
 	TRUE,		// BoolArtistTag
 	TRUE,		// BoolTitleTag
 	TRUE,		// BoolAlbumTag
@@ -132,7 +128,7 @@
 	NULL,		// StringExpanderMppenc
 	NULL,		// StringExpanderMac
 	NULL,		// StringExpanderWavpack
-	0,		// ServeurCddb			SERVER_CDDB_DEFAULT = 0 OR SERVER_CDDB_PARAM
+	0,			// ServeurCddb			SERVER_CDDB_DEFAULT = 0 OR SERVER_CDDB_PARAM
 	NULL,		// StringNameFile_m3u_xspf
 	NULL,		// Templates_title_cdaudio
 	NULL,		// Templates_rep_cdaudio
@@ -143,8 +139,8 @@
 	NULL,		// StringParamNameLecteurAudio
 	NULL,		// StringBoolFieldsIsVisible	FIELDS DVD,CD,FILES : FALSE or HIDE = 0, TRUE or SHOW = 1
 	NULL,		// StringPosFieldsName		POS NAME OF DVD,CD,FILES: 0 = LEFT, 1 = CENTER, 2 = RIGHT
-	0,		// NumSelectComboBoxDvd
-	0,		// NumSelectComboBoxCd
+	0,			// NumSelectComboBoxDvd
+	0,			// NumSelectComboBoxCd
 	NULL,		// entry_cddp_server
 	NULL,		// entry_proxy_server;
 	NULL,		// entry_proxy_port
@@ -155,7 +151,10 @@
 	FALSE,		// gboolean	BoolCheckbuttonEndOfConvert
 	NULL,		// gchar	*PathMusicFileEndOfConvert
 	NULL,		// gchar	*FileMusicFileEndOfConvert
-	NULL		// gchar	*StringCommentCD
+	NULL,		// gchar	*StringCommentCD
+	
+	FALSE		// gboolean	BoolLogCdparanoiaModeExpert
+
 };
 
 
@@ -281,7 +280,7 @@
 	}
 	return( FALSE );	
 }
-// LECTURE NUMERIQUE
+// LECTURE NUMERIQUE INT
 // 
 gboolean config_read_value_atoi( gchar *p_Search, gint *p_ValueAtoi, gint p_Min, gint p_Max )
 {
@@ -311,6 +310,36 @@
 	}
 	return( FALSE );	
 }
+// LECTURE NUMERIQUE INT
+// 
+gboolean config_read_value_atol( gchar *p_Search, gulong *p_ValueAtoi, gint p_Min, gint p_Max )
+{
+	gchar	*Ptr = NULL;
+	gint	Cpt;
+	
+	for( Cpt = 0; Conf.Larrbuf[ Cpt ]; Cpt++ ) {
+		
+		// Si commentaire ou ligne vide alors ligne suivante
+		if( *Conf.Larrbuf[ Cpt ] == '#' || *Conf.Larrbuf[ Cpt ] == '\0') continue;
+		
+		if( TRUE == config_new_strcmp( Conf.Larrbuf[ Cpt ], p_Search )) {
+			if( NULL != ( Ptr = config_get_target( Conf.Larrbuf[ Cpt ] ))) {
+				*p_ValueAtoi = atol( Ptr );
+				g_free( Ptr );
+				Ptr = NULL;
+				if( p_Min > -1 && *p_ValueAtoi < p_Min ) *p_ValueAtoi = p_Min;
+				if( p_Max > -1 && *p_ValueAtoi > p_Max ) *p_ValueAtoi = p_Max;
+				if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
+					config_print_data( p_Search );
+					g_print( "%lu / %lu ;-)\n", *p_ValueAtoi ? *p_ValueAtoi : 0, G_MAXULONG );
+				}
+				*Conf.Larrbuf[ Cpt ] = '\0';
+				return( TRUE );
+			}
+		}
+	}
+	return( FALSE );	
+}
 // LECTURE PATHNAME
 // 
 gboolean config_read_value_path( gchar *p_Search, gchar **p_ValuePath, gchar *p_default )
@@ -325,7 +354,7 @@
 		
 		if( TRUE == config_new_strcmp( Conf.Larrbuf[ Cpt ], p_Search )) {
 			if( NULL != ( Ptr = config_get_target( Conf.Larrbuf[ Cpt ] ))) {
-				if( TRUE == libutils_test_dir_exist( Ptr )) {
+				if( TRUE == g_file_test( Ptr, G_FILE_TEST_IS_DIR )) {
 					*p_ValuePath = Ptr;
 				} else {
 					if( NULL == p_default )	*p_ValuePath = g_strdup( g_getenv( "HOME" ));
@@ -376,6 +405,75 @@
 	}
 	return( FALSE );	
 }
+// 
+// CALL:
+// 	config_read_value_tab( "HOURS_MONDAY", Config.HoursMonday, 4 );
+// 
+gboolean config_read_value_tab( gchar *p_Search, gint p_ValueTab[], gint p_max_tab )
+{
+	gchar	*Ptr = NULL;
+	gint	Cpt;
+	
+	// IF NOT INIT IN TAB:
+	// 	*(p_ValueTab +0) = 0;
+	// 	*(p_ValueTab +1) = 0;
+	// 	*(p_ValueTab +2) = 0;
+	// 	*(p_ValueTab +3) = 0;
+	
+	for( Cpt = 0; Conf.Larrbuf[ Cpt ]; Cpt++ ) {
+		
+		// Si commentaire ou ligne vide alors ligne suivante
+		if( *Conf.Larrbuf[ Cpt ] == '#' || *Conf.Larrbuf[ Cpt ] == '\0') continue;
+		
+		if( TRUE == config_new_strcmp( Conf.Larrbuf[ Cpt ], p_Search )) {
+
+			if( TRUE == OptionsCommandLine.BoolVerboseMode )
+				config_print_data( p_Search );
+
+			if( NULL != (Ptr = strchr( Conf.Larrbuf[ Cpt ], '=' ))) {
+				
+				gchar	**LarrbufLine = NULL;
+				gint	Indice;
+				
+				// POINTEUR SUR LA PREMIERE OCCURANCE
+				Ptr ++;
+				while( *Ptr == ' ' || *Ptr == '\t' ) Ptr ++;
+				
+				// *Ptr IS VALID ?
+				if( *Ptr != '\0' ) {
+					
+					// HOURS_MONDAY = 435 690 720 975
+					// HOURS_SATURDAY = 0 0 0 0
+					LarrbufLine = g_strsplit( Ptr, " ", 0 );
+				
+					// INDICE: 0 .. p_max_tab
+					for( Indice = 0; LarrbufLine[ Indice ] && Indice < p_max_tab; Indice ++ ) {
+					
+						*(p_ValueTab +Indice) = (gint)atoi( LarrbufLine[ Indice ] );
+					
+						if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
+							g_print ("%04d (%02d:%02d) ",
+								*(p_ValueTab +Indice),
+								*(p_ValueTab +Indice) / 60,
+								*(p_ValueTab +Indice) % 60
+								);
+						}
+					}
+				
+					g_strfreev( LarrbufLine );
+					LarrbufLine = NULL;
+				}
+			}
+			
+			if( TRUE == OptionsCommandLine.BoolVerboseMode )
+				g_print( "\n" );
+			
+			*Conf.Larrbuf[ Cpt ] = '\0';
+			return( TRUE );	
+		}
+	}
+	return( FALSE );	
+}
 // 	
 // 	
 void config_close_conf_file( void )
@@ -454,6 +552,13 @@
 	
 	if( TRUE == config_open_conf_file( PathNameConfig )) {
 		
+		// READ ATOL
+		// 
+		config_read_value_atol( "USES_OF_XCFA",				&Config.UsesOfXcfa, 		 0,	-1 );
+		if( Config.UsesOfXcfa < G_MAXULONG )
+			Config.UsesOfXcfa ++;
+		else	Config.UsesOfXcfa = 0;
+		
 		// READ ATOI
 		// 
 		config_read_value_atoi( "WIN_POS_X",				&Config.WinPos_X, 		 0,	-1 );
@@ -514,6 +619,7 @@
 		config_read_value_bool( "TAGS_COMMENT",				&Config.BoolCommentTag );
 		config_read_value_bool( "BOOL_ETAT_EXPANDER_CD",		&Config.BoolEtatExpanderCd );
 		config_read_value_bool( "BOOL_PLAY_MUSIC_END_CONVERT",		&Config.BoolCheckbuttonEndOfConvert );
+		config_read_value_bool( "BOOL_LOG_CDPARANOIA_MODE_EXPERT",	&Config.BoolLogCdparanoiaModeExpert);
 		
 		// READ PATH
 		// 
@@ -588,6 +694,7 @@
 		config_verif_path( &Config.PathLoadImg,			NULL );
 		config_verif_path( &Config.PathSaveImg,			NULL );
 		config_verif_path( &Config.PathMusicFileEndOfConvert,	NULL );
+
 	}
 	if( NULL != PathNameConfig ) {
 		g_free( PathNameConfig );
@@ -610,6 +717,7 @@
 		fprintf( fp, "## File of configuration to : %s\n", PACKAGE_STRING);
 		fprintf( fp, "############################################################################\n" );
 		fprintf( fp, "\n" );
+		fprintf( fp, "USES_OF_XCFA = %lu\n",Config.UsesOfXcfa );
 		fprintf( fp, "WIN_POS_X = %d\n", Config.WinPos_X );
 		fprintf( fp, "WIN_POS_Y = %d\n", Config.WinPos_Y );
 		fprintf( fp, "WIN_WIDTH = %d\n", Config.WinWidth );
@@ -733,6 +841,7 @@
 		fprintf( fp, "PATH_MUSIC_END_CONVERT = %s\n", Config.PathMusicFileEndOfConvert != NULL ? Config.PathMusicFileEndOfConvert : "" );
 		fprintf( fp, "FILE_NAME_MUSIC_END_CONVERT = %s\n", Config.FileMusicFileEndOfConvert != NULL ? Config.FileMusicFileEndOfConvert : "" );
 		fprintf( fp, "STRING_COMMENT_CD = %s\n", Config.StringCommentCD != NULL ? Config.StringCommentCD : "" );
+		fprintf( fp, "BOOL_LOG_CDPARANOIA_MODE_EXPERT = %s\n", Config.BoolLogCdparanoiaModeExpert == TRUE ? "TRUE" : "FALSE" );
 		
 		// TODO: RESERVED
 		// g_sprintf( String, "%08lx", ret );

xcfa-4.2.8.tar.gz/src/configuser.h -> xcfa-5.0.2.tar.gz/src/configuser.h Changed

@@ -1,9 +1,9 @@
  /*
  *  file      : configuser.h
  *  project   : xcfa
- *  with      : Gtk-2
+ *  with      : Gtk-3
  *
- *  copyright : (C) 2003 - 2012 by Claude Bulin
+ *  copyright : (C) 2003 - 2015 by Claude Bulin
  *
  *  xcfa - GTK+ implementation of the GNU shell command
  *  GNU General Public License
@@ -30,128 +30,131 @@
 
 
 typedef struct {
-	gint        Bitrate_type_Lame;			// Bitrate Lame
-	gint        If_abr;				// SI ABR est defini
-	gint        If_cbr;				// SI CBR est defini
-	gint        If_vbr;				// SI VBR est defini
-	gint        If_vbr_new;				// SI VBR_NEW est defini
-	gint        Mode_Lame;				// Mode Lame
-	gint        Bitrate_Oggenc;			// Bitrate Oggenc
-	gint        Managed_Oggenc;			// Managed Oggenc
-	gint        Downmix_Oggenc;			// Downmix Oggenc
+	gint        Bitrate_type_Lame;				// Bitrate Lame
+	gint        If_abr;							// SI ABR est defini
+	gint        If_cbr;							// SI CBR est defini
+	gint        If_vbr;							// SI VBR est defini
+	gint        If_vbr_new;						// SI VBR_NEW est defini
+	gint        Mode_Lame;						// Mode Lame
+	gint        Bitrate_Oggenc;					// Bitrate Oggenc
+	gint        Managed_Oggenc;					// Managed Oggenc
+	gint        Downmix_Oggenc;					// Downmix Oggenc
 } RATE_MP3OGG;
 
 typedef struct {
-	gboolean	BoolConfigOk;			// Attendre la fin de la config.: Voir main.c
-	gint		WinPos_X;			// 
-	gint		WinPos_Y;			// 
-	gint		WinWidth;			// 
-	gint		WinHeight;			// 
-	gint		Nice;				// 
-	gchar		*PathLoadFileAll;		// 
-	gchar		*PathLoadFileWav;		// 
-	gchar		*PathLoadFileMp3Ogg;		// 
-	gchar		*PathLoadFileTags;		// 
-	gint		TabIndiceComboDestFile[4];	// 
-	gchar		*PathDestinationFileAll;	// 
-	gchar		*PathDestinationFileWav;	// 
-	gchar		*PathDestinationFileMp3Ogg;	// 
-	gchar		*PathDestinationFileTags;	// 
-	gchar		*PathDestinationDVD;		// 
-	gchar		*PathChoiceFileDVD;		// 
-	gchar		*PathDestinationCD;		// 
-	gchar		*PathChoiceFileCD;		// 
-	gchar		*PathDestinationSplit;		// 
-	gchar		*PathLoadSplit;			// 
-	gchar		*PathnameTMP;			// 
-	gchar		*PathStockeImagesPochette;	// 
-	gchar		*PathDestFilePostScript;	// 
-	gchar		*PathLoadImages;		// 
-	gint		NotebookGeneral;		// 
-	gint		NotebookExpanderCd;		// 
-	gint		NotebookFile;			// 
-	gint		NotebookOptions;		// 
-	gint		NotebookAppExterns;		// 
-	gint		ExtractCdWith;			// EXTRACT_WITH_CDPARANOIA = 0, EXTRACT_WITH_CDPARANOIA_EXPERT, EXTRACT_WITH_CDDA2WAV	
-	
-	gint		BitrateLameIndice;		// abr .. vbr_new
-	gint		TabBitrateLame[4];		// [ abr | cbr | vbr | vbr_new ]
-	gint		TabModeLame[4];			// [ ModeAbr | ModeCbr | ModeVbr | ModeVbrNew ]
-	
-	gint		BitrateOggenc;			// 
-	gint		ManagedOggenc;			// 
-	gint		DownmixOggenc;			// 
-	
-	gint		CompressionLevelFlac;		// 
-	
-	gint		CompressionLevelApeMac;		// 
-	
-	gint		CompressionWavpack;		// 
-	gint		SoundWavpack;			// 
-	gint		ModeHybrideWavpack;		// 
-	gint		CorrectionFileWavpack;		// 
-	gint		CompressionMaximumWavpack;	// 
-	gint		SignatureMd5Wavpack;		// 
-	gint		ExtraEncodingWavpack;		// 
-	
-	gint		QualityMppenc;			// 
-	
-	gint		ConteneurFacc;			// 
-	gint		AbrVbrFacc;			// 
-	gint		AbrFaccIndice;			// 
-	gint		VbrFaccIndice;			// 
-	
-	gint		ChoiceMonoAacplusenc;		// 
-	gint		ChoiceStereoAacplusenc;		// 
-	
-	gboolean	BoolArtistTag;			// 
-	gboolean	BoolTitleTag;			// 
-	gboolean	BoolAlbumTag;			// 
-	gboolean	BoolNumerateTag;		// 
-	gboolean	BoolGenreTag;			// 
-	gboolean	BoolYearTag;			// 
-	gboolean	BoolCommentTag;			// 
-	gboolean	BoolEtatExpanderCd;		// 
-	
-	gchar		*StringExpanderLame;		// Lignes de saisie: options pour les geeks
-	gchar		*StringExpanderOggenc;		// 
-	gchar		*StringExpanderFlac;		// 
-	gchar		*StringExpanderFaac;		// 
-	gchar		*StringExpanderMppenc;		// 
-	gchar		*StringExpanderMac;		// 
-	gchar		*StringExpanderWavpack;		// 
-	
-	gint		 ServeurCddb;			// SERVER_CDDB_DEFAULT = 0 OR SERVER_CDDB_PARAM
-	gchar		*StringNameFile_m3u_xspf;	// 
-	gchar		*Templates_title_cdaudio;	// Format titres cdaudio
-	gchar		*Templates_rep_cdaudio;		// Dossier de sauvegarde des fichiers cdaudio
-	
-	gchar		*StringNameNavigateur;		// 
-	gchar		*StringParamNameNavigateur;	// 
+	gboolean	BoolConfigOk;					// Attendre la fin de la config.: Voir main.c
+	gulong		UsesOfXcfa;						// 0 to G_MAXULONG ( 18446744073709551615 )
+	gint		WinPos_X;						// 
+	gint		WinPos_Y;						// 
+	gint		WinWidth;						// 
+	gint		WinHeight;						// 
+	gint		Nice;							// 
+	gchar		*PathLoadFileAll;				// 
+	gchar		*PathLoadFileWav;				// 
+	gchar		*PathLoadFileMp3Ogg;			// 
+	gchar		*PathLoadFileTags;				// 
+	gint		TabIndiceComboDestFile[4];		// 
+	gchar		*PathDestinationFileAll;		// 
+	gchar		*PathDestinationFileWav;		// 
+	gchar		*PathDestinationFileMp3Ogg;		// 
+	gchar		*PathDestinationFileTags;		// 
+	gchar		*PathDestinationDVD;			// 
+	gchar		*PathChoiceFileDVD;				// 
+	gchar		*PathDestinationCD;				// 
+	gchar		*PathChoiceFileCD;				// 
+	gchar		*PathDestinationSplit;			// 
+	gchar		*PathLoadSplit;					// 
+	gchar		*PathnameTMP;					// 
+	gchar		*PathStockeImagesPochette;		// 
+	gchar		*PathDestFilePostScript;		// 
+	gchar		*PathLoadImages;				// 
+	gint		NotebookGeneral;				// 
+	gint		NotebookExpanderCd;				// 
+	gint		NotebookFile;					// 
+	gint		NotebookOptions;				// 
+	gint		NotebookAppExterns;				// 
+	gint		ExtractCdWith;					// EXTRACT_WITH_CDPARANOIA = 0, EXTRACT_WITH_CDPARANOIA_EXPERT, EXTRACT_WITH_CDDA2WAV	
+	
+	gint		BitrateLameIndice;				// abr .. vbr_new
+	gint		TabBitrateLame[4];				// [ abr | cbr | vbr | vbr_new ]
+	gint		TabModeLame[4];					// [ ModeAbr | ModeCbr | ModeVbr | ModeVbrNew ]
+	
+	gint		BitrateOggenc;					// 
+	gint		ManagedOggenc;					// 
+	gint		DownmixOggenc;					// 
+	
+	gint		CompressionLevelFlac;			// 
+	
+	gint		CompressionLevelApeMac;			// 
+	
+	gint		CompressionWavpack;				// 
+	gint		SoundWavpack;					// 
+	gint		ModeHybrideWavpack;				// 
+	gint		CorrectionFileWavpack;			// 
+	gint		CompressionMaximumWavpack;		// 
+	gint		SignatureMd5Wavpack;			// 
+	gint		ExtraEncodingWavpack;			// 
+	
+	gint		QualityMppenc;					// 
+	
+	gint		ConteneurFacc;					// 
+	gint		AbrVbrFacc;						// 
+	gint		AbrFaccIndice;					// 
+	gint		VbrFaccIndice;					// 
+	
+	gint		ChoiceMonoAacplusenc;			// 
+	gint		ChoiceStereoAacplusenc;			// 
+	
+	gboolean	BoolArtistTag;					// 
+	gboolean	BoolTitleTag;					// 
+	gboolean	BoolAlbumTag;					// 
+	gboolean	BoolNumerateTag;				// 
+	gboolean	BoolGenreTag;					// 
+	gboolean	BoolYearTag;					// 
+	gboolean	BoolCommentTag;					// 
+	gboolean	BoolEtatExpanderCd;				// 
+	
+	gchar		*StringExpanderLame;			// Lignes de saisie: options pour les geeks
+	gchar		*StringExpanderOggenc;			// 
+	gchar		*StringExpanderFlac;			// 
+	gchar		*StringExpanderFaac;			// 
+	gchar		*StringExpanderMppenc;			// 
+	gchar		*StringExpanderMac;				// 
+	gchar		*StringExpanderWavpack;			// 
+	
+	gint		 ServeurCddb;					// SERVER_CDDB_DEFAULT = 0 OR SERVER_CDDB_PARAM
+	gchar		*StringNameFile_m3u_xspf;		// 
+	gchar		*Templates_title_cdaudio;		// Format titres cdaudio
+	gchar		*Templates_rep_cdaudio;			// Dossier de sauvegarde des fichiers cdaudio
+	
+	gchar		*StringNameNavigateur;			// 
+	gchar		*StringParamNameNavigateur;		// 
 	gchar		*StringNameLecteurPostScript;	// 
-	gchar		*StringNameLecteurAudio;	// 
+	gchar		*StringNameLecteurAudio;		// 
 	gchar		*StringParamNameLecteurAudio;	// 
 	
-	gchar		*StringBoolFieldsIsVisible;	// FIELDS DVD,CD,FILES: FALSE or HIDE = 0, TRUE or SHOW = 1
-	gchar		*StringPosFieldsName;		// POS NAME OF DVD,CD,FILES: 0 = LEFT, 1 = CENTER, 2 = RIGHT
+	gchar		*StringBoolFieldsIsVisible;		// FIELDS DVD,CD,FILES: FALSE or HIDE = 0, TRUE or SHOW = 1
+	gchar		*StringPosFieldsName;			// POS NAME OF DVD,CD,FILES: 0 = LEFT, 1 = CENTER, 2 = RIGHT
 	
-	gint		 NumSelectComboBoxDvd;		// 
-	gint		 NumSelectComboBoxCd;		// 
+	gint		 NumSelectComboBoxDvd;			// 
+	gint		 NumSelectComboBoxCd;			// 
 	
-	gchar		*entry_cddp_server;		// 
-	gchar		*entry_proxy_server;		// 
-	gchar		*entry_proxy_port;		// 
+	gchar		*entry_cddp_server;				// 
+	gchar		*entry_proxy_server;			// 
+	gchar		*entry_proxy_port;				// 
 	
-	gchar		*NameImg;			// NEW
-	gchar		*PathLoadImg;			// 
-	gchar		*PathSaveImg;			// 
-	gchar		*PathPochette;			// 
+	gchar		*NameImg;						// NEW
+	gchar		*PathLoadImg;					// 
+	gchar		*PathSaveImg;					// 
+	gchar		*PathPochette;					// 
 	
 	gboolean	BoolCheckbuttonEndOfConvert;	// 
-	gchar		*PathMusicFileEndOfConvert;	// 
-	gchar		*FileMusicFileEndOfConvert;	// 
+	gchar		*PathMusicFileEndOfConvert;		// 
+	gchar		*FileMusicFileEndOfConvert;		// 
 	
-	gchar		*StringCommentCD;		// 
+	gchar		*StringCommentCD;				// 
+	
+	gboolean	BoolLogCdparanoiaModeExpert;	// 
 	
 } VAR_CONFIG;

xcfa-4.2.8.tar.gz/src/conv.c -> xcfa-5.0.2.tar.gz/src/conv.c Changed

@@ -1,25 +1,25 @@
 /*
 * file : conv.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
 *
 * This file is part of XCFA.
- * 
+ *
 * XCFA is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * at your option) any later version.
- * 
+ *
 * XCFA is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with XCFA. If not, see <http://www.gnu.org/licenses/>.
 */
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <pthread.h>
 #include <sys/types.h>
@@ -51,6 +46,7 @@
 #include "global.h"
 #include "file.h"
 #include "conv.h"
+#include "configuser.h"
 
 
 /*
@@ -72,6 +68,49 @@
 
 CONV conv;
 
+
+//
+// Allocate Tab Args
+//
+gchar **conv_AllocTabArgs( gint *p_tab )
+{
+//	gint	len_malloc =
+//			50 +								// nbr elements
+//			C_list_length( Detail.ListFile );	// list length
+	gint	len_malloc = 50;
+	gchar	**PtrTab = (gchar **)g_malloc0( sizeof(gchar **) * len_malloc );
+
+	*p_tab = 0;
+	//if( Detail.Nice >= 0 && Detail.Nice <= 20) {
+		PtrTab [ 0 ] = g_strdup( "nice" );
+		PtrTab [ 1 ] = g_strdup( "-n" );
+		// PtrTab [ 2 ] = g_strdup_printf( "%d", Detail.Nice );
+		PtrTab [ 2 ] = g_strdup_printf( "%d", Config.Nice );
+		*p_tab = 3;
+	//}
+	return( (gchar **)PtrTab );
+}
+
+//
+// Remove Tab Args
+//
+gchar **conv_RemoveTab( gchar **p_PtrTabArgs )
+{
+	gint	i;
+
+	for( i = 0; p_PtrTabArgs[ i ] != NULL; i ++ ) {
+		g_free( p_PtrTabArgs[ i ] );
+		p_PtrTabArgs[ i ] = NULL;
+	}
+	g_free( p_PtrTabArgs );
+	p_PtrTabArgs = NULL;
+
+	return( (gchar **)NULL );
+}
+
+
+
+
 /*
 *---------------------------------------------------------------------------
 * STOP THREAD AND TIMEOUT
@@ -185,11 +224,11 @@
 	conv.signal_numchildren_extract ++;
 	signal (SIGCHLD, conv_sigchld_extract);
 	close(conv.tube_extract [ 1 ]);
-	
+
 	// LE FICHIER EST OUVERT EN MODE « NON-BLOQUANT »
 	// status = fcntl( conv.tube_extract [ 0 ], F_GETFL );
 	// status = fcntl( conv.tube_extract [ 0 ], F_SETFL, status | O_NONBLOCK );
-	
+
 	return (conv.tube_extract [ 0 ]);
 }
 /*
@@ -234,11 +273,11 @@
 	conv.signal_numchildren_conv ++;
 	signal (SIGCHLD, conv_sigchld_convert);
 	close (conv.tube_conv [ 1 ]);
-	
+
 	// LE FICHIER EST OUVERT EN MODE « NON-BLOQUANT »
 	// status = fcntl( conv.tube_conv [ 0 ], F_GETFL );
 	// status = fcntl( conv.tube_conv [ 0 ], F_SETFL, status | O_NONBLOCK );
-	
+
 	return (conv.tube_conv [ 0 ]);
 }
 // RESET STRUCTURE CONV
@@ -246,7 +285,7 @@
 void conv_reset_struct (void *p_func)
 {
 	gint	i;
-	
+
 	/*PRINT_FUNC_LF();*/
 	conv.Func_request_stop = p_func;
 	conv.BoolIsExtract = FALSE;
@@ -254,7 +293,7 @@
 	conv.BoolIsCopy = FALSE;
 	conv.BoolIsNormalise = FALSE;
 	conv.BoolIsReplaygain = FALSE;
-	
+
 	conv.extract_percent = 0.0;
 	conv.total_rip = 0;
 	conv.rip_completed = 0;
@@ -264,12 +303,13 @@
 	conv.total_percent = 0.0;
 	conv.bool_percent_conv = FALSE;
 	conv.bool_percent_extract = FALSE;
-			
-	conv.bool_stop = FALSE;
 
-	if (conv.TmpRep) g_free (conv.TmpRep);
-	conv.TmpRep = NULL;
+	conv.bool_stop = FALSE;
 
+	if( NULL != conv.TmpRep ) {
+		g_free (conv.TmpRep);
+		conv.TmpRep = NULL;
+	}
 	conv.code_fork_conv = -1;
 	conv.code_fork_extract = -1;
 	conv.handler_timeout_conv = 0;
@@ -279,14 +319,13 @@
 	conv.signal_numchildren_extract = 0;
 
 	conv.Bool_MAJ_select = FALSE;
-	
+
 	for (i = 0; i < MAX_ARG_CONV; i++) {
-		conv.ArgConv [ i ] = NULL;
 		conv.ArgExtract [ i ] = NULL;
 	}
 }
 // LSDVD
-// 
+//
 void conv_with_lsdvd_ARGS (gchar **args)
 {
 	gint fd;
@@ -308,7 +347,7 @@
 				pos --;
 			}
 			size = read(fd, &buf[pos], 1);
-			
+
 		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
 		buf[pos++] = '\n';
 		buf[pos] = '\0';
@@ -321,11 +360,11 @@
 	conv.conversion_percent = 0.0;
 }
 // MPLAYER
-// 
+//
 gboolean conv_with_mplayer_ARGS (gchar **args, TYPE_CONV p_TypeConv)
 {
 	gint		pos = 0;
-	gint		fd;
+	gint		fd = -1;
 	gint		size;
 	gchar		buf [ CONV_MAX_CARS + 10 ];
 	gboolean	BoolRet = TRUE;
@@ -335,7 +374,7 @@
 	gboolean	BoolErreurMplayer = FALSE;
 	gint		Total = 0;
 	gint		Value = 0;
-	
+
 	/* PRINT_FUNC_LF(); */
 
 	conv.conversion_percent = 0.0;
@@ -344,10 +383,11 @@
 
 	/* Ne pas stopper mplayer */
 	/* conv.code_fork_conv = -1; */
-	
+
 	do {
 		pos = -1;
 		do {
+
 			pos++;
 			if (pos >= CONV_MAX_CARS) {
 				PRINT_FUNC_LF();
@@ -355,15 +395,20 @@
 				pos --;
 			}
 			size = read(fd, &buf[pos], 1);
-			
+
 			if (strstr(buf,"Audio: no sound")) {
 				BoolRet = FALSE;
 				BoolErreurMplayer = TRUE;
 				break;
 			}
-			
+			if (strstr(buf,"relocation error")) {
+				BoolRet = FALSE;
+				BoolErreurMplayer = TRUE;
+				break;
+			}
+
 		} while (FALSE == conv.bool_stop && (buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
-		
+
 		// SI LA FONCTION EST NON NULLE
 		if (NULL != conv.Func_request_stop) {
 			// SI DEMANDE DE STOP EST VALIDE
@@ -376,10 +421,10 @@
 		if (TRUE == BoolErreurMplayer) break;
 
 		if (FALSE == conv.bool_stop && p_TypeConv != MPLAYER_AUDIO_TO_WAV) {
-			
+
 			// A: 7.3 (07.2) of 276.0 (04:36.0) 0.6%
 			// A:4061.6 ( 1:07:41.6) of 4089.0 ( 1:08:09.0) 0.0
-			
+
 			if (BoolFinfTotal == FALSE) {
 				if ((Ptr = strstr(buf,"A:")) != NULL) {
 					if ((Ptr = strstr(buf,"of")) != NULL) {
@@ -406,7 +451,7 @@
 				conv.bool_percent_conv = TRUE;
 			}
 		}
-		
+
 		if (buf[pos] != '\n') {
 			pos ++;
 			buf[pos++] = '\n';
@@ -431,7 +476,7 @@
 	return (BoolRet);
 }
 // SOX
-// 
+//
 void conv_with_sox_ARGS (gchar **args)
 {
 	gint	fd;
@@ -439,7 +484,7 @@
 	gint	pos = 0;
 	gchar	buf [ CONV_MAX_CARS + 10 ];
 	float	Percent;
-	
+
 	fd = conv_call_exec (args, &conv.code_fork_conv, STDERR_FILENO);
 
 	do {
@@ -452,11 +497,11 @@
 				pos --;
 			}
 			size = read(fd, &buf[pos], 1);
-			
+
 		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
 		pos ++;
 		buf[ pos ] = '\0';
-		
+
 		// SI LA FONCTION EST NON NULLE
 		if (NULL != conv.Func_request_stop) {
 			// SI DEMANDE DE STOP EST VALIDE
@@ -465,12 +510,12 @@
 				conv_stop_conversion ();
 			}
 		}
-		
+
 		if( strstr( buf, "In:" )) {
-			
+
 			gchar	*Ptr = NULL;
-			
-			// In:76.6% 00:52:11.54 [00:15:58.40] Out:138M [======|=====!] Hd:0.0 Clip:0 
+
+			// In:76.6% 00:52:11.54 [00:15:58.40] Out:138M [======|=====!] Hd:0.0 Clip:0
 			if( NULL != ( Ptr = strchr( buf, ':' ))) {
 				Ptr ++ ;
 				if( sscanf( Ptr, "%f", &Percent ) > 0 ) {
@@ -485,60 +530,98 @@
 				}
 			}
 		}
-		
+
 		buf [ 0 ] = '\0';
 		buf [ 1 ] = '\0';
 		buf [ 2 ] = '\0';
-		
+
 	} while (FALSE == conv.bool_stop && size != 0);
 
 	close(fd);
 	conv.code_fork_conv = -1;
 	conv.conversion_percent = 0.0;
 }
-void conv_with_sox_get_param (gchar *filesrc, gchar *filedest, gchar *frequence, gchar *voie, gchar *bits)
+gchar **conv_with_sox_get_param( gchar *filesrc, gchar *filedest, gchar *frequence, gchar *voie, gchar *bits )
 {
 	gint	pos;
-	
-	pos = filelc_get_command_line_nice ();
-	conv.ArgConv [ pos++ ] = g_strdup ("sox");
-	conv.ArgConv [ pos++ ] = g_strdup ("-t");
-	conv.ArgConv [ pos++ ] = g_strdup (".wav");
-	conv.ArgConv [ pos++ ] = g_strdup (filesrc);
-	conv.ArgConv [ pos++ ] = g_strdup ("-S");
-	conv.ArgConv [ pos++ ] = g_strdup ("-r");
-	conv.ArgConv [ pos++ ] = g_strdup (frequence);
-	conv.ArgConv [ pos++ ] = g_strdup ("-c");
-	conv.ArgConv [ pos++ ] = g_strdup (voie);
-	
+	gchar	**PtrTabArgs = NULL;
+
+	PtrTabArgs = filelc_AllocTabArgs();
+	pos = 3;
+	PtrTabArgs [ pos++ ] = g_strdup ("sox");
+	PtrTabArgs [ pos++ ] = g_strdup ("-t");
+	PtrTabArgs [ pos++ ] = g_strdup (".wav");
+	PtrTabArgs [ pos++ ] = g_strdup (filesrc);
+	PtrTabArgs [ pos++ ] = g_strdup ("-S");
+	PtrTabArgs [ pos++ ] = g_strdup ("-r");
+	PtrTabArgs [ pos++ ] = g_strdup (frequence);
+	PtrTabArgs [ pos++ ] = g_strdup ("-c");
+	PtrTabArgs [ pos++ ] = g_strdup (voie);
+
+	/*
 	switch (atoi (bits)) {
-		case 8 : conv.ArgConv [ pos++ ] = g_strdup ("-1"); break;
-		case 16 : conv.ArgConv [ pos++ ] = g_strdup ("-2"); break;
-		case 24 : conv.ArgConv [ pos++ ] = g_strdup ("-3"); break;
-		case 32 : conv.ArgConv [ pos++ ] = g_strdup ("-4"); break;
-		case 64 : conv.ArgConv [ pos++ ] = g_strdup ("-8"); break;
-		default : conv.ArgConv [ pos++ ] = g_strdup ("-2"); break;
+		case 8 : PtrTabArgs [ pos++ ] = g_strdup ("-1"); break;
+		case 16 : PtrTabArgs [ pos++ ] = g_strdup ("-2"); break;
+		case 24 : PtrTabArgs [ pos++ ] = g_strdup ("-3"); break;
+		case 32 : PtrTabArgs [ pos++ ] = g_strdup ("-4"); break;
+		case 64 : PtrTabArgs [ pos++ ] = g_strdup ("-8"); break;
+		default : PtrTabArgs [ pos++ ] = g_strdup ("-2"); break;
 	}
-	conv.ArgConv [ pos++ ] = g_strdup ("-o");
-	conv.ArgConv [ pos++ ] = g_strdup (filedest);
-	conv.ArgConv [ pos++ ] = NULL;
+	PtrTabArgs [ pos++ ] = g_strdup ("-o");
+	PtrTabArgs [ pos++ ] = g_strdup (filedest);
+	PtrTabArgs [ pos++ ] = NULL;
+	*/
+	switch (atoi (bits)) {
+		case 8 : PtrTabArgs [ pos++ ] = g_strdup ("-b"); PtrTabArgs [ pos++ ] = g_strdup ("8"); break;
+		case 16 : PtrTabArgs [ pos++ ] = g_strdup ("-b"); PtrTabArgs [ pos++ ] = g_strdup ("16"); break;
+		case 24 : PtrTabArgs [ pos++ ] = g_strdup ("-b"); PtrTabArgs [ pos++ ] = g_strdup ("24"); break;
+		case 32 : PtrTabArgs [ pos++ ] = g_strdup ("-b"); PtrTabArgs [ pos++ ] = g_strdup ("32"); break;
+		case 64 : PtrTabArgs [ pos++ ] = g_strdup ("-b"); PtrTabArgs [ pos++ ] = g_strdup ("64"); break;
+		default : PtrTabArgs [ pos++ ] = g_strdup ("-b"); PtrTabArgs [ pos++ ] = g_strdup ("16"); break;
+	}
+	PtrTabArgs [ pos++ ] = g_strdup (filedest);
+	PtrTabArgs [ pos++ ] = NULL;
+
+	return( (gchar **)PtrTabArgs );
 }
-void conv_with_sox_float_get_param (gchar *filesrc, gchar *filedest)
+gchar **conv_with_sox_float_get_param( gchar *filesrc, gchar *filedest )
 {
 	gint	pos;
-	
-	pos = filelc_get_command_line_nice ();
-	conv.ArgConv [ pos++ ] = g_strdup ("sox");
-	conv.ArgConv [ pos++ ] = g_strdup (filesrc);
-	conv.ArgConv [ pos++ ] = g_strdup ("-t");
-	conv.ArgConv [ pos++ ] = g_strdup ("wavpcm");
-	conv.ArgConv [ pos++ ] = g_strdup ("-S");
-	conv.ArgConv [ pos++ ] = g_strdup ("-f");
-	conv.ArgConv [ pos++ ] = g_strdup ("-o");
-	conv.ArgConv [ pos++ ] = g_strdup (filedest);
+	gchar	**PtrTabArgs = NULL;
+
+	PtrTabArgs = filelc_AllocTabArgs();
+	pos = 3;
+	PtrTabArgs [ pos++ ] = g_strdup ("sox");
+	PtrTabArgs [ pos++ ] = g_strdup (filesrc);
+	PtrTabArgs [ pos++ ] = g_strdup ("-t");
+	PtrTabArgs [ pos++ ] = g_strdup ("wavpcm");
+	PtrTabArgs [ pos++ ] = g_strdup ("-S");
+	//PtrTabArgs [ pos++ ] = C_strdup ("-f");
+	PtrTabArgs [ pos++ ] = g_strdup ("-e");
+	PtrTabArgs [ pos++ ] = g_strdup ("floating-point");
+	// PtrTabArgs [ pos++ ] = C_strdup ("-o");
+	PtrTabArgs [ pos++ ] = g_strdup (filedest);
+	PtrTabArgs [ pos++ ] = NULL;
+
+	return( (gchar **)PtrTabArgs );
+}
+gchar **conv_lsdvd_read_get_param( gchar *p_PathDvd )
+{
+	gint	pos;
+	gchar	**PtrTabArgs = NULL;
+
+	PtrTabArgs = filelc_AllocTabArgs();
+	pos = 3;
+	PtrTabArgs [ pos++ ] = g_strdup( "lsdvd" );
+	PtrTabArgs [ pos++ ] = g_strdup( p_PathDvd );
+	PtrTabArgs [ pos++ ] = g_strdup( "-x" );
+	PtrTabArgs [ pos++ ] = g_strdup( "2>&1" );
+	PtrTabArgs [ pos++ ] = NULL;
+
+	return( (gchar **)PtrTabArgs );
 }
 // FLAC
-// 
+//
 gboolean conv_with_flac_ARGS (gchar **args)
 {
 	gint		 pos = 0;
@@ -564,11 +647,11 @@
 				pos --;
 			}
 			size = read(fd, &buf[pos], 1);
-			
+
 		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
 		pos ++;
 		buf[ pos ] = '\0';
-		
+
 		// SI LA FONCTION EST NON NULLE
 		if (NULL != conv.Func_request_stop) {
 			// SI DEMANDE DE STOP EST VALIDE
@@ -587,7 +670,7 @@
 			BoolNoErrorRet = FALSE;
 			break;
 		}
-		
+
 		/* exemple du contenu de buf
 		*
 		a.wav: 5% complete, ratio=0,534
@@ -613,11 +696,11 @@
 	close(fd);
 	conv.code_fork_conv = -1;
 	conv.conversion_percent = 0.0;
-	
+
 	return (BoolNoErrorRet);
 }
 // MAC
-// 
+//
 void conv_with_mac_ARGS (gchar **args)
 {
 	gint pos = 0;
@@ -653,11 +736,11 @@
 				pos --;
 			}
 			size = read(fd, &buf[pos], 1);
-			
+
 		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
 		pos ++;
 		buf[ pos ] = '\0';
-		
+
 		// SI LA FONCTION EST NON NULLE
 		if (NULL != conv.Func_request_stop) {
 			// SI DEMANDE DE STOP EST VALIDE
@@ -685,19 +768,16 @@
 	conv.conversion_percent = 0.0;
 }
 // WAVPACK
-// 
+//
 void conv_with_wavpack_ARGS (gchar **args)
 {
 	gint pos = 0;
 	gboolean BoolPass = FALSE;
-	
 	gint fd;
 	gint size;
 	gchar buf [ CONV_MAX_CARS + 10 ];
 	gchar *ptr = NULL;
 	gint percent;
-	
-	gint	 PassMess = 0;
 
 	fd = conv_call_exec (args, &conv.code_fork_conv, STDERR_FILENO);
 
@@ -715,10 +795,10 @@
 				pos --;
 			}
 			size = read(fd, &buf[pos], 1);
-			
+
 		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
 		buf[pos] = '\0';
-		
+
 		// SI LA FONCTION EST NON NULLE
 		if (NULL != conv.Func_request_stop) {
 			// SI DEMANDE DE STOP EST VALIDE
@@ -764,36 +844,11 @@
 				BoolPass = TRUE;
 			}
 		}
-		else if ((ptr = strstr (&buf[0], "original md5 signature:"))) {
-			
-			PassMess = 1;
-			// logs_write_datas ("\t");
-			// logs_writeln_datas (buf);
-		}
-		else if ((ptr = strstr (&buf[0], "created"))) {
-			
-			PassMess = 2;
-			// logs_write_datas ("\t");
-			// logs_writeln_datas (buf);
-		}
-		else if (PassMess == 0) {
-			PassMess = 3;
-		}
 
 	} while (FALSE == conv.bool_stop && size != 0);
-	
-	switch (PassMess) {
-	case 0 :
-	case 1 :
-	case 2 :
-		break;
-	case 3 :
-		// logs_writeln_datas (_("Wav to Wavpack"));
-		break;
-	}
-	
+
 	if (BoolPass == FALSE) {
-		
+
 		percent = 100;
 		conv.conversion_percent = 1.0;
 		conv.total_percent = ((conv.encode_completed) + (double)conv.conversion_percent) / conv.total_convert;
@@ -805,7 +860,7 @@
 	conv.conversion_percent = 0.0;
 }
 // OGGENC
-// 
+//
 void conv_with_oggenc_ARGS (gchar **args)
 {
 	gint pos = 0;
@@ -814,7 +869,7 @@
 	gint sector;
 	gint end;
 	gchar buf [ CONV_MAX_CARS + 10 ];
-	
+
 	fd = conv_call_exec (args, &conv.code_fork_conv, STDERR_FILENO);
 
 	conv.conversion_percent = 0.0;
@@ -830,11 +885,11 @@
 				pos --;
 			}
 			size = read(fd, &buf[pos], 1);
-			
+
 		} while (buf[pos] != '\b' && buf[pos] != '\r' && buf[pos] != '\n' && size > 0);
 		pos ++;
 		buf[ pos ] = '\0';
-		
+
 		// SI LA FONCTION EST NON NULLE
 		if (NULL != conv.Func_request_stop) {
 			// SI DEMANDE DE STOP EST VALIDE
@@ -872,7 +927,7 @@
 	conv.conversion_percent = 0.0;
 }
 // FAAC
-// 
+//
 void conv_with_faac_ARGS (gchar **args)
 {
 	gint pos = 0;
@@ -902,11 +957,11 @@
 				pos --;
 			}
 			size = read(fd, &buf[pos], 1);
-			
+
 		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
 		pos ++;
 		buf[ pos ] = '\0';
-		
+
 		// SI LA FONCTION EST NON NULLE
 		if (NULL != conv.Func_request_stop) {
 			// SI DEMANDE DE STOP EST VALIDE
@@ -934,7 +989,7 @@
 	conv.conversion_percent = 0.0;
 }
 // LAME
-// 
+//
 void conv_with_lame_ARGS (gchar **args)
 {
 	gint pos = 0;
@@ -955,11 +1010,11 @@
 				pos --;
 			}
 			size = read(fd, &buf[pos], 1);
-			
+
 		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
 		pos ++;
 		buf[ pos ] = '\0';
-		
+
 		// SI LA FONCTION EST NON NULLE
 		if (NULL != conv.Func_request_stop) {
 			// SI DEMANDE DE STOP EST VALIDE
@@ -973,7 +1028,7 @@
 		end = -1;
 
 		if (sscanf(buf, "%d/%d", &sector, &end) == 2) {
-		
+
 			conv.conversion_percent = (double)sector/end;
 			if (conv.conversion_percent >= CONV_MAX_VALUE_PERCENT) conv.conversion_percent = 1.000000;
 			conv.total_percent = ((double)conv.rip_completed +
@@ -990,7 +1045,7 @@
 	conv.conversion_percent = 0.0;
 }
 // OGG123
-// 
+//
 void conv_with_ogg123_ARGS (gchar **args)
 {
 	gint fd;
@@ -999,7 +1054,8 @@
 	gchar buf [ CONV_MAX_CARS + 10 ];
 	gint Dummy;
 	gint Min = -1, Sec = -1, Cent = -1;
-	gint Code = -1, TT_Sector = -1;
+	// gint Code = -1;
+	gint TT_Sector = -1;
 
 	fd = conv_call_exec (args, &conv.code_fork_conv, STDERR_FILENO);
 
@@ -1014,11 +1070,11 @@
 				pos --;
 			}
 			size = read(fd, &buf[pos], 1);
-			
+
 		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
 		pos ++;
 		buf[ pos ] = '\0';
-		
+
 		// SI LA FONCTION EST NON NULLE
 		if (NULL != conv.Func_request_stop) {
 			// SI DEMANDE DE STOP EST VALIDE
@@ -1031,7 +1087,7 @@
 		/*
 		Time: 00:39,17 [03:57,86] of 04:37,03 (190,3 kbit/s) Output Buffer 100,0%
 		*/
-		Code = -1;
+		// Code = -1;
 
 		if (TT_Sector == -1) {
 			sscanf(buf, "Time: %d:%d,%d [%d:%d,%d] of %d:%d,%d",
@@ -1044,9 +1100,9 @@
 			if (Min > -1 && Sec > -1 && Cent > -1) {
 
 				conv.conversion_percent = (double)((Min * 60) + Sec) / TT_Sector;
-				
+
 				if (conv.conversion_percent >= CONV_MAX_VALUE_PERCENT) conv.conversion_percent = 1.000000;
-				
+
 				conv.total_percent = (conv.encode_completed + (double)((Min * 60) + Sec) / TT_Sector) / conv.total_convert;
 				conv.bool_percent_conv = TRUE;
 			}
@@ -1058,7 +1114,7 @@
 	conv.conversion_percent = 0.0;
 }
 // NORMALISE
-// 
+//
 void conv_with_normalise_ARGS (gchar **args)
 {
 	gint end = 0;
@@ -1076,9 +1132,9 @@
 		/*
 		$ normalize-audio --peak "/home/cat/Musique/CD/PEAK_Charles Aznavour/01.wav" --
 		Computing levels...
-		 01.wav 100% done, ETA 00:00:00 (batch 100% done, ETA 00:00:00) 
+		 01.wav 100% done, ETA 00:00:00 (batch 100% done, ETA 00:00:00)
 		Applying adjustment of 0,82dB to /home/cat/Musique/CD/PEAK_Charles Aznavour/01.wav...
-		 01.wav 100% done, ETA 00:00:00 (batch 100% done, ETA 00:00:00) 
+		 01.wav 100% done, ETA 00:00:00 (batch 100% done, ETA 00:00:00)
 		*/
 
 		pos = -1;
@@ -1093,7 +1149,7 @@
 			size = read(fd, &buf[pos], 1);
 		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
 		buf[pos] = '\0';
-		
+
 		// SI LA FONCTION EST NON NULLE
 		if (NULL != conv.Func_request_stop) {
 			// SI DEMANDE DE STOP EST VALIDE
@@ -1105,14 +1161,14 @@
 
 		// g_print("BUF = %s\n", buf);
 		// 1_77842900.wav 35% done, ETA 00:00:02 (batch 35% done, ETA 00:00:02)
-		
+
 		if( NULL != ( ptr = strstr( buf, "done" ))) {
-			
+
 			ptr --;
 			ptr --;
 			while( *ptr != ' ' ) ptr --;
 			ptr ++;
-			
+
 			if (sscanf(ptr, "%d",&end) == 1) {
 
 				if (bool_pass_2 == TRUE) {
@@ -1157,7 +1213,7 @@
 	gdouble dmin = 0.0;
 	gdouble dmax = 0.0;
 	gboolean BoolPass = TRUE;
-	
+
 	fd = conv_call_exec (args, &conv.code_fork_conv, STDOUT_FILENO);
 	do
 	{
@@ -1171,10 +1227,10 @@
 				pos --;
 			}
 			size = read(fd, &buf[pos], 1);
-			
+
 		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
 		buf[pos] = '\0';
-		
+
 		// SI LA FONCTION EST NON NULLE
 		if (NULL != conv.Func_request_stop) {
 			// SI DEMANDE DE STOP EST VALIDE
@@ -1187,7 +1243,7 @@
 		if ((ptr = strstr (&buf[0], "dBFS"))) {
 			while (*ptr != ' ') ptr ++;
 			while (*ptr == ' ') ptr ++;
-			
+
 			/*g_print ("buf = %s\n", buf);*/
 			value = atof(ptr);
 			if (BoolPass == TRUE) {
@@ -1215,23 +1271,23 @@
 	g_print ("\t0.0 - dmax(%f) - 0.1 = %f\n", dmax, 0.0 - dmax - 0.1);
 	conv.value_PEAK_RMS_GROUP_ARGS = 0.0 - dmax - 0.1;
 	g_print ("\tconv.value_PEAK_RMS_GROUP_ARGS = %f\n\n", conv.value_PEAK_RMS_GROUP_ARGS);
-	
+
 	close(fd);
 	conv.code_fork_conv = -1;
 	conv.conversion_percent = 0.0;
 }
-// REPLAGAN
-// 
+// REPLAGAIN
+//
 void conv_with_replaygain_ARGS (gchar **args)
 {
 	gint pos = 0;
 	gint size = 0;
 	gchar buf[CONV_MAX_CARS + 10];
 	gint fd;
-	
+
 	conv.bool_percent_conv = TRUE;
 	fd = conv_call_exec (args, &conv.code_fork_conv, STDERR_FILENO);
-	
+
 	do
 	{
 		size = -1;
@@ -1245,11 +1301,11 @@
 			}
 			size = read(fd, &buf[pos], 1);
 			conv.bool_percent_conv = TRUE;
-			
+
 		} while (buf[pos] != '\b' && buf[pos] != '\r' && buf[pos] != '\n' && size > 0);
 		pos ++;
 		buf[ pos ] = '\0';
-		
+
 		// SI LA FONCTION EST NON NULLE
 		if (NULL != conv.Func_request_stop) {
 			// SI DEMANDE DE STOP EST VALIDE
@@ -1264,7 +1320,7 @@
 	close(fd);
 }
 // AACPLUSENC
-// 
+//
 void conv_with_aacplusenc_ARGS (gchar **args)
 {
 	gint pos = 0;
@@ -1272,11 +1328,11 @@
 	gchar buf[CONV_MAX_CARS + 10];
 	gint fd;
 	gchar		*Ptr = NULL;
-	
+
 	conv.conversion_percent = 0.0;
 	conv.bool_percent_conv = TRUE;
 	fd = conv_call_exec (args, &conv.code_fork_conv, STDERR_FILENO);
-	
+
 	do {
 		pos = -1;
 		do {
@@ -1287,11 +1343,11 @@
 				pos --;
 			}
 			size = read(fd, &buf[pos], 1);
-			
+
 		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
 		buf[pos ++ ] = '\n';
 		buf[pos] = '\0';
-		
+
 		// SI LA FONCTION EST NON NULLE
 		if (NULL != conv.Func_request_stop) {
 			// SI DEMANDE DE STOP EST VALIDE
@@ -1312,7 +1368,7 @@
 					 ((double)conv.total_rip + (double)conv.total_convert);
 			conv.bool_percent_conv = TRUE;
 		}
-		
+
 	} while (FALSE == conv.bool_stop && size != 0);
 
 	conv.code_fork_conv = -1;
@@ -1320,7 +1376,7 @@
 	close(fd);
 }
 // MPPENC
-// 
+//
 void conv_with_mppenc_ARGS (gchar **args)
 {
 	gint pos = 0;
@@ -1342,11 +1398,11 @@
 				pos --;
 			}
 			size = read(fd, &buf[pos], 1);
-			
+
 		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
 		pos ++;
 		buf[ pos ] = '\0';
-		
+
 		// SI LA FONCTION EST NON NULLE
 		if (NULL != conv.Func_request_stop) {
 			// SI DEMANDE DE STOP EST VALIDE
@@ -1376,7 +1432,7 @@
 	conv.conversion_percent = 0.0;
 }
 // ICEDAX
-// 
+//
 gboolean conv_with_icedax_tool_ARGS (gchar **args)
 {
 	gint		pos = 0;
@@ -1398,11 +1454,11 @@
 				pos --;
 			}
 			size = read(fd, &buf[pos], 1);
-			
+
 		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
 		buf[pos ++ ] = '\n';
 		buf[pos] = '\0';
-		
+
 		// SI LA FONCTION EST NON NULLE
 		if (NULL != conv.Func_request_stop) {
 			// SI DEMANDE DE STOP EST VALIDE
@@ -1426,7 +1482,7 @@
 		BUF = Error trying to open /dev/hdb exclusively (Device or resource busy)... retrying in 1 second.
 		BUF = Error trying to open /dev/hdb exclusively (Device or resource busy)... retrying in 1 second.
 		BUF = Error trying to open /dev/hdb exclusively (Device or resource busy)... giving up.
-		*/		
+		*/
 		if (buf [ 0 ] != '\n') g_print("BUF = %s", buf);
 		if (NULL != (strstr (buf, "Device or resource busy"))) {
 			if (NbrError++ > 3) {
@@ -1435,16 +1491,16 @@
 				conv_stop_conversion ();
 			}
 		}
-		
+
 	} while (FALSE == conv.bool_stop && size != 0);
 
 	conv.code_fork_conv = -1;
 	close(fd);
-	
+
 	return (BoolRet);
 }
 // MPG321
-// 
+//
 void conv_with_mpg321_ARGS (gchar **args)
 {
 	gint fd;
@@ -1466,11 +1522,11 @@
 				pos --;
 			}
 			size = read(fd, &buf[pos], 1);
-			
+
 		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
 		pos ++;
 		buf[ pos ] = '\0';
-		
+
 		// SI LA FONCTION EST NON NULLE
 		if (NULL != conv.Func_request_stop) {
 			// SI DEMANDE DE STOP EST VALIDE
@@ -1491,9 +1547,9 @@
 			sscanf(buf, "%s %d", type, &Code);
 			if (Code > -1 && Code <= TT_Sector) {
 				conv.conversion_percent = (double)Code / TT_Sector;
-				
+
 				if (conv.conversion_percent >= CONV_MAX_VALUE_PERCENT) conv.conversion_percent = 1.000000;
-				
+
 				conv.total_percent = (conv.encode_completed + (double)Code / TT_Sector) / conv.total_convert;
 				conv.bool_percent_conv = TRUE;
 			}
@@ -1505,7 +1561,7 @@
 	conv.conversion_percent = 0.0;
 }
 // SHORTEN
-// 
+//
 void conv_with_shorten_ARGS (gchar **args)
 {
 	gint fd;
@@ -1527,11 +1583,11 @@
 				pos --;
 			}
 			size = read(fd, &buf[pos], 1);
-			
+
 		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
 		pos ++;
 		buf[ pos ] = '\0';
-		
+
 		// SI LA FONCTION EST NON NULLE
 		if (NULL != conv.Func_request_stop) {
 			// SI DEMANDE DE STOP EST VALIDE
@@ -1551,7 +1607,7 @@
 	conv.conversion_percent = 0.0;
 }
 // FAAD
-// 
+//
 void conv_with_faad_ARGS (gchar **args)
 {
 	gint fd;
@@ -1579,20 +1635,20 @@
 				pos --;
 			}
 			size = read(fd, &buf[pos], 1);
-			
+
 			if (strstr(buf,"Audio: no sound")) {
 				conv_stop_conversion ();
 				break;
 			}
-			
+
 		} while (!conv.bool_stop && (buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
-		
+
 		if (buf[pos] != '\n') {
 			pos ++;
 			buf[pos++] = '\n';
 			buf[pos] = '\0';
 		}
-		
+
 		// SI LA FONCTION EST NON NULLE
 		if (NULL != conv.Func_request_stop) {
 			// SI DEMANDE DE STOP EST VALIDE
@@ -1609,7 +1665,7 @@
 	conv.conversion_percent = 0.0;
 }
 // MPPDEC
-// 
+//
 void conv_with_mppdec_ARGS (gchar **args)
 {
 	gint fd;
@@ -1631,11 +1687,11 @@
 				pos --;
 			}
 			size = read(fd, &buf[pos], 1);
-			
+
 		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
 		pos ++;
 		buf[ pos ] = '\0';
-		
+
 		// SI LA FONCTION EST NON NULLE
 		if (NULL != conv.Func_request_stop) {
 			// SI DEMANDE DE STOP EST VALIDE
@@ -1685,7 +1741,7 @@
 	conv.conversion_percent = 0.0;
 }
 // WVUNPACK_WAVPACK_TO_WAV
-// 
+//
 void conv_with_wvunpack_ARGS (gchar **args)
 {
 	gint fd;
@@ -1709,10 +1765,10 @@
 				pos --;
 			}
 			size = read(fd, &buf[pos], 1);
-			
+
 		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
 		buf[pos] = '\0';
-		
+
 		// SI LA FONCTION EST NON NULLE
 		if (NULL != conv.Func_request_stop) {
 			// SI DEMANDE DE STOP EST VALIDE
@@ -1762,23 +1818,20 @@
 		original md5: 2b74aed5a5d62d1c3b0e6b96d5147cc9
 		unpacked md5: 2b74aed5a5d62d1c3b0e6b96d5147cc9
 		restored ./20.wav in 17.23 secs (lossless, 26.45%)
-		*/
 		else if ((ptr = strstr (&buf[0], "original md5:"))) {
-			// logs_writeln_datas (buf);
 		}
 		else if ((ptr = strstr (&buf[0], "unpacked md5:"))) {
-			// logs_writeln_datas (buf);
 		}
 		else if ((ptr = strstr (&buf[0], "restored"))) {
-			// logs_writeln_datas (buf);
 		}
+		*/
 	} while (FALSE == conv.bool_stop && size != 0);
 
 	close(fd);
 	conv.code_fork_conv = -1;
 	conv.conversion_percent = 0.0;
 }
-// 
+//
 // SPLIT
 void conv_with_split_ARGS (gchar **args)
 {
@@ -1789,7 +1842,7 @@
 
 	conv.bool_percent_conv = TRUE;
 	fd = conv_call_exec (args, &conv.code_fork_conv, STDERR_FILENO);
-	
+
 	do
 	{
 		size = -1;
@@ -1803,11 +1856,11 @@
 			}
 			size = read(fd, &buf[pos], 1);
 			conv.bool_percent_conv = TRUE;
-			
+
 		} while (buf[pos] != '\b' && buf[pos] != '\r' && buf[pos] != '\n' && size > 0);
 		pos ++;
 		buf[ pos ] = '\0';
-		
+
 		// SI LA FONCTION EST NON NULLE
 		if (NULL != conv.Func_request_stop) {
 			// SI DEMANDE DE STOP EST VALIDE
@@ -1823,7 +1876,7 @@
 	close(fd);
 }
 // CDDBTOOL
-// 
+//
 void conv_with_cddb_tool_ARGS (gchar **args)
 {
 	gint pos = 0;
@@ -1833,7 +1886,7 @@
 
 	conv.bool_percent_conv = TRUE;
 	fd = conv_call_exec (args, &conv.code_fork_conv, STDOUT_FILENO);
-	
+
 	do {
 		pos = -1;
 		do {
@@ -1844,11 +1897,11 @@
 				pos --;
 			}
 			size = read(fd, &buf[pos], 1);
-			
+
 		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
 		buf[pos ++ ] = '\n';
 		buf[pos] = '\0';
-		
+
 		// SI LA FONCTION EST NON NULLE
 		if (NULL != conv.Func_request_stop) {
 			// SI DEMANDE DE STOP EST VALIDE
@@ -1857,14 +1910,14 @@
 				conv_stop_conversion ();
 			}
 		}
-		
+
 	} while (FALSE == conv.bool_stop && size != 0);
 
 	conv.code_fork_conv = -1;
 	close(fd);
 }
 // WAVSPLIT
-// 
+//
 void conv_with_wavsplit_ARGS (gchar **args)
 {
 	gint pos = 0;
@@ -1874,7 +1927,7 @@
 
 	conv.bool_percent_conv = TRUE;
 	fd = conv_call_exec (args, &conv.code_fork_conv, STDOUT_FILENO);
-	
+
 	do {
 		pos = -1;
 		do {
@@ -1885,11 +1938,11 @@
 				pos --;
 			}
 			size = read(fd, &buf[pos], 1);
-			
+
 		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
 		buf[pos ++ ] = '\n';
 		buf[pos] = '\0';
-		
+
 		// SI LA FONCTION EST NON NULLE
 		if (NULL != conv.Func_request_stop) {
 			// SI DEMANDE DE STOP EST VALIDE
@@ -1898,14 +1951,14 @@
 				conv_stop_conversion ();
 			}
 		}
-		
+
 	} while (FALSE == conv.bool_stop && size != 0);
 
 	conv.code_fork_conv = -1;
 	close(fd);
 }
 // A52DEC
-// 
+//
 void conv_with_a52dec_ARGS (gchar **args)
 {
 	gint pos = 0;
@@ -1914,15 +1967,15 @@
 	gint fd;
 	FILE		*fp = NULL;
 	gchar		*FileSave = g_strdup (args[ 8 ]);
-	
+
 	g_free (args[ 7 ]);	args[ 7 ] = NULL;
 	g_free (args[ 8 ]);	args[ 8 ] = NULL;
-	
+
 	conv.bool_percent_conv = TRUE;
 	fd = conv_call_exec (args, &conv.code_fork_conv, STDOUT_FILENO);
-	
+
 	fp = fopen (FileSave, "w");
-	
+
 	do {
 		pos = 0;
 		do {
@@ -1936,12 +1989,12 @@
 			*/
 			size = read(fd, &buf [ pos ], 1);
 			fprintf (fp, "%c", (short)buf [ 0 ]);
-			
-			
+
+
 		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
 		buf[pos ++ ] = '\n';
 		buf[pos] = '\0';
-		
+
 		// SI LA FONCTION EST NON NULLE
 		if (NULL != conv.Func_request_stop) {
 			// SI DEMANDE DE STOP EST VALIDE
@@ -1950,25 +2003,25 @@
 				conv_stop_conversion ();
 			}
 		}
-		
+
 	} while (FALSE == conv.bool_stop && size != 0);
 
 	fclose (fp);
 	g_free (FileSave);	FileSave = NULL;
-	
+
 	conv.code_fork_conv = -1;
 	close(fd);
 }
 
 // CALL CONV
-// 
-gboolean conv_to_convert (gboolean WithParameter, TYPE_CONV type_conv, gchar *info)
+//
+gboolean conv_to_convert( gchar **p_TabArgs, gboolean WithParameter, TYPE_CONV type_conv, gchar *info )
 {
 	gint pos = 0;
 	gboolean	 RetBool = TRUE;
-		
-	PRINT_FUNC_LF();
-	
+
+	// PRINT_FUNC_LF();
+
 	if (NORMALISE_CALCUL == type_conv || NORMALISE_APPLIQUE == type_conv || NORMALISE_EXEC == type_conv || NORMALISE_GET_LEVEL == type_conv) {
 		conv.BoolIsNormalise = TRUE;
 	}
@@ -1978,13 +2031,10 @@
 	else if (MPLAYER_AUDIO_TO_WAV == type_conv) {
 		conv.BoolIsExtract = TRUE;
 	}
-	else if (A52DEC_AC3_TO_WAV == type_conv) {
-		conv.BoolIsa52dec = TRUE;
-	}
 	else {
 		conv.BoolIsConvert = TRUE;
 	}
-	
+
 	// INFORMATION
 	if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
 		g_print ("!-----------------------------------------------------------!\n");
@@ -1995,12 +2045,12 @@
 		g_print ("! %s\n", info);
 		g_print ("!-----------------------------------------------------------!\n");
 		g_print ("! ");
-		for (pos = 0; conv.ArgConv[ pos ] != NULL; pos ++) {
-			g_print ("%s ", conv.ArgConv[ pos ]);
+		for (pos = 0; p_TabArgs[ pos ] != NULL; pos ++) {
+			g_print ("%s ", p_TabArgs[ pos ]);
 		}
 		g_print ("\n!-----------------------------------------------------------!\n");
-		for (pos = 0; conv.ArgConv[ pos ] != NULL; pos ++) {
-			g_print ("ArgConv[ %02d ] = %s\n", pos, conv.ArgConv[ pos ]);
+		for (pos = 0; p_TabArgs[ pos ] != NULL; pos ++) {
+			g_print ("p_TabArgs[ %02d ] = %s\n", pos, p_TabArgs[ pos ]);
 		}
 		g_print ("\n");
 	}
@@ -2010,33 +2060,33 @@
 		break;
 	case FLAC_FLAC_TO_WAV :
 	case FLAC_WAV_TO_FLAC :
-		RetBool = conv_with_flac_ARGS (conv.ArgConv);
+		RetBool = conv_with_flac_ARGS( p_TabArgs );
 		break;
 	case LAME_WAV_TO_MP3 :
 	case LAME_FLAC_TO_MP3 :
-		conv_with_lame_ARGS (conv.ArgConv);
+		conv_with_lame_ARGS( p_TabArgs );
 		break;
 	case OGGENC_WAV_TO_OGG :
 	case OGGENC_FLAC_TO_OGG :
-		conv_with_oggenc_ARGS (conv.ArgConv);
+		conv_with_oggenc_ARGS( p_TabArgs );
 		break;
 	case OGG123_OGG_TO_WAV :
-		conv_with_ogg123_ARGS (conv.ArgConv);
+		conv_with_ogg123_ARGS( p_TabArgs );
 		break;
 	case MPG321_MP3_TO_WAV :
-		conv_with_mpg321_ARGS (conv.ArgConv);
+		conv_with_mpg321_ARGS( p_TabArgs );
 		break;
 	case SOX_WAV_TO_WAV :
-		conv_with_sox_ARGS (conv.ArgConv);
+		conv_with_sox_ARGS( p_TabArgs );
 		break;
 	case SHORTEN_SHN_TO_WAV :
-		conv_with_shorten_ARGS (conv.ArgConv);
+		conv_with_shorten_ARGS( p_TabArgs );
 		break;
 	case FAAD_M4A_TO_WAV :
-		conv_with_faad_ARGS (conv.ArgConv);
+		conv_with_faad_ARGS( p_TabArgs );
 		break;
 	case FAAC_WAV_TO_M4A :
-		conv_with_faac_ARGS (conv.ArgConv);
+		conv_with_faac_ARGS( p_TabArgs );
 		break;
 	case MPLAYER_WMA_TO_WAV :
 	case MPLAYER_RM_TO_WAV :
@@ -2047,83 +2097,83 @@
 	case MPLAYER_M4A_TO_WAV :
 	case MPLAYER_OGG_TO_WAV :
 	case MPLAYER_MP3_TO_WAV :
-		RetBool = conv_with_mplayer_ARGS (conv.ArgConv, type_conv);
+	case MPLAYER_MPC_TO_WAV :
+		RetBool = conv_with_mplayer_ARGS( p_TabArgs, type_conv );
 		break;
 	case COPY_FILE :
 		break;
 	case NORMALISE_CALCUL :
 	case NORMALISE_APPLIQUE :
 	case NORMALISE_EXEC :
-		conv_with_normalise_ARGS (conv.ArgConv);
+		conv_with_normalise_ARGS( p_TabArgs );
 		break;
 	case NORMALISE_GET_LEVEL:
-		conv_with_normalise_get_PEAK_RMS_GROUP_ARGS (conv.ArgConv);
+		conv_with_normalise_get_PEAK_RMS_GROUP_ARGS( p_TabArgs );
 		break;
 	case MPPDEC_MPC_TO_WAV :
-		conv_with_mppdec_ARGS (conv.ArgConv);
+		conv_with_mppdec_ARGS( p_TabArgs );
 		break;
 	case MPPENC_WAV_TO_MPC :
-		conv_with_mppenc_ARGS (conv.ArgConv);
+		conv_with_mppenc_ARGS( p_TabArgs );
 		break;
 	case MAC_APE_TO_WAV :
 	case MAC_WAV_TO_APE :
-		conv_with_mac_ARGS (conv.ArgConv);
+		conv_with_mac_ARGS( p_TabArgs );
 		break;
 	case WAVPACK_WAV_TO_WAVPACK :
-		conv_with_wavpack_ARGS (conv.ArgConv);
+		conv_with_wavpack_ARGS( p_TabArgs );
 		break;
 	case WVUNPACK_WAVPACK_TO_WAV :
-		conv_with_wvunpack_ARGS (conv.ArgConv);
+		conv_with_wvunpack_ARGS( p_TabArgs );
 		break;
-	
+
 	case CDPARANOIA_CD_TO_WAV :
 	case CDPARANOIA_CD_TO_WAV_EXPERT :
 	case CDPARANOIA_CD_TO_WAV_EXPERT_SEGMENT :
 	case CDDA2WAV_CD_TO_WAV :
 		break;
-	
+
 	case REPLAYGAIN :
-		conv_with_replaygain_ARGS (conv.ArgConv);
+		conv_with_replaygain_ARGS( p_TabArgs );
 		break;
 	case LSDVD :
-		conv_with_lsdvd_ARGS (conv.ArgConv);
+		conv_with_lsdvd_ARGS( p_TabArgs );
 		break;
 	case SPLIT :
-		conv_with_split_ARGS (conv.ArgConv);
+		conv_with_split_ARGS( p_TabArgs );
 		break;
 	case CDDB_TOOL :
-		conv_with_cddb_tool_ARGS (conv.ArgConv);
+		conv_with_cddb_tool_ARGS( p_TabArgs );
 		break;
-	
+
 	case ICEDAX :
-		RetBool = conv_with_icedax_tool_ARGS (conv.ArgConv);
+		RetBool = conv_with_icedax_tool_ARGS( p_TabArgs );
 		break;
 
 	case AACPLUSENC_WAV_TO_AAC :
-		conv_with_aacplusenc_ARGS (conv.ArgConv);
+		conv_with_aacplusenc_ARGS( p_TabArgs );
 		break;
-		
+
 	case WAVSPLIT_EXTRACT :
-		conv_with_wavsplit_ARGS (conv.ArgConv);
+		conv_with_wavsplit_ARGS( p_TabArgs );
 		break;
-	
+
 	case A52DEC_AC3_TO_WAV :
-		conv_with_a52dec_ARGS (conv.ArgConv);
+		conv_with_a52dec_ARGS( p_TabArgs );
 		break;
 	}
-	
+
 	conv_inc_encode_completed ();
-	
+
 	conv.BoolIsConvert = FALSE;
 	conv.BoolIsNormalise = FALSE;
 	conv.BoolIsReplaygain = FALSE;
 	if (MPLAYER_AUDIO_TO_WAV == type_conv) 	conv.BoolIsExtract = FALSE;
-	conv.BoolIsa52dec = FALSE;
 
 	return (RetBool);
 }
-// 
-// 
+//
+//
 void conv_with_cdparanoia_ARGS (gchar **args)
 {
 	gint pos = 0;
@@ -2151,11 +2201,11 @@
 				pos --;
 			}
 			size = read(fd, &buf[pos], 1);
-			
+
 		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
 		pos ++;
 		buf[ pos ] = '\0';
-		
+
 		// SI LA FONCTION EST NON NULLE
 		if (NULL != conv.Func_request_stop) {
 			// SI DEMANDE DE STOP EST VALIDE
@@ -2175,7 +2225,7 @@
 			sscanf(buf, "##: %d %s @ %d", &code, type, &sector);
 			sector /= 1176;
 			if (strncmp("[wrote]", type, 7) == 0) {
-				
+
 				conv.extract_percent = (double)(sector-start) / (end-start);
 				if (conv.extract_percent >= CONV_MAX_VALUE_PERCENT) conv.extract_percent = 1.;
 				conv.total_percent = ((double)conv.rip_completed +
@@ -2192,8 +2242,8 @@
 	conv.code_fork_extract = -1;
 	conv.extract_percent = 0.0;
 }
-// 
-// 
+//
+//
 void conv_with_cdparanoia_mode_expert_ARGS (gchar **args)
 {
 	gint pos = 0;
@@ -2223,11 +2273,11 @@
 				pos --;
 			}
 			size = read(fd, &buf[pos], 1);
-			
+
 		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
 		pos ++;
 		buf[ pos ] = '\0';
-		
+
 		// SI LA FONCTION EST NON NULLE
 		if (NULL != conv.Func_request_stop) {
 			// SI DEMANDE DE STOP EST VALIDE
@@ -2249,9 +2299,9 @@
 			sector /= 1176;
 			if (strncmp("[wrote]", type, 7) == 0) {
 				conv.extract_percent = (double)(sector-start) / (end-start);
-				
+
 				if (conv.extract_percent >= CONV_MAX_VALUE_PERCENT) conv.extract_percent = 1.000000;
-				
+
 				conv.total_percent = (conv.rip_completed +
 							conv.encode_completed +
 							conv.extract_percent +
@@ -2268,8 +2318,8 @@
 	conv.code_fork_extract = -1;
 	conv.extract_percent = 0.0;
 }
-// 
-// 
+//
+//
 void conv_with_cdda2wav_ARGS (gchar **args)
 {
 	gint pos = 0;
@@ -2298,7 +2348,7 @@
 				pos --;
 			}
 			size = read(fd, &buf[pos], 1);
-			
+
 		} while (((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n')) && (size > 0));
 		if (buf[ pos ] != '\n') {
 			pos ++;
@@ -2306,7 +2356,7 @@
 		}
 		pos ++;
 		buf[ pos ] = '\0';
-		
+
 		// SI LA FONCTION EST NON NULLE
 		if (NULL != conv.Func_request_stop) {
 			// SI DEMANDE DE STOP EST VALIDE
@@ -2332,24 +2382,24 @@
 					(double)conv.conversion_percent) /
 					((double)conv.total_rip + (double)conv.total_convert);
 		conv.bool_percent_extract = TRUE;
-		
+
 	} while (FALSE == conv.bool_stop && size != 0);
 
 	close(fd);
 	conv.code_fork_extract = -1;
 	conv.extract_percent = 0.0;
 }
-// 
-// 
+//
+//
 gboolean conv_exec_extract (gboolean WithParameter, TYPE_CONV type_conv, gchar *info)
 {
 	gint pos = 0;
 	gboolean RetBool = TRUE;
-	
+
 	// PRINT_FUNC_LF();
 
 	conv.BoolIsExtract = TRUE;
-		
+
 	/* Infos */
 	if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
 		g_print ("!-----------------------------------------------------------!\n");
@@ -2359,6 +2409,11 @@
 		g_print ("! --Without Expert Parameters--\n");
 		g_print ("! %s\n", info);
 		g_print ("!-----------------------------------------------------------!\n");
+		g_print ("! ");
+		for (pos = 0; conv.ArgExtract[ pos ] != NULL; pos ++) {
+			g_print ("%s ", conv.ArgExtract[ pos ]);
+		}
+		g_print ("\n!-----------------------------------------------------------!\n");
 
 		for (pos = 0; conv.ArgExtract[ pos ] != NULL; pos ++) {
 			g_print ("ArgExtract[ %02d ] = %s\n", pos, conv.ArgExtract[ pos ]);
@@ -2371,16 +2426,16 @@
 		conv_with_cdparanoia_mode_expert_ARGS (conv.ArgExtract);
 	else if (type_conv == CDDA2WAV_CD_TO_WAV)
 		conv_with_cdda2wav_ARGS (conv.ArgExtract);
-	
+
 	conv_inc_rip_completed ();
 	conv.BoolIsExtract = FALSE;
-	
+
 	return (RetBool);
 }
-// 
+//
 // Algo retravaille depuis:
 //	C EN ACTION - 2 ieme Edition - Yves Mettier
-// 
+//
 gboolean conv_copy_src_to_dest (gchar *filesrc, gchar *filedest)
 {
 	FILE	*fn = NULL;
@@ -2390,8 +2445,8 @@
 	gulong	blk;
 	gulong	cpt;
 	size_t	l_read;
-	
-	
+
+
 	if (0 == size) {
 		fprintf (stderr, "La taille de : %s est NULLE !!!\n", filesrc);
 		conv_inc_encode_completed ();
@@ -2408,7 +2463,7 @@
 		conv_inc_encode_completed ();
 		return (FALSE);
 	}
-	
+
 	conv.conversion_percent = 0.;
 	blk = size / BUFSIZ;
 	// conv.conversion_percent = 0.;
@@ -2418,7 +2473,7 @@
 	cpt = 0;
 	conv.BoolIsCopy = TRUE;
 	while ( ! feof (fe)) {
-		
+
 		l_read = fread (buf, sizeof (*buf), BUFSIZ, fe);
 		if (ferror (fe)) {
 			fprintf (stderr, "Erreur de lecture\n");
@@ -2456,7 +2511,7 @@
 	conv.BoolIsCopy = FALSE;
 	if( TRUE == OptionsCommandLine.BoolVerboseMode )
 		g_print ("\tOK\n");
-	
+
 	return (TRUE);
 }

xcfa-4.2.8.tar.gz/src/conv.h -> xcfa-5.0.2.tar.gz/src/conv.h Changed

@@ -1,9 +1,9 @@
 /*
 * file : conv.h
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -33,55 +33,56 @@
 #include <signal.h>
 
 typedef enum {
-	_EXTRACT_ = 0,					// 
-	_CONV_						// 
+	_EXTRACT_ = 0,									// 
+	_CONV_											// 
 } TYPE_OPER;
 
-typedef enum {						// Les types de conversions possibles
-	NONE_CONV = 0,					// 
-	FLAC_FLAC_TO_WAV,				// 
-	FLAC_WAV_TO_FLAC,				// 
-	LAME_WAV_TO_MP3,				// 
-	LAME_FLAC_TO_MP3,				// 
-	OGGENC_WAV_TO_OGG,				// 
-	OGGENC_FLAC_TO_OGG,				// 
-	OGG123_OGG_TO_WAV,				// 
-	MPG321_MP3_TO_WAV,				// 
-	SOX_WAV_TO_WAV,					// 
-	SHORTEN_SHN_TO_WAV,				// 
-	FAAD_M4A_TO_WAV,				// 
-	FAAC_WAV_TO_M4A,				// 
-	MPLAYER_WAV_TO_WAV,				// 
-	MPLAYER_WMA_TO_WAV,				// 
-	MPLAYER_AUDIO_TO_WAV,				// 
-	MPLAYER_M4A_TO_WAV,				// 
-	MPLAYER_OGG_TO_WAV,				// 
-	MPLAYER_MP3_TO_WAV,				// 
-	MPLAYER_RM_TO_WAV,				// 
-	MPLAYER_DTS_TO_WAV,				// 
-	MPLAYER_AIFF_TO_WAV,				// 
-	COPY_FILE,					// 
-	NORMALISE_CALCUL,				// 
-	NORMALISE_APPLIQUE,				// 
-	NORMALISE_EXEC,					// 
-	NORMALISE_GET_LEVEL,				// 
-	MPPDEC_MPC_TO_WAV,				// 
-	MPPENC_WAV_TO_MPC,				// 
-	MAC_APE_TO_WAV,					// 
-	MAC_WAV_TO_APE,					// 
-	WAVPACK_WAV_TO_WAVPACK,				// 
-	WVUNPACK_WAVPACK_TO_WAV,			// 
-	CDPARANOIA_CD_TO_WAV,				// 
-	CDPARANOIA_CD_TO_WAV_EXPERT,			// 
-	CDPARANOIA_CD_TO_WAV_EXPERT_SEGMENT,		// 
-	CDDA2WAV_CD_TO_WAV,				// 
-	REPLAYGAIN,					// 
-	LSDVD,						// 
-	SPLIT,						// 
-	CDDB_TOOL,					// 
-	ICEDAX,						// 
-	AACPLUSENC_WAV_TO_AAC,				// 
-	WAVSPLIT_EXTRACT,				// 
+typedef enum {										// Les types de conversions possibles
+	NONE_CONV = 0,									// 
+	FLAC_FLAC_TO_WAV,								// 
+	FLAC_WAV_TO_FLAC,								// 
+	LAME_WAV_TO_MP3,								// 
+	LAME_FLAC_TO_MP3,								// 
+	OGGENC_WAV_TO_OGG,								// 
+	OGGENC_FLAC_TO_OGG,								// 
+	OGG123_OGG_TO_WAV,								// 
+	MPG321_MP3_TO_WAV,								// 
+	SOX_WAV_TO_WAV,									// 
+	SHORTEN_SHN_TO_WAV,								// 
+	FAAD_M4A_TO_WAV,								// 
+	FAAC_WAV_TO_M4A,								// 
+	MPLAYER_WAV_TO_WAV,								// 
+	MPLAYER_WMA_TO_WAV,								// 
+	MPLAYER_AUDIO_TO_WAV,							// 
+	MPLAYER_M4A_TO_WAV,								// 
+	MPLAYER_OGG_TO_WAV,								// 
+	MPLAYER_MP3_TO_WAV,								// 
+	MPLAYER_MPC_TO_WAV,								// 
+	MPLAYER_RM_TO_WAV,								// 
+	MPLAYER_DTS_TO_WAV,								// 
+	MPLAYER_AIFF_TO_WAV,							// 
+	COPY_FILE,										// 
+	NORMALISE_CALCUL,								// 
+	NORMALISE_APPLIQUE,								// 
+	NORMALISE_EXEC,									// 
+	NORMALISE_GET_LEVEL,							// 
+	MPPDEC_MPC_TO_WAV,								// 
+	MPPENC_WAV_TO_MPC,								// 
+	MAC_APE_TO_WAV,									// 
+	MAC_WAV_TO_APE,									// 
+	WAVPACK_WAV_TO_WAVPACK,							// 
+	WVUNPACK_WAVPACK_TO_WAV,						// 
+	CDPARANOIA_CD_TO_WAV,							// 
+	CDPARANOIA_CD_TO_WAV_EXPERT,					// 
+	CDPARANOIA_CD_TO_WAV_EXPERT_SEGMENT,			// 
+	CDDA2WAV_CD_TO_WAV,								// 
+	REPLAYGAIN,										// 
+	LSDVD,											// 
+	SPLIT,											// 
+	CDDB_TOOL,										// 
+	ICEDAX,											// 
+	AACPLUSENC_WAV_TO_AAC,							// 
+	WAVSPLIT_EXTRACT,								// 
 	A52DEC_AC3_TO_WAV
 	
 } TYPE_CONV;
@@ -89,76 +90,80 @@
 #define	MAX_ARG_CONV 200
 
 typedef struct {
-	gboolean	BoolIsExtract;			// 
-	gboolean	BoolIsConvert;			// 
-	gboolean	BoolIsCopy;			// 
-	gboolean	BoolIsNormalise;		// 
-	gboolean	BoolIsReplaygain;		// 
-	gboolean	BoolIsa52dec;			// 
+	gboolean	BoolIsExtract;						// 
+	gboolean	BoolIsConvert;						// 
+	gboolean	BoolIsCopy;							// 
+	gboolean	BoolIsNormalise;					// 
+	gboolean	BoolIsReplaygain;					// 
+	gboolean	BoolIsa52dec;						// 
 	
-	GtkWidget	*Adr_label_info_wind;		// Adresse label information
-	GtkWidget	*Adr_label_extract;		// Adresse label extraction
-	GtkWidget	*Adr_progressbar_extract;	// Adresse Progressbar extraction
-	GtkWidget	*Adr_label_conversion;		// Adresse label conversion
-	GtkWidget	*Adr_progressbar_conversion;	// Adresse Progressbar conversion
-	GtkWidget	*Adr_label_total;		// Adresse label total
-	GtkWidget	*Adr_progressbar_total;		// Adresse Progressbar total
+	GtkWidget	*Adr_label_info_wind;				// Adresse label information
+	GtkWidget	*Adr_label_extract;					// Adresse label extraction
+	GtkWidget	*Adr_progressbar_extract;			// Adresse Progressbar extraction
+	GtkWidget	*Adr_label_conversion;				// Adresse label conversion
+	GtkWidget	*Adr_progressbar_conversion;		// Adresse Progressbar conversion
+	GtkWidget	*Adr_label_total;					// Adresse label total
+	GtkWidget	*Adr_progressbar_total;				// Adresse Progressbar total
 	
-	double		extract_percent;		// Pourcentage actuel de progession
-	gint		total_rip;			// Nombre total de fichiers a extraires
-	gint		rip_completed;			// Nombre de fichiers extraits
+	double		extract_percent;					// Pourcentage actuel de progession
+	gint		total_rip;							// Nombre total de fichiers a extraires
+	gint		rip_completed;						// Nombre de fichiers extraits
 
-	double		conversion_percent;		// Pourcentage actuel de progession
-	gdouble		TimeMplayer;			// Pourcentage actuel de progession en temps
+	double		conversion_percent;					// Pourcentage actuel de progession
+	gdouble		TimeMplayer;						// Pourcentage actuel de progession en temps
 
-	gint		total_convert;			// Nombre total de fichiers a convertir
-	gint		encode_completed;		// Nombre de fichiers convertis
-	double		total_percent;			// Pourcentage TOTAL actuel de progession
+	gint		total_convert;						// Nombre total de fichiers a convertir
+	gint		encode_completed;					// Nombre de fichiers convertis
+	double		total_percent;						// Pourcentage TOTAL actuel de progession
 
-	gboolean	BoolPutTextview;		// 
-	GList		*ListPutTextview;		// 
+	gboolean	BoolPutTextview;					// 
+	GList		*ListPutTextview;					// 
 	
-	gboolean	bool_percent_conv;		// TRUE : print(conversion_percent, total_percent)
-	gboolean	bool_percent_extract;		// TRUE : print(conversion_percent, total_percent)
+	gboolean	bool_percent_conv;					// TRUE : print(conversion_percent, total_percent)
+	gboolean	bool_percent_extract;				// TRUE : print(conversion_percent, total_percent)
 		
-	gboolean	bool_stop;			// TRUE : stop thread and timeout
+	gboolean	bool_stop;							// TRUE : stop thread and timeout
 
-	gchar		*TmpRep;			// Le repertoire temporaire d'extractions/conversions
+	gchar		*TmpRep;							// Le repertoire temporaire d'extractions/conversions
 
-	pid_t		code_fork_conv;			// Num Code Fork
-	pid_t		code_fork_extract;		// Num Code Fork
+	pid_t		code_fork_conv;						// Num Code Fork
+	pid_t		code_fork_extract;					// Num Code Fork
 
-	guint		handler_timeout_conv;		// Numerate timeout
-	gboolean	bool_thread_conv;		// TRUE : thread in
-	gboolean	bool_thread_extract;		// TRUE : thread in
+	guint		handler_timeout_conv;				// Numerate timeout
+	gboolean	bool_thread_conv;					// TRUE : thread in
+	gboolean	bool_thread_extract;				// TRUE : thread in
 
-	int		signal_numchildren_conv;	// the signal handler
-	int		signal_numchildren_extract;	// the signal handler
-	int		tube_conv [ 2 ];		// for pipe
-	int		tube_extract [ 2 ];		// for pipe
+	int		signal_numchildren_conv;				// the signal handler
+	int		signal_numchildren_extract;				// the signal handler
+	int		tube_conv [ 2 ];						// for pipe
+	int		tube_extract [ 2 ];						// for pipe
 	
-	gboolean	Bool_MAJ_select;		// TRUE
+	gboolean	Bool_MAJ_select;					// TRUE
 
-	gchar		*ArgConv [ MAX_ARG_CONV + 20 ];		// 
 	gchar		*ArgExtract [ MAX_ARG_CONV + 20 ];	// 
 	
-	double		value_PEAK_RMS_GROUP_ARGS;	// 
+	double		value_PEAK_RMS_GROUP_ARGS;			// 
 	
-	gboolean	(*Func_request_stop) (void);	// 
+	gboolean	(*Func_request_stop) (void);		// 
 
 } CONV;
 
 extern CONV conv;
 
-void conv_inc_rip_completed (void);
-void conv_inc_encode_completed (void);
-void conv_stop_conversion (void);
-void	 conv_reset_struct (void *p_func);
-gboolean conv_to_convert (gboolean WithParameter, TYPE_CONV type_conv, gchar *info);
-gboolean conv_exec_extract (gboolean WithParameter, TYPE_CONV type_conv, gchar *info);
-gboolean conv_copy_src_to_dest (gchar *filesrc, gchar *filedest);
-void	 conv_with_sox_get_param (gchar *filesrc, gchar *filedest, gchar *frequence, gchar *voie, gchar *bits);
-void	 conv_with_sox_float_get_param (gchar *filesrc, gchar *filedest);
+void		conv_inc_rip_completed (void);
+void		conv_inc_encode_completed (void);
+void		conv_stop_conversion (void);
+void		conv_reset_struct (void *p_func);
+
+gboolean	conv_to_convert( gchar **p_TabArgs, gboolean WithParameter, TYPE_CONV type_conv, gchar *info );
+
+gboolean 	conv_exec_extract (gboolean WithParameter, TYPE_CONV type_conv, gchar *info);
+gboolean 	conv_copy_src_to_dest (gchar *filesrc, gchar *filedest);
+gchar 		**conv_with_sox_get_param (gchar *filesrc, gchar *filedest, gchar *frequence, gchar *voie, gchar *bits);
+gchar		**conv_with_sox_float_get_param (gchar *filesrc, gchar *filedest);
+gchar		**conv_lsdvd_read_get_param( gchar *p_PathDvd );
+gchar		**conv_RemoveTab( gchar **p_PtrTabArgs );
+gchar		**conv_AllocTabArgs( gint *p_tab );
 
 #endif

xcfa-4.2.8.tar.gz/src/cursor.c -> xcfa-5.0.2.tar.gz/src/cursor.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : cursor.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <glib.h>
 #include <glib/gprintf.h>
@@ -62,8 +57,9 @@
 {
 	if (cursor_type != GDK_HAND2) {
 		cursor_type = GDK_HAND2;
-		_cursor = gdk_cursor_new (cursor_type);
-		gdk_window_set_cursor (GDK_WINDOW(WindMain->window), _cursor);
+		// _cursor = gdk_cursor_new (cursor_type);
+		_cursor = gdk_cursor_new_for_display( gdk_display_get_default(), cursor_type );
+		gdk_window_set_cursor (gtk_widget_get_window(WindMain), _cursor);
 		gdk_flush ();
 	}
 }
@@ -73,8 +69,9 @@
 {
 	if (cursor_type != GDK_HAND2) {
 		cursor_type = GDK_HAND2;
-		_cursor = gdk_cursor_new (cursor_type);
-		gdk_window_set_cursor (GDK_WINDOW(WindMain->window), _cursor);
+		// _cursor = gdk_cursor_new (cursor_type);
+		_cursor = gdk_cursor_new_for_display( gdk_display_get_default(), cursor_type );
+		gdk_window_set_cursor (gtk_widget_get_window(WindMain), _cursor);
 		gdk_flush ();
 	}
 }
@@ -84,8 +81,9 @@
 {
 	if (cursor_type != GDK_XTERM) {
 		cursor_type = GDK_XTERM;
-		_cursor = gdk_cursor_new (cursor_type);
-		gdk_window_set_cursor (GDK_WINDOW(WindMain->window), _cursor);
+		// _cursor = gdk_cursor_new (cursor_type);
+		_cursor = gdk_cursor_new_for_display( gdk_display_get_default(), cursor_type );
+		gdk_window_set_cursor (gtk_widget_get_window(WindMain), _cursor);
 		gdk_flush ();
 	}
 }
@@ -95,8 +93,9 @@
 {
 	if (cursor_type != GDK_SB_H_DOUBLE_ARROW) {
 		cursor_type = GDK_SB_H_DOUBLE_ARROW;
-		_cursor = gdk_cursor_new (cursor_type);
-		gdk_window_set_cursor (GDK_WINDOW(WindMain->window), _cursor);
+		// _cursor = gdk_cursor_new (cursor_type);
+		_cursor = gdk_cursor_new_for_display( gdk_display_get_default(), cursor_type );
+		gdk_window_set_cursor (gtk_widget_get_window(WindMain), _cursor);
 		gdk_flush ();
 	}
 }
@@ -106,8 +105,9 @@
 {
 	if (cursor_type != GDK_TOP_SIDE) {
 		cursor_type = GDK_TOP_SIDE;
-		_cursor = gdk_cursor_new (cursor_type);
-		gdk_window_set_cursor (GDK_WINDOW(WindMain->window), _cursor);
+		// _cursor = gdk_cursor_new (cursor_type);
+		_cursor = gdk_cursor_new_for_display( gdk_display_get_default(), cursor_type );
+		gdk_window_set_cursor (gtk_widget_get_window(WindMain), _cursor);
 		gdk_flush ();
 	}
 }
@@ -117,8 +117,9 @@
 {
 	if (cursor_type != GDK_BOTTOM_SIDE) {
 		cursor_type = GDK_BOTTOM_SIDE;
-		_cursor = gdk_cursor_new (cursor_type);
-		gdk_window_set_cursor (GDK_WINDOW(WindMain->window), _cursor);
+		// _cursor = gdk_cursor_new (cursor_type);
+		_cursor = gdk_cursor_new_for_display( gdk_display_get_default(), cursor_type );
+		gdk_window_set_cursor (gtk_widget_get_window(WindMain), _cursor);
 		gdk_flush ();
 	}
 }
@@ -128,8 +129,9 @@
 {
 	if (cursor_type != GDK_LEFT_SIDE) {
 		cursor_type = GDK_LEFT_SIDE;
-		_cursor = gdk_cursor_new (cursor_type);
-		gdk_window_set_cursor (GDK_WINDOW(WindMain->window), _cursor);
+		// _cursor = gdk_cursor_new (cursor_type);
+		_cursor = gdk_cursor_new_for_display( gdk_display_get_default(), cursor_type );
+		gdk_window_set_cursor (gtk_widget_get_window(WindMain), _cursor);
 		gdk_flush ();
 	}
 }
@@ -139,8 +141,9 @@
 {
 	if (cursor_type != GDK_RIGHT_SIDE) {
 		cursor_type = GDK_RIGHT_SIDE;
-		_cursor = gdk_cursor_new (cursor_type);
-		gdk_window_set_cursor (GDK_WINDOW(WindMain->window), _cursor);
+		// _cursor = gdk_cursor_new (cursor_type);
+		_cursor = gdk_cursor_new_for_display( gdk_display_get_default(), cursor_type );
+		gdk_window_set_cursor (gtk_widget_get_window(WindMain), _cursor);
 		gdk_flush ();
 	}
 }
@@ -150,8 +153,9 @@
 {
 	if (cursor_type != GDK_TOP_LEFT_CORNER) {
 		cursor_type = GDK_TOP_LEFT_CORNER;
-		_cursor = gdk_cursor_new (cursor_type);
-		gdk_window_set_cursor (GDK_WINDOW(WindMain->window), _cursor);
+		// _cursor = gdk_cursor_new (cursor_type);
+		_cursor = gdk_cursor_new_for_display( gdk_display_get_default(), cursor_type );
+		gdk_window_set_cursor (gtk_widget_get_window(WindMain), _cursor);
 		gdk_flush ();
 	}
 }
@@ -161,8 +165,9 @@
 {
 	if (cursor_type != GDK_TOP_RIGHT_CORNER) {
 		cursor_type = GDK_TOP_RIGHT_CORNER;
-		_cursor = gdk_cursor_new (cursor_type);
-		gdk_window_set_cursor (GDK_WINDOW(WindMain->window), _cursor);
+		// _cursor = gdk_cursor_new (cursor_type);
+		_cursor = gdk_cursor_new_for_display( gdk_display_get_default(), cursor_type );
+		gdk_window_set_cursor (gtk_widget_get_window(WindMain), _cursor);
 		gdk_flush ();
 	}
 }
@@ -172,8 +177,9 @@
 {
 	if (cursor_type != GDK_BOTTOM_LEFT_CORNER) {
 		cursor_type = GDK_BOTTOM_LEFT_CORNER;
-		_cursor = gdk_cursor_new (cursor_type);
-		gdk_window_set_cursor (GDK_WINDOW(WindMain->window), _cursor);
+		// _cursor = gdk_cursor_new (cursor_type);
+		_cursor = gdk_cursor_new_for_display( gdk_display_get_default(), cursor_type );
+		gdk_window_set_cursor (gtk_widget_get_window(WindMain), _cursor);
 		gdk_flush ();
 	}
 }
@@ -183,8 +189,9 @@
 {
 	if (cursor_type != GDK_BOTTOM_RIGHT_CORNER) {
 		cursor_type = GDK_BOTTOM_RIGHT_CORNER;
-		_cursor = gdk_cursor_new (cursor_type);
-		gdk_window_set_cursor (GDK_WINDOW(WindMain->window), _cursor);
+		// _cursor = gdk_cursor_new (cursor_type);
+		_cursor = gdk_cursor_new_for_display( gdk_display_get_default(), cursor_type );
+		gdk_window_set_cursor (gtk_widget_get_window(WindMain), _cursor);
 		gdk_flush ();
 	}
 }
@@ -194,8 +201,9 @@
 {
 	if (cursor_type != GDK_FLEUR) {
 		cursor_type = GDK_FLEUR;
-		_cursor = gdk_cursor_new (cursor_type);
-		gdk_window_set_cursor (GDK_WINDOW(WindMain->window), _cursor);
+		// _cursor = gdk_cursor_new (cursor_type);
+		_cursor = gdk_cursor_new_for_display( gdk_display_get_default(), cursor_type );
+		gdk_window_set_cursor (gtk_widget_get_window(WindMain), _cursor);
 		gdk_flush ();
 	}
 }
@@ -205,8 +213,9 @@
 {
 	if (cursor_type != GDK_LEFT_PTR) {
 		cursor_type = GDK_LEFT_PTR;
-		_cursor = gdk_cursor_new (cursor_type);
-		gdk_window_set_cursor (GDK_WINDOW(WindMain->window), _cursor);
+		// _cursor = gdk_cursor_new (cursor_type);
+		_cursor = gdk_cursor_new_for_display( gdk_display_get_default(), cursor_type );
+		gdk_window_set_cursor (gtk_widget_get_window(WindMain), _cursor);
 		gdk_flush ();
 	}
 }
@@ -216,8 +225,9 @@
 {
 	if (cursor_type != GDK_WATCH) {
 		cursor_type = GDK_WATCH;
-		_cursor = gdk_cursor_new (cursor_type);
-		gdk_window_set_cursor (GDK_WINDOW(WindMain->window), _cursor);
+		// _cursor = gdk_cursor_new (cursor_type);
+		_cursor = gdk_cursor_new_for_display( gdk_display_get_default(), cursor_type );
+		gdk_window_set_cursor (gtk_widget_get_window(WindMain), _cursor);
 		gdk_flush ();
 	}
 }
@@ -228,3 +238,35 @@
 	return (cursor_type == GDK_WATCH ? TRUE : FALSE);
 }
 
+
+
+/*
+cursor.c:214:3: attention : ‘gdk_cursor_new’ is deprecated (declared at /usr/include/gtk-3.0/gdk/gdkcursor.h:223) [-Wdeprecated-declarations]
+
+
+http://cpansearch.perl.org/src/KRYDE/Gtk2-Ex-WidgetCursor-15/devel/invisible-blank.c
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <gtk/gtk.h>
+
+int
+main (int argc, char **argv)
+{
+ GdkDisplay *display;
+ GdkCursor *cursor;
+
+ gtk_init (&argc, &argv);
+ display = gdk_display_get_default();
+
+ cursor = gdk_cursor_new_for_display (display, GDK_BLANK_CURSOR);
+ printf ("%p\n", cursor);
+
+ cursor = gdk_cursor_new_for_display (display, GDK_BLANK_CURSOR);
+ printf ("%p\n", cursor);
+
+ return 0;
+}
+
+*/

xcfa-4.2.8.tar.gz/src/cursor.h -> xcfa-5.0.2.tar.gz/src/cursor.h Changed

xcfa-4.2.8.tar.gz/src/dragNdrop.c -> xcfa-5.0.2.tar.gz/src/dragNdrop.c Changed

xcfa-4.2.8.tar.gz/src/dragNdrop.h -> xcfa-5.0.2.tar.gz/src/dragNdrop.h Changed

xcfa-4.2.8.tar.gz/src/dvd.c -> xcfa-5.0.2.tar.gz/src/dvd.c Changed

@@ -1,25 +1,25 @@
 /*
 * file : dvd.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
 *
 * This file is part of XCFA.
- * 
+ *
 * XCFA is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * at your option) any later version.
- * 
+ *
 * XCFA is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with XCFA. If not, see <http://www.gnu.org/licenses/>.
 */
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <stdio.h>
@@ -77,9 +72,9 @@
 	DVD_TIME_COLUMN,
 	DVD_CHANNELS_COLUMN,
 	DVD_PIXBUF_CHOICE_COLUMN,
-	
+
 	DVD_PIXBUF_FILE_NORMALIZE,
-	
+
 	DVD_NAME_COLUMN,
 	DVD_NAME_EDITABLE_COLUMN,
 	DVD_POINTER_STRUCT_COLUMN,
@@ -107,8 +102,8 @@
 
 
 
-// 
-// 
+//
+//
 gboolean dvd_foreach_remove_GtkTree (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer user_data)
 {
 	VAR *var = NULL;
@@ -128,15 +123,15 @@
 	 /* continuer à parcourir l'arbre */
 	return FALSE;
 }
-// 
-// 
+//
+//
 void dvd_remove_GtkTree (void)
 {
 	gtk_tree_model_foreach (GTK_TREE_MODEL(var_dvd.Adr_Tree_Model), dvd_foreach_remove_GtkTree, NULL);
 	gtk_tree_store_clear ((GtkTreeStore *)var_dvd.Adr_Tree_Model);
 }
-// 
-// 
+//
+//
 gchar *dvd_get_channels (VAR *var)
 {
 	/*
@@ -159,30 +154,30 @@
 	}
 	return ("???");
 }
-// 
-// 
+//
+//
 GdkPixbuf *dvd_get_pixbuf_normalise (gboolean EtatNormaliseCd)
 {
 	if (EtatNormaliseCd == FALSE) return (var_dvd.Pixbuf_Coche);
 	return (var_dvd.Pixbuf_Selected);
 }
-// 
-// 
+//
+//
 gchar *dvd_get_name_to_treview (VAR *var)
 {
 	gboolean	BoolIdem = FALSE;
 	gchar		*NameSrc = NULL;
 
 	BoolIdem = (strlen(var->name_file) == strlen(var->StaticNameFile) && 0 == strcmp (var->name_file, var->StaticNameFile)) ? TRUE : FALSE;
-	
+
 	if (TRUE == BoolIdem)
 		NameSrc = g_strdup (var->name_file);
 	else	NameSrc = g_strdup_printf ("%s", var->name_file);
-	
+
 	return ((gchar *)NameSrc);
 }
-// 
-// 
+//
+//
 void dvd_affiche_list (void)
 {
 	GtkTreeIter piter0 = {0,NULL,NULL,NULL};
@@ -203,10 +198,10 @@
 	// COORDONNEES DU SCROLL VERTICAL
 	Adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (var_dvd.Adr_scroll));
 	AdjValue = gtk_adjustment_get_value (Adj);
-	
+
 	// VIDER DE TREEVIEW
 	gtk_tree_store_clear ((GtkTreeStore *)var_dvd.Adr_Tree_Model);
-	
+
 	list = g_list_first (GlistDvd);
 	while (list) {
 		if (NULL != (var = (VAR *)list->data)) {
@@ -221,13 +216,13 @@
 
 				gtk_tree_store_append (model, &piter0, NULL);
 				gtk_tree_store_set (model, &piter0,
-						DVD_TITLE_COLUMN,		str,
+						DVD_TITLE_COLUMN,			str,
 						DVD_PIXBUF_COLUMN_PLAY,		NULL,
-						DVD_TIME_COLUMN,		"",
+						DVD_TIME_COLUMN,			"",
 						DVD_CHANNELS_COLUMN,		"",
 						DVD_PIXBUF_CHOICE_COLUMN,	NULL,
 						DVD_PIXBUF_FILE_NORMALIZE,	NULL,
-						DVD_NAME_COLUMN,		"",
+						DVD_NAME_COLUMN,			"",
 						DVD_NAME_EDITABLE_COLUMN,	FALSE,
 						DVD_POINTER_STRUCT_COLUMN,	var,
 						-1);
@@ -240,13 +235,13 @@
 
 				gtk_tree_store_append (model, &piter1, &piter0);
 				gtk_tree_store_set (model, &piter1,
-						DVD_TITLE_COLUMN,		str,
+						DVD_TITLE_COLUMN,			str,
 						DVD_PIXBUF_COLUMN_PLAY,		NULL,
-						DVD_TIME_COLUMN,		"",
+						DVD_TIME_COLUMN,			"",
 						DVD_CHANNELS_COLUMN,		"",
 						DVD_PIXBUF_CHOICE_COLUMN,	NULL,
 						DVD_PIXBUF_FILE_NORMALIZE,	NULL,
-						DVD_NAME_COLUMN,		"",
+						DVD_NAME_COLUMN,			"",
 						DVD_NAME_EDITABLE_COLUMN,	FALSE,
 						DVD_POINTER_STRUCT_COLUMN,	var,
 						-1);
@@ -257,18 +252,18 @@
 			case _DVD_DATA_ALL :
 				var->OldChannels = var->NewChannels = (gint)atoi (var->StrNumberChannel);
 
-				NameDest = dvd_get_name_to_treview (var);	
+				NameDest = dvd_get_name_to_treview (var);
 				time = g_strdup_printf ("%s", var->time);
 
 				gtk_tree_store_append (model, &piter4, &piter1);
 				gtk_tree_store_set (model, &piter4,
-						DVD_TITLE_COLUMN,		var->def,
-						DVD_PIXBUF_COLUMN_PLAY,		var_dvd.Pixbuf_FilePlay,
-						DVD_TIME_COLUMN,		time,
+						DVD_TITLE_COLUMN,			var->def,
+						DVD_PIXBUF_COLUMN_PLAY,		var->GUINT_TempsTotal == 0 ? NULL : var_dvd.Pixbuf_FilePlay,
+						DVD_TIME_COLUMN,			time,
 						DVD_CHANNELS_COLUMN,		dvd_get_channels (var),
-						DVD_PIXBUF_CHOICE_COLUMN,	var_dvd.Pixbuf_Coche,
-						DVD_PIXBUF_FILE_NORMALIZE,	var_dvd.Pixbuf_Coche,
-						DVD_NAME_COLUMN,		NameDest,
+						DVD_PIXBUF_CHOICE_COLUMN,	var->GUINT_TempsTotal == 0 ? NULL : var_dvd.Pixbuf_Coche,
+						DVD_PIXBUF_FILE_NORMALIZE,	var->GUINT_TempsTotal == 0 ? NULL : var_dvd.Pixbuf_Coche,
+						DVD_NAME_COLUMN,			var->GUINT_TempsTotal == 0 ? NULL : NameDest,
 						DVD_NAME_EDITABLE_COLUMN,	TRUE,
 						DVD_POINTER_STRUCT_COLUMN,	var,
 						-1);
@@ -282,13 +277,13 @@
 
 				gtk_tree_store_append (model, &piter2, &piter1);
 				gtk_tree_store_set (model, &piter2,
-						DVD_TITLE_COLUMN,		str,
+						DVD_TITLE_COLUMN,			str,
 						DVD_PIXBUF_COLUMN_PLAY,		NULL,
-						DVD_TIME_COLUMN,		"",
+						DVD_TIME_COLUMN,			"",
 						DVD_CHANNELS_COLUMN,		"",
 						DVD_PIXBUF_CHOICE_COLUMN,	NULL,
 						DVD_PIXBUF_FILE_NORMALIZE,	NULL,
-						DVD_NAME_COLUMN,		"",
+						DVD_NAME_COLUMN,			"",
 						DVD_NAME_EDITABLE_COLUMN,	FALSE,
 						DVD_POINTER_STRUCT_COLUMN,	var,
 						-1);
@@ -299,18 +294,18 @@
 			case _DVD_DATA :
 				var->OldChannels = var->NewChannels = (gint)atoi (var->StrNumberChannel);
 
-				NameDest = dvd_get_name_to_treview (var);	
+				NameDest = dvd_get_name_to_treview (var);
 				time = g_strdup_printf ("%s", var->time);
 
 				gtk_tree_store_append (model, &piter3, &piter2);
 				gtk_tree_store_set (model, &piter3,
 						DVD_TITLE_COLUMN,		var->def,
-						DVD_PIXBUF_COLUMN_PLAY,		var_dvd.Pixbuf_FilePlay,
-						DVD_TIME_COLUMN,		time,
+						DVD_PIXBUF_COLUMN_PLAY,		var->GUINT_TempsTotal == 0 ? NULL : var_dvd.Pixbuf_FilePlay,
+						DVD_TIME_COLUMN,			time,
 						DVD_CHANNELS_COLUMN,		dvd_get_channels (var),
-						DVD_PIXBUF_CHOICE_COLUMN,	var_dvd.Pixbuf_Coche,
-						DVD_PIXBUF_FILE_NORMALIZE,	var_dvd.Pixbuf_Coche,
-						DVD_NAME_COLUMN,		NameDest,
+						DVD_PIXBUF_CHOICE_COLUMN,	var->GUINT_TempsTotal == 0 ? NULL : var_dvd.Pixbuf_Coche,
+						DVD_PIXBUF_FILE_NORMALIZE,	var->GUINT_TempsTotal == 0 ? NULL : var_dvd.Pixbuf_Coche,
+						DVD_NAME_COLUMN,			var->GUINT_TempsTotal == 0 ? NULL : NameDest,
 						DVD_NAME_EDITABLE_COLUMN,	TRUE,
 						DVD_POINTER_STRUCT_COLUMN,	var,
 						-1);
@@ -327,43 +322,45 @@
 		/* Liste suivante */
 		list = g_list_next (list);
 	}
-	
+
 	// AJUSTEMENT DU SCROLL VERTICAL
 	gtk_adjustment_set_value (Adj, AdjValue);
 	gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (var_dvd.Adr_scroll), Adj);
 }
-// 
-// 
+//
+//
 gboolean dvd_foreach_normalise (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer user_data)
 {
 	gint	 value = GPOINTER_TO_INT (user_data);
 	VAR	*var = NULL;
 
 	gtk_tree_model_get (model, iter, DVD_POINTER_STRUCT_COLUMN, &var, -1);
-	
+
 	if (var->type_list_dvd == _DVD_DATA_ALL || var->type_list_dvd == _DVD_DATA) {
-		var->EtatNormalise = value;
+		if( var->GUINT_TempsTotal > 0 ) {
+			var->EtatNormalise = value;
 
-		gtk_tree_store_set (
-			GTK_TREE_STORE (model),
-			iter,
-			DVD_PIXBUF_FILE_NORMALIZE,
-			dvd_get_pixbuf_normalise (var->EtatNormalise),
-			-1
-			);
+			gtk_tree_store_set (
+				GTK_TREE_STORE (model),
+				iter,
+				DVD_PIXBUF_FILE_NORMALIZE,
+				dvd_get_pixbuf_normalise (var->EtatNormalise),
+				-1
+				);
+		}
 	}
-	
+
 	/* continuer à parcourir l'arbre */
 	return FALSE;
 }
-// 
-// 
+//
+//
 void dvd_set_flag_normalise (gboolean EtatNormalise)
 {
 	gtk_tree_model_foreach (GTK_TREE_MODEL(var_dvd.Adr_Tree_Model), dvd_foreach_normalise, (gpointer)(glong)EtatNormalise);
 }
-// 
-// 
+//
+//
 gboolean dvd_foreach_func_if (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer user_data)
 {
 	VAR *var = NULL;
@@ -387,23 +384,23 @@
 	/* continuer à parcourir l'arbre */
 	return FALSE;
 }
-// 
-// 
+//
+//
 gboolean dvd_foreach_is_norm_selected (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer user_data)
 {
 	VAR	*var = NULL;
 
 	gtk_tree_model_get (model, iter, DVD_POINTER_STRUCT_COLUMN, &var, -1);
-	
+
 	if (var->type_list_dvd == _DVD_DATA_ALL || var->type_list_dvd == _DVD_DATA) {
-		
+
 		if (var->EtatNormalise == TRUE) var_dvd.BoolNormIsSelected = TRUE;
 	}
-	
+
 	return FALSE;
 }
-// 
-// 
+//
+//
 gboolean dvd_get_is_norm_selected (void)
 {
 	var_dvd.BoolNormIsSelected = FALSE;
@@ -412,7 +409,7 @@
 }
 /*
 	gchar *str = NULL;
-	
+
 	if (GlistDvd == NULL) {
 		str = g_strdup (" ");
 	}
@@ -431,11 +428,11 @@
 	}
 	StatusBar_set_mess( NOTEBOOK_DVD_AUDIO, _STATUSBAR_SIMPLE_, str );
 	g_free (str);	str = NULL;
-	
+
 */
 
-// 
-// 
+//
+//
 void dvd_set_flag_buttons_dvd (void)
 {
 	var_dvd.bool_selected = FALSE;
@@ -464,8 +461,8 @@
 	}
 	StatusBar_puts();
 }
-// 
-// 
+//
+//
 gboolean dvd_foreach_stop_play (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer user_data)
 {
 	VAR *var = NULL;
@@ -480,8 +477,8 @@
 	 /* continuer à parcourir l'arbre */
 	return FALSE;
 }
-// 
-// 
+//
+//
 gboolean dvd_foreach_affiche_play (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer user_data)
 {
 	VAR *var = NULL;
@@ -498,15 +495,15 @@
 	 /* continuer à parcourir l'arbre */
 	return FALSE;
 }
-// 
-// 
+//
+//
 void dvd_set_etat_music_pixbuf (gboolean *PtrBoolDvdPlay, gboolean p_BoolDvdPlay)
 {
 	static gboolean *BoolDvdPlay = NULL;
-	
+
 	gtk_tree_model_foreach (GTK_TREE_MODEL(var_dvd.Adr_Tree_Model), dvd_foreach_stop_play, NULL);
-	
-	if (PtrBoolDvdPlay != NULL) 
+
+	if (PtrBoolDvdPlay != NULL)
 		BoolDvdPlay = PtrBoolDvdPlay;
 	if (BoolDvdPlay != NULL) {
 		*BoolDvdPlay = p_BoolDvdPlay;
@@ -514,30 +511,30 @@
 
 	gtk_tree_model_foreach (GTK_TREE_MODEL(var_dvd.Adr_Tree_Model), dvd_foreach_affiche_play, NULL);
 }
-// 
-// 
+//
+//
 void dvd_set_icone_stop (void)
 {
 	dvd_set_etat_music_pixbuf (NULL, FALSE);
 }
-// 
-// 
+//
+//
 void dvd_set_etat_music_pixbuf_with_detail (VAR *p_var, gboolean EtatPlay)
 {
 	/* Tous les flags et widget sur FILE_ETAT_PLAY_ATTENTE */
-	
+
 	if (EtatPlay == TRUE) {
-		
+
 	}
 }
-// 
-// 
+//
+//
 void dvd_pixbuf_stop_play (void)
 {
 	gtk_tree_model_foreach (GTK_TREE_MODEL(var_dvd.Adr_Tree_Model), dvd_foreach_stop_play, NULL);
 }
-// 
-// 
+//
+//
 gboolean dvd_event_click_mouse (GtkWidget *treeview, GdkEventButton *event, gpointer data)
 {
 	gint Pos_X = 0, Pos_Y = 0;
@@ -545,13 +542,13 @@
 	GtkTreeViewColumn *column;
 	GtkTreeViewColumn *ColumnDum;
 	gint i;
-	guint button;
+	// guint button;
 	GtkTreeModel *model = (GtkTreeModel *)data;
 	GtkTreeIter iter;
 	VAR *var = NULL;
 	GdkPixbuf *Pixbuf = NULL;
-	gboolean bool_key_Control = (keys.keyval == GDK_Control_L || keys.keyval == GDK_Control_R);
-	gboolean bool_key_Shift = (keys.keyval == GDK_Shift_L || keys.keyval == GDK_Shift_R);
+	gboolean bool_key_Control = (keys.keyval == GDK_KEY_Control_L || keys.keyval == GDK_KEY_Control_R);
+	gboolean bool_key_Shift = (keys.keyval == GDK_KEY_Shift_L || keys.keyval == GDK_KEY_Shift_R);
 	gboolean bool_key_Release = (bool_key_Control == FALSE && bool_key_Shift == FALSE);
 	gboolean bool_click_gauche = (event->button == 1);
 	gboolean bool_click_droit = (event->button == 3);
@@ -561,7 +558,7 @@
 	gboolean BoolSelectColTemps = FALSE;
 	gboolean BoolSelectColFormat = FALSE;
 	gboolean BoolSelectColChoix = FALSE;
-	gboolean BoolSelectColNormalise = FALSE;	
+	gboolean BoolSelectColNormalise = FALSE;
 	gboolean BoolSelectColNom = FALSE;
 
 	// Mise a jour du scroll vertical
@@ -610,34 +607,38 @@
 			break;
 		}
 	}
-
+	if( BoolSelectColNom );
+	if( BoolSelectColFormat );
+	if( BoolSelectColTemps );
+	if( BoolSelectColTitres );
 
 	gtk_tree_model_get_iter (model, &iter, path);
 	gtk_tree_model_get (model, &iter, DVD_POINTER_STRUCT_COLUMN, &var, -1);
 
-	if (var && (var->type_list_dvd == _DVD_DATA || var->type_list_dvd == _DVD_DATA_ALL)) {
+	// if (var && (var->type_list_dvd == _DVD_DATA || var->type_list_dvd == _DVD_DATA_ALL)) {
+	if (var && var->GUINT_TempsTotal > 0 && (var->type_list_dvd == _DVD_DATA || var->type_list_dvd == _DVD_DATA_ALL)) {
 
-		button = ((GdkEventButton*)event)->button;
+		// button = ((GdkEventButton*)event)->button;
 		if (bool_click_droit && BoolSelectColNormalise == TRUE) {
 			popup_normalise_dvd ();
 		}
-		
+
 		else if (bool_click_gauche && BoolSelectColNormalise == TRUE) {
-			
+
 			var->EtatNormalise = (var->EtatNormalise == TRUE) ? FALSE : TRUE;
-			
+
 			gtk_tree_store_set (
 				GTK_TREE_STORE (model),
 				&iter, DVD_PIXBUF_FILE_NORMALIZE,
 				dvd_get_pixbuf_normalise (var->EtatNormalise),
 				-1
 				);
-			
+
 			dvd_set_flag_buttons_dvd ();
 		}
-		
+
 		else if (bool_click_gauche && BoolSelectColChoix == TRUE) {
-			
+
 			if (var->OldChannels == 2) {
 				switch (var->EtatChoix) {
 				case _COCHE_ :
@@ -677,25 +678,27 @@
 			dvd_set_flag_buttons_dvd ();
 		}
 		else if (bool_click_gauche && BoolSelectColPlay == TRUE) {
-			
+
 			if (TRUE == mplayer_is_used ()) {
 
-				wininfo_create (
-					_("MPLAYER deja en action"),
-					_("MPLAYER est deja utilise !!"),
+				wind_info_init (
+					WindMain,
+					_("MPLAYER already in action"),
+					_("MPLAYER is already in use !!"),
 					 "");
 			}
 			else {
-				
+
 				GList	*list = NULL;
 				// APPEL DE mplayer_init AVANT WinReader_open ()
 				mplayer_init (LIST_MPLAYER_FROM_DVD, (gdouble)var->GUINT_TempsTotal, var_dvd.GUINT_TempsTotal, WinReader_close, WinReader_set_value, dvd_set_icone_stop, WinReader_is_close);
-				WinReader_open ("Dvd Read");
+				// WinReader_open ("Dvd Read");
+				wind_reader_init( WindMain );
 				WinReader_set_pause ();
-				
+
 				list = g_list_append (list, g_strdup ("-vo"));
 				list = g_list_append (list, g_strdup ("null"));
-				list = g_list_append (list, g_strdup ("-chapter"));				
+				list = g_list_append (list, g_strdup ("-chapter"));
 				if (*var->StrNumerateChapter == '0')
 					list = g_list_append (list, g_strdup ("1"));
 				else	list = g_list_append (list, g_strdup_printf ("%s-%s", var->StrNumerateChapter, var->StrNumerateChapter));
@@ -706,13 +709,13 @@
 				list = g_list_append (list, g_strdup_printf ("%d",libutils_hexa_to_int (var->StrNumerateStreamId)));
 				mplayer_set_list (list);
 				list = libutils_remove_glist (list);
-			
+
 				gtk_tree_model_get (model, &iter, DVD_PIXBUF_COLUMN_PLAY, &Pixbuf, -1);
 				// AFFICHE L ICONE DE PLAY
 				dvd_set_etat_music_pixbuf (&var->BoolDvdPlay, TRUE);
 			}
 		}
-		
+
 		/* position du curseur a l'instant du click */
 		if (Pos_X < 10 || Pos_X > 22) return (FALSE);
 		if (Pos_Y < 6 || Pos_Y > 18) return (FALSE);
@@ -722,11 +725,11 @@
 	// AJUSTEMENT DU SCROLL VERTICAL
 	gtk_adjustment_set_value (Adj, AdjValue);
 	gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (var_dvd.Adr_scroll), Adj);
-	while (gtk_events_pending()) gtk_main_iteration(); 
+	while (gtk_events_pending()) gtk_main_iteration();
 	return (FALSE);
 }
-// 
-// 
+//
+//
 static void dvd_cell_edited_namefile (GtkCellRendererText *cell,
 gchar *path_string,
 gchar *new_text,
@@ -751,22 +754,22 @@
 		gtk_tree_model_get (model, &iter, DVD_POINTER_STRUCT_COLUMN, &var, -1);
 		g_free (var->name_file);
 		var->name_file = NULL;
-		
+
 		// UN CHAMPS VIDE ACTUALISE LE NOM D ORIGINE
 		if (0 == strlen (new_text))
 			var->name_file = g_strdup (var->StaticNameFile);
 		else	var->name_file = g_strdup (new_text);
 
 		// actualise le nom
-		NameDest = dvd_get_name_to_treview (var);	
+		NameDest = dvd_get_name_to_treview (var);
 		gtk_tree_store_set (GTK_TREE_STORE (model), &iter, column, NameDest, -1);
 		g_free (NameDest);	NameDest = NULL;
 
 	}
 	gtk_tree_path_free (path);
 }
-// 
-// 
+//
+//
 gboolean dvd_event (GtkWidget *treeview, GdkEvent *event, gpointer user_data)
 {
 	gint x, y;
@@ -787,7 +790,7 @@
 	gboolean BoolSelectColTemps = FALSE;
 	gboolean BoolSelectColFormat = FALSE;
 	gboolean BoolSelectColChoix = FALSE;
-	gboolean BoolSelectColNormalise = FALSE;	
+	gboolean BoolSelectColNormalise = FALSE;
 	gboolean BoolSelectColNom = FALSE;
 
 	if (keys.keyval == GDK_KEY_PRESS) {
@@ -816,7 +819,10 @@
 
 
 	/* Si pas de selection a cet endroit retour */
-	gdk_window_get_pointer (((GdkEventButton*)event)->window, &x, &y, &state);
+	GdkDeviceManager *manager = gdk_display_get_device_manager( gdk_display_get_default() );
+	GdkDevice		 *device = gdk_device_manager_get_client_pointer( manager );
+	gdk_window_get_device_position( ((GdkEventButton*)event)->window, device, &x, &y, &state );
+	// gdk_window_get_pointer (((GdkEventButton*)event)->window, &x, &y, &state);
 	if (FALSE == gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW(treeview),
 					 x, y,
 					 &path, &column, &Pos_X, &Pos_Y)) {
@@ -828,7 +834,12 @@
 	gtk_tree_model_get_iter (model, &iter, path);
 	gtk_tree_model_get (var_dvd.Adr_Tree_Model, &iter, DVD_POINTER_STRUCT_COLUMN, &var, -1);
 	if (var == NULL) return (FALSE);
-	
+	if( var->GUINT_TempsTotal == 0 ) {
+		StatusBar_set_mess( NOTEBOOK_DVD_AUDIO, _STATUSBAR_SIMPLE_, " ");
+		StatusBar_puts( );
+		return( FALSE );
+	}
+
 	/* IDEE POUR REMPLACER LES COMPARAISON PAR NOMS. EXEMPLES:
 	 * 	PLAY	= 0
 	 * 	TRASH	= 1
@@ -855,25 +866,30 @@
 			break;
 		}
 	}
+	if( BoolSelectColFormat );
+	if( BoolSelectColTemps );
+	if( BoolSelectColTitres );
 
 	if (BoolSelectColNormalise == TRUE) {
 		if (var->EtatNormalise == TRUE)	{
 			switch (dvd_get_value_normalise_dvd ()) {
 			case 0 :
-				StatusBar_set_mess( NOTEBOOK_DVD_AUDIO, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / PEAK-ALBUM: Amplification maximale du volume pour un groupe de fichiers en respectant les ecarts de niveau entre chacun d'eux."));
+				StatusBar_set_mess( NOTEBOOK_DVD_AUDIO, _STATUSBAR_SIMPLE_, _("(Right click = Menu) / Maximum volume amplification of a group of files keeping the level difference between each of them."
+));
+				
 				break;
 			case 1 :
-				StatusBar_set_mess( NOTEBOOK_DVD_AUDIO, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / PEAK: Amplification maximale du volume pour chaque de fichier."));
+				StatusBar_set_mess( NOTEBOOK_DVD_AUDIO, _STATUSBAR_SIMPLE_, _("PEAK: Maximum volume amplification of each file."));
 				break;
 			}
 		}
 		else {
-			StatusBar_set_mess( NOTEBOOK_DVD_AUDIO, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / En attente de selection."));
+			StatusBar_set_mess( NOTEBOOK_DVD_AUDIO, _STATUSBAR_SIMPLE_, _("(Right click = Menu) / ReplayGain: Waiting for selection."));
 		}
 	}
 
 	else if (BoolSelectColNom == TRUE) {
-	
+
 		if (var_dvd.NumStruct == var->NumStruct) return (FALSE);
 		var_dvd.NumStruct = var->NumStruct;
 
@@ -901,7 +917,7 @@
 		if (var->OldChannels == 2) {
 			switch (var->EtatChoix) {
 			case _COCHE_ :
-				str = g_strdup (_("En attente de selection. Un click activera la conversion vers 2 canaux."));
+				str = g_strdup (_("Waiting for selection. A click will activate the conversion to 2 channels."));
 				StatusBar_set_mess( NOTEBOOK_DVD_AUDIO, _STATUSBAR_SIMPLE_, str );
 				break;
 			case _SELECTED_ :
@@ -913,7 +929,7 @@
 				*/
 				break;
 			case _CH_2_ :
-				str = g_strdup_printf (_("Conversion vers 2 canaux."));
+				str = g_strdup_printf (_("Conversion to 2 channels."));
 				StatusBar_set_mess( NOTEBOOK_DVD_AUDIO, _STATUSBAR_SIMPLE_, str );
 				break;
 			}
@@ -921,16 +937,16 @@
 		else if (var->OldChannels > 2) {
 			switch (var->EtatChoix) {
 			case _COCHE_ :
-				str = g_strdup (_("En attente de selection. Un click activera la conversion vers 2 canaux."));
+				str = g_strdup (_("Waiting for selection. A click will activate the conversion to 2 channels."));
 				StatusBar_set_mess( NOTEBOOK_DVD_AUDIO, _STATUSBAR_SIMPLE_, str );
 				break;
 			case _SELECTED_ :
-				str = g_strdup_printf (_("Conversion vers %s canaux."), var->StrNumberChannel);
+				str = g_strdup_printf (_("Conversion to %s channels."), var->StrNumberChannel);
 				StatusBar_set_mess( NOTEBOOK_DVD_AUDIO, _STATUSBAR_SIMPLE_, str );
 				break;
 			case _CH_2_ :
 				str = g_strdup_printf (
-					_("Conversion vers 2 canaux. Un second click activera la conversion vers %s canaux."), var->StrNumberChannel);
+					_("Conversion to 2 channels. A second click will activate the conversion to %s channels."), var->StrNumberChannel);
 				StatusBar_set_mess( NOTEBOOK_DVD_AUDIO, _STATUSBAR_SIMPLE_, str );
 				break;
 			}
@@ -940,24 +956,24 @@
 			str = NULL;
 		}
 	}
-	
+
 	else if (BoolSelectColPlay == TRUE) {
-	
+
 		gtk_tree_model_get (model, &iter, DVD_PIXBUF_COLUMN_PLAY, &Pixbuf, -1);
 		if (Pixbuf == var_dvd.Pixbuf_FileStop) {
-			StatusBar_set_mess( NOTEBOOK_DVD_AUDIO, _STATUSBAR_SIMPLE_, _("Musique en ecoute."));
+			StatusBar_set_mess( NOTEBOOK_DVD_AUDIO, _STATUSBAR_SIMPLE_, _("Playing music."));
 		}
 		else if (Pixbuf == var_dvd.Pixbuf_FilePlay) {
-			StatusBar_set_mess( NOTEBOOK_DVD_AUDIO, _STATUSBAR_SIMPLE_, _("Musique en attente."));
+			StatusBar_set_mess( NOTEBOOK_DVD_AUDIO, _STATUSBAR_SIMPLE_, _("Music paused."));
 		}
 		else {
 			StatusBar_set_mess( NOTEBOOK_DVD_AUDIO, _STATUSBAR_SIMPLE_, " ");
 		}
 	}
-	
+
 	else {
 		gchar *str = NULL;
-	
+
 		if (GlistDvd == NULL) {
 			str = g_strdup (" ");
 		}
@@ -970,35 +986,35 @@
 					);
 			}
 			else {
-				str = g_strdup(_("Ce fichier ne peut etre extrait !"));
+				str = g_strdup(_("This file can not be ripped !"));
 				var_dvd.bool_err --;
 			}
 		}
 		StatusBar_set_mess( NOTEBOOK_DVD_AUDIO, _STATUSBAR_SIMPLE_, str );
 		g_free (str);	str = NULL;
-		
+
 		dvd_set_flag_buttons_dvd ();
 	}
 	StatusBar_puts( );
 
 	return (FALSE);
 }
-// 
-// 
+//
+//
 void dvd_changed_selection_row_file_dvd (GtkTreeSelection *selection, gpointer data)
 {
 	var_dvd.Adr_Line_Selected = selection;
 }
-// 
-// 
+//
+//
 gboolean dvd_foreach_normalise_column (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer user_data)
 {
 	VAR	*var = NULL;
 
 	gtk_tree_model_get (model, iter, DVD_POINTER_STRUCT_COLUMN, &var, -1);
-	
+
 	if (var->type_list_dvd == _DVD_DATA_ALL || var->type_list_dvd == _DVD_DATA) {
-		
+
 		var->EtatNormalise = (var->EtatNormalise == TRUE) ? FALSE : TRUE;
 		gtk_tree_store_set (
 			GTK_TREE_STORE (model),
@@ -1008,25 +1024,25 @@
 			-1
 			);
 	}
-	
+
 	/* continuer à parcourir l'arbre */
 	return FALSE;
 }
-// 
-// 
+//
+//
 void dvd_selected_column (GtkTreeViewColumn *treeviewcolumn, gpointer user_data)
 {
 	gtk_tree_model_foreach (GTK_TREE_MODEL(var_dvd.Adr_Tree_Model), dvd_foreach_normalise_column, NULL);
 }
-// 
-// 
+//
+//
 gboolean dvd_foreach_update (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer user_data)
 {
 	VAR		*var = NULL;
 	GdkPixbuf	*Pixbuf = NULL;
 
 	gtk_tree_model_get (model, iter, DVD_POINTER_STRUCT_COLUMN, &var, -1);
-	
+
 	if (var->type_list_dvd == _DVD_DATA_ALL || var->type_list_dvd == _DVD_DATA) {
 
 		/* Raffraihcissement COCHE */
@@ -1052,21 +1068,21 @@
 	/* continuer à parcourir l'arbre */
 	return FALSE;
 }
-// 
-// 
+//
+//
 void dvd_update (void)
 {
 	gtk_tree_model_foreach (GTK_TREE_MODEL(var_dvd.Adr_Tree_Model), dvd_foreach_update, NULL);
 }
 // INIT TREVIEW
-// 
+//
 static void dvd_add_columns (GtkTreeView *treeview)
 {
 	gint col_offset;
 	GtkCellRenderer *renderer;
 	GtkTreeViewColumn *column;
 	GtkTreeModel *model = gtk_tree_view_get_model (treeview);
-	
+
 	var_dvd.NumStruct = 0;
 	var_dvd.bool_dedans = FALSE;
 
@@ -1075,20 +1091,20 @@
 
 	// SIGNAL : 'button-press-event'
 	g_signal_connect(G_OBJECT(treeview), "button-press-event", (GCallback) dvd_event_click_mouse, model);
-	
+
 	// SIGNAL : Ligne actuellement selectionnee 'changed'
 	var_dvd.Adr_Line_Selected = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
 	g_signal_connect(G_OBJECT(var_dvd.Adr_Line_Selected),
 			 "changed",
 	 G_CALLBACK(dvd_changed_selection_row_file_dvd),
 	 "1");
-	
+
 	/* DVD_TITLE_COLUMN */
 	renderer = gtk_cell_renderer_text_new ();
 	g_object_set (renderer, "xalign", 0.0, NULL);
 	col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
 							-1,
-							_("Titres"),	renderer,
+							_("Titles"),	renderer,
 							"markup",	DVD_TITLE_COLUMN,
 							NULL);
 	var_dvd.Adr_Column_Titres =
@@ -1112,7 +1128,7 @@
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
 							-1,
-							_("Temps"),	renderer,
+							_("Time"),	renderer,
 							"markup",	DVD_TIME_COLUMN,
 							NULL);
 	var_dvd.Adr_Column_Temps =
@@ -1136,7 +1152,7 @@
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
 							-1,
-							_("Choix"), renderer,
+							_("Choice"), renderer,
 							"pixbuf", DVD_PIXBUF_CHOICE_COLUMN,
 							NULL);
 	var_dvd.Adr_Column_Choix =
@@ -1161,7 +1177,7 @@
 	column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
 	gtk_tree_view_column_set_alignment (GTK_TREE_VIEW_COLUMN (column), 0.5);
 	*/
-	
+
 	/* DVD_PIXBUF_FILE_NORMALIZE
 	*/
 	renderer = gtk_cell_renderer_pixbuf_new ();
@@ -1179,7 +1195,7 @@
 			"clicked",
 			G_CALLBACK (dvd_selected_column),
 			GINT_TO_POINTER(0));
-	
+
 	/* DVD_NAME_COLUMN */
 	var_dvd.Renderer =
 	renderer = gtk_cell_renderer_text_new ();
@@ -1188,7 +1204,7 @@
 	g_signal_connect (renderer, "edited", G_CALLBACK (dvd_cell_edited_namefile), model);
 	col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
 							-1,
-							_("Nom"),
+							_("Name"),
 							renderer,
 							"markup", DVD_NAME_COLUMN,
 							 "editable", DVD_NAME_EDITABLE_COLUMN,
@@ -1197,8 +1213,8 @@
 	column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
 	gtk_tree_view_column_set_alignment (GTK_TREE_VIEW_COLUMN (column), 0.5);
 }
-// 
-// 
+//
+//
 void on_scrolledwindow_dvd_audio_realize (GtkWidget *widget, gpointer user_data)
 {
 	/* Chargement des PIXBUF */
@@ -1226,7 +1242,7 @@
 	/* create tree view */
 	var_dvd.Adr_TreeView = gtk_tree_view_new_with_model (var_dvd.Adr_Tree_Model);
 	g_object_unref (var_dvd.Adr_Tree_Model);
-	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (var_dvd.Adr_TreeView), TRUE);
+	// gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (var_dvd.Adr_TreeView), TRUE);
 
 	dvd_add_columns (GTK_TREE_VIEW (var_dvd.Adr_TreeView));
 
@@ -1234,29 +1250,27 @@
 
 	gtk_widget_show_all (widget);
 }
-// 
-// 
+//
+//
 void on_combobox_peripherique_dvd_realize (GtkWidget *widget, gpointer user_data)
 {
 	GList *List = NULL;
 	MEDIA *Media = NULL;
 
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-	
 	List = g_list_first (scan_get_glist ());
 	while (List) {
 		if ((Media = (MEDIA *)List->data)) {
-			gtk_combo_box_append_text (GTK_COMBO_BOX (widget), (gchar *)Media->Full_Name);
+			gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), (gchar *)Media->Full_Name );
 		}
 		List = g_list_next(List);
 	}
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Fichier structure DVD"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("DVD file structure"));
 	if( Config.NumSelectComboBoxDvd < 0 ) Config.NumSelectComboBoxDvd = 0;
 	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), Config.NumSelectComboBoxDvd);
 	var_dvd.Adr_ComboBox_Reader = GTK_COMBO_BOX (widget);
 }
-// 
-// 
+//
+//
 void dvd_pthread_reffresh_list (void *data)
 {
 	var_dvd.bool_end_pthread = FALSE;
@@ -1264,6 +1278,7 @@
 
 	dvdread_remove_list ();
 
+	/*
 	if (dvdread_dvd_found () == FALSE) {
 		var_dvd.bool_read_dvd = FALSE;
 	}
@@ -1277,12 +1292,14 @@
 			}
 		}
 	}
+	*/
+	var_dvd.bool_read_dvd = dvdread_dvd_read();
 
 	var_dvd.bool_end_pthread = TRUE;
 	pthread_exit (0);
 }
-// 
-// 
+//
+//
 static gint dvd_timeout (gpointer data)
 {
 	if (var_dvd.bool_end_pthread == TRUE) {
@@ -1300,13 +1317,13 @@
 		dvd_set_flag_buttons_dvd ();
 
 		if (var_dvd.bool_read_dvd == FALSE) {
-			StatusBar_set_mess( NOTEBOOK_DVD_AUDIO, _STATUSBAR_SIMPLE_, _("Le DVD est absent du lecteur."));
+			StatusBar_set_mess( NOTEBOOK_DVD_AUDIO, _STATUSBAR_SIMPLE_, _("The DVD player is absent."));
 		}
 		else {
 			StatusBar_set_mess( NOTEBOOK_DVD_AUDIO, _STATUSBAR_SIMPLE_, "" );
 		}
 
-		gtk_timeout_remove (var_dvd.Handler_Timeout);
+		g_source_remove (var_dvd.Handler_Timeout);
 		WindScan_close ();
 	}
 	else if (var_dvd.bool_halt == TRUE) {
@@ -1315,41 +1332,46 @@
 
 	return (TRUE);
 }
-// 
-// 
+//
+//
 void dvd_reffresh_list_dvd_action (void)
 {
 	pthread_t nmr_tid;
 
 	if (TRUE == mplayer_is_used ()) {
 
-		wininfo_create (
-			_("MPLAYER deja en action"),
-			_("MPLAYER est deja utilise !!"),
+		wind_info_init (
+			WindMain,
+			_("MPLAYER already in action"),
+			_("MPLAYER is already in use !!"),
 			 "");
 		return;
 	}
-	
+
 	dvd_remove_GtkTree ();
 
 	var_dvd.PathDvd = scan_get_text_combo_cd (_DVD_);
-	g_print("---------------> var_dvd.PathDvd = %s\n",var_dvd.PathDvd );
-	
-	WindScan_open (_("Scan ..."), WINDSCAN_PULSE);
-	
+	// g_print("---------------> var_dvd.PathDvd = %s\n",var_dvd.PathDvd );
+
+	// WindScan_open (_("Scan ..."), WINDSCAN_PULSE);
+	wind_scan_init(
+		WindMain,
+		"Scan ...",
+		WINDSCAN_PULSE
+		);
 	var_dvd.bool_read_dvd = TRUE;
 	var_dvd.bool_halt = FALSE;
 	var_dvd.bool_end_pthread = FALSE;
-	var_dvd.Handler_Timeout = gtk_timeout_add (100, dvd_timeout, 0);
+	var_dvd.Handler_Timeout = g_timeout_add (100, dvd_timeout, 0);
 	pthread_create (&nmr_tid, NULL ,(void *)dvd_pthread_reffresh_list, (void *)NULL);
 	// pthread_detach (nmr_tid);
 }
-// 
-// 
+//
+//
 void dvd_reffresh_list_directory_dvd (gchar *path)
 {
 	gchar	*Ptr = NULL;
-	
+
 	var_dvd.from.bool_dvd = FALSE;
 	if( NULL != var_dvd.from.path ) {
 		g_free (var_dvd.from.path);	var_dvd.from.path = NULL;
@@ -1360,14 +1382,14 @@
 		g_free (Config.PathChoiceFileDVD);	Config.PathChoiceFileDVD = NULL;
 	}
 	Config.PathChoiceFileDVD = g_strdup (path);
-	
+
 	if (NULL != (Ptr = strrchr (Config.PathChoiceFileDVD, '/'))) {
 		*Ptr = '\0';
 	}
 	dvd_reffresh_list_dvd_action ();
 }
-// 
-// 
+//
+//
 gboolean dvd_bool_read_dvd_from_directory (void)
 {
 	guint nbr = g_list_length (scan_get_glist ());
@@ -1375,20 +1397,21 @@
 
 	return (Nmr_Combo_Actif >= nbr ? TRUE : FALSE);
 }
-// 
-// 
+//
+//
 void dvd_reffresh_list_dvd (void)
 {
 	if (NULL == var_dvd.Adr_ComboBox_Reader) return;
 
 	if (libutils_find_file ("lsdvd") == FALSE) {
 
-		wininfo_create (
-			_("lsdvd est absent !"),
-			_("Il faut installer le programme: lsdvd"),
+		wind_info_init (
+			WindMain,
+			_("lsdvd is missing !"),
+			_("You must install the program: lsdvd"),
 			 "");
 
-		g_print("VEUILLEZ INSTALLER L APPLICATION [ LSDVD ]\n");
+		// g_print("VEUILLEZ INSTALLER L APPLICATION [ LSDVD ]\n");
 		return;
 	}
 
@@ -1403,8 +1426,8 @@
 		dvd_reffresh_list_dvd_action ();
 	}
 }
-// 
-// 
+//
+//
 void on_button_destination_dvd_realize (GtkWidget *widget, gpointer user_data)
 {
 	var_dvd.bool_selected = FALSE;
@@ -1414,8 +1437,8 @@
 	gtk_button_set_use_underline (GTK_BUTTON (var_dvd.Adr_button_destination_dvd), FALSE);
 	gtk_button_set_label (GTK_BUTTON (var_dvd.Adr_button_destination_dvd), Config.PathDestinationDVD);
 }
-// 
-// 
+//
+//
 void dvd_maj_destination_DVD (gchar *path)
 {
 	if (libutils_test_write (path) == TRUE) {
@@ -1425,20 +1448,20 @@
 		gtk_button_set_label (GTK_BUTTON (var_dvd.Adr_button_destination_dvd), Config.PathDestinationDVD);
 	}
 }
-// 
-// 
+//
+//
 void on_button_destination_dvd_clicked (GtkButton *button, gpointer user_data)
 {
 	fileselect_create (_PATH_CHOICE_DESTINATION_, Config.PathDestinationDVD, dvd_maj_destination_DVD);
 }
-// 
-// 
+//
+//
 void dvd_button_annuler_lecture_dvd_clicked (void)
 {
 	var_dvd.bool_halt = TRUE;
 }
-// 
-// 
+//
+//
 gboolean dvd_foreach_func (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer user_data)
 {
 	VAR *var = NULL;
@@ -1489,7 +1512,8 @@
 				}
 			}
 			else if (var->format_id == _INCONNU_) {
-				g_print ("\nFORMAT == _INCONNU_\n\tExtraction comme AC3\n");
+				if( TRUE == OptionsCommandLine.BoolVerboseMode )
+					g_print ("\nFORMAT == _INCONNU_\n\tExtraction comme AC3\n");
 
 				ptr = dvdtable_get (var->OldChannels, var->NewChannels);
 				param = g_strdup_printf ("-channels %d -af pan=%d:%s",
@@ -1519,7 +1543,7 @@
 					utils_hexa_to_int (var->StrNumerateStreamId),
 					param
 					);
-					
+
 			g_print ("dvd_extract->LineCommand =%s\n", dvd_extract->LineCommand);
 
 			GlistDvdExtract = g_list_append (GlistDvdExtract, dvd_extract);
@@ -1527,12 +1551,12 @@
 
 			/* NOUVEAU */
 			StructDvdExtract = (NEW_DVD_EXTRACT *)g_malloc0 (sizeof (NEW_DVD_EXTRACT));
-			
+
 			StructDvdExtract->Path = g_strdup_printf ("%s/%s.wav", Config.PathDestinationDVD, var->name_file);
 			StructDvdExtract->Var = var;
-			
+
 			StructDvdExtract->EtatNormalise = var->EtatNormalise;
-			
+
 			if (var->EtatNormalise == TRUE)	{
 				switch (dvd_get_value_normalise_dvd ()) {
 				case 0 : var_dvd.TTNormPeakCollectif ++;	break;
@@ -1544,9 +1568,9 @@
 			StructDvdExtract->list = g_list_append (StructDvdExtract->list, g_strdup ("-n"));
 			// StructDvdExtract->list = g_list_append (StructDvdExtract->list, g_strdup ("0"));
 			StructDvdExtract->list = g_list_append (StructDvdExtract->list, g_strdup_printf ("%d", Config.Nice));
-			
+
 			StructDvdExtract->list = g_list_append (StructDvdExtract->list, g_strdup ("mplayer"));
-					
+
 			StructDvdExtract->list = g_list_append (StructDvdExtract->list, g_strdup ("-nojoystick"));
 			StructDvdExtract->list = g_list_append (StructDvdExtract->list, g_strdup ("-nolirc"));
 
@@ -1555,19 +1579,19 @@
 			StructDvdExtract->list = g_list_append (StructDvdExtract->list, g_strdup ("-ao"));
 			StructDvdExtract->list = g_list_append (StructDvdExtract->list,
 				g_strdup_printf ("pcm:file=%s/%s.wav", Config.PathDestinationDVD, var->name_file));
-			
+
 			Larrbuf = g_strsplit (chapter, " ", 0);
 			for (cpt=0; Larrbuf[cpt]; cpt++) {
 				StructDvdExtract->list = g_list_append (StructDvdExtract->list, g_strdup (Larrbuf[cpt]));
 			}
 			g_strfreev(Larrbuf);
-			
+
 			StructDvdExtract->list = g_list_append (StructDvdExtract->list, g_strdup_printf ("dvd://%s", var->StrNumerateTitle));
 			StructDvdExtract->list = g_list_append (StructDvdExtract->list, g_strdup ("-dvd-device"));
 			StructDvdExtract->list = g_list_append (StructDvdExtract->list, g_strdup (scan_get_text_combo_cd (_DVD_)));
 			StructDvdExtract->list = g_list_append (StructDvdExtract->list, g_strdup ("-aid"));
 			StructDvdExtract->list = g_list_append (StructDvdExtract->list, g_strdup_printf ("%d",libutils_hexa_to_int (var->StrNumerateStreamId)));
-	
+
 			Larrbuf = g_strsplit (param, " ", 0);
 			for (cpt=0; Larrbuf[cpt]; cpt++) {
 				StructDvdExtract->list = g_list_append (StructDvdExtract->list, g_strdup (Larrbuf[cpt]));
@@ -1586,64 +1610,68 @@
 	 /* continuer à parcourir l'arbre */
 	return FALSE;
 }
-// 
-// 
+//
+//
 void on_button_extraction_dvd_clicked (GtkButton *button, gpointer user_data)
 {
 	var_dvd.int_temp = 0;
 	var_dvd.TTNormPeak = 0;
 	var_dvd.TTNormPeakCollectif = 0;
-	
+
 	gtk_tree_model_foreach (GTK_TREE_MODEL(var_dvd.Adr_Tree_Model), dvd_foreach_func, NULL);
 
 	// mplayer_fifo_quit ();
 	dvdextract_dvd_to_file ();
 }
-// 
-// 
+//
+//
 void on_combobox_sub_dvd_realize (GtkWidget *widget, gpointer user_data)
 {
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-
 	var_dvd.Adr_combobox_sub_dvd = GTK_COMBO_BOX (widget);
 
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Normal");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "-3dB");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "-6dB");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Normal");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "-3dB");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "-6dB");
 	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
 }
-// 
-// 
+//
+//
 void on_combobox_ambiance_dvd_realize (GtkWidget *widget, gpointer user_data)
 {
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-	
 	var_dvd.Adr_combobox_ambiance_dvd = GTK_COMBO_BOX (widget);
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Normal");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "-3dB");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "-6dB");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Normal");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "-3dB");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "-6dB");
 	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
 }
-// 
-// 
+//
+//
 void on_combobox_normalise_dvd_realize (GtkWidget *widget, gpointer user_data)
 {
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-	
 	var_dvd.Adr_combobox_normalise_dvd = GTK_COMBO_BOX (widget);
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Peak/Album");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Peak");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Peak/Album");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Peak");
 	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
 }
-// 
-// 
+//
+//
 gint dvd_get_value_normalise_dvd (void)
 {
 	if (var_dvd.Adr_combobox_normalise_dvd == NULL) return (-1);
 	return (gtk_combo_box_get_active (var_dvd.Adr_combobox_normalise_dvd));
 }
-// 
-// 
+//
+// SOLVED
+// 	Debian Bug report logs - #673640
+// 	xcfa: XCFA crashes when the CD is ejected
+// 	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673640
+//
+void on_button_eject_dvd_realize( GtkWidget *widget, gpointer user_data )
+{
+	// g_print( "on_button_eject_dvd_realize\n" );
+	// g_print( "\tscan_get_glist() = %p\n", scan_get_glist () );
+	gtk_widget_set_sensitive( widget, scan_get_glist() == NULL ? FALSE : TRUE );
+}
 void on_button_eject_dvd_clicked (GtkButton *button, gpointer user_data)
 {
 	dvd_remove_GtkTree ();
@@ -1651,8 +1679,8 @@
 	dvd_set_flag_buttons_dvd ();
 	scan_eject_media (_DVD_);
 }
-// 
-// 
+//
+//
 void on_combobox_peripherique_dvd_changed (GtkComboBox *combobox, gpointer user_data)
 {
 	if( NULL != var_dvd.Adr_ComboBox_Reader ) {
@@ -1660,39 +1688,39 @@
 		dvd_reffresh_list_dvd ();
 	}
 }
-// 
-// 
+//
+//
 void on_button_rafraichir_dvd_clicked (GtkButton *button, gpointer user_data)
 {
 	dvd_reffresh_list_dvd ();
 }
-// 
-// 
+//
+//
 void on_button_deplier_dvd_clicked (GtkButton *button, gpointer user_data)
 {
 	gtk_tree_view_expand_all ( (GtkTreeView *)var_dvd.Adr_TreeView);
 }
-// 
-// 
+//
+//
 void on_button_replier_dvd_clicked (GtkButton *button, gpointer user_data)
 {
 	gtk_tree_view_collapse_all ( (GtkTreeView *)var_dvd.Adr_TreeView);
 }
-// 
-// 
+//
+//
 void dvd_from_popup (TYPE_SET_FROM_POPUP_DVD TypeSetFromPopup, gboolean EtatNormalise)
 {
 	switch (TypeSetFromPopup) {
-	
+
 	// SELECTION ou DESELECTION POUR LES ICONES DE CONVERSIONS
-	
+
 	case CD_NORMALISE_SELECT_V :		// Deselection verticale
 		dvd_set_flag_normalise (FALSE);
 		break;
 	case CD_NORMALISE_DESELECT_V :		// Selection verticale
 		dvd_set_flag_normalise (TRUE);
 		break;
-		
+
 	}
 }

xcfa-4.2.8.tar.gz/src/dvd.h -> xcfa-5.0.2.tar.gz/src/dvd.h Changed

@@ -1,9 +1,9 @@
  /*
  *  file      : dvd.h
  *  project   : xcfa
- *  with      : Gtk-2
+ *  with      : Gtk-3
  *
- *  copyright : (C) 2003 - 2012 by Claude Bulin
+ *  copyright : (C) 2003 - 2015 by Claude Bulin
  *
  *  xcfa - GTK+ implementation of the GNU shell command
  *  GNU General Public License
@@ -29,123 +29,123 @@
 #define dvd_audio_h 1
 
 typedef enum {
-	_DVD_NAME=0,						// Le nom du DVD
-	_DVD_TITLE,						// Le titre
-	_DVD_CHAPTER,						// Le chapitre
-	_DVD_DATA,						// Les datas pour une extraction partielle
-	_DVD_DATA_ALL						// Les datas pour une extraction complete
+	_DVD_NAME=0,									// Le nom du DVD
+	_DVD_TITLE,										// Le titre
+	_DVD_CHAPTER,									// Le chapitre
+	_DVD_DATA,										// Les datas pour une extraction partielle
+	_DVD_DATA_ALL									// Les datas pour une extraction complete
 } TYPE_LIST_DVD;
 
 typedef enum {
-	_INCONNU_ = 0,						// 
-	_DTS_,							// 
-	_AC3_							// 
+	_INCONNU_ = 0,									// 
+	_DTS_,											// 
+	_AC3_											// 
 } FORMAT_ID;
 
 typedef enum {
-	_COCHE_ = 0,						// Pret a etre selectionne
-	_SELECTED_,						// En selection avec le canal d'origine
-	_CH_2_							// En selection avec le canal 2
+	_COCHE_ = 0,									// Pret a etre selectionne
+	_SELECTED_,										// En selection avec le canal d'origine
+	_CH_2_											// En selection avec le canal 2
 } ETAT_CHOIX;
 
 typedef struct {
-	TYPE_LIST_DVD		 type_list_dvd;			// Le type
-	gchar			*def;				// La chaine d'info
-	gchar			*time;				// La duree
-	guint			 GUINT_TempsTotal;		// Duree totale en secondes
-	gchar			*name_file;			// Le nom du fichier qui pourra etre modifie
-	gchar			*StaticNameFile;		// Le nom du fichier original
-	FORMAT_ID		 format_id;			// _INCONNU_, _DTS_ ou _AC3_
-	gchar			*StrNumerateTitle;		// Le numero du titre
-	gint			 NumerateTitle;			// Le numero du titre
-	gchar			*StrNumerateChapter;		// Le numero du chapitre
-	gint			 NumerateChapter;		// Le numero du chapitre
-	gchar			*StrNumberChannel;		// Le nombre de canaux
-	gchar			*StrNumerateStreamId;		// La langue
-	gint			 OldChannels;			// Le canal d'origine
-	gint			 NewChannels;			// Le nouveau canal
-	ETAT_CHOIX		 EtatChoix;			// _COCHE_, _SELECTED_, _CH_2_
-	gint			 NumStruct;			// Numero pour dvd_event
-	gboolean		 BoolDvdPlay;			// TRUE = Play, FALSE = NONE
-	gint			 DebutLecture;			// 
-	gboolean		 EtatNormalise;			// 
+	TYPE_LIST_DVD		 type_list_dvd;				// Le type
+	gchar			*def;							// La chaine d'info
+	gchar			*time;							// La duree
+	guint			 GUINT_TempsTotal;				// Duree totale en secondes
+	gchar			*name_file;						// Le nom du fichier qui pourra etre modifie
+	gchar			*StaticNameFile;				// Le nom du fichier original
+	FORMAT_ID		 format_id;						// _INCONNU_, _DTS_ ou _AC3_
+	gchar			*StrNumerateTitle;				// Le numero du titre
+	gint			 NumerateTitle;					// Le numero du titre
+	gchar			*StrNumerateChapter;			// Le numero du chapitre
+	gint			 NumerateChapter;				// Le numero du chapitre
+	gchar			*StrNumberChannel;				// Le nombre de canaux
+	gchar			*StrNumerateStreamId;			// La langue
+	gint			 OldChannels;					// Le canal d'origine
+	gint			 NewChannels;					// Le nouveau canal
+	ETAT_CHOIX		 EtatChoix;						// _COCHE_, _SELECTED_, _CH_2_
+	gint			 NumStruct;						// Numero pour dvd_event
+	gboolean		 BoolDvdPlay;					// TRUE = Play, FALSE = NONE
+	gint			 DebutLecture;					// 
+	gboolean		 EtatNormalise;					// 
 	
 } VAR;
 
 typedef enum {
-	_DVDAUDIO_DVD_ = 0,					// La source = DVD
-	_DVDAUDIO_FILE_						// La source = dossier (DVD)
+	_DVDAUDIO_DVD_ = 0,								// La source = DVD
+	_DVDAUDIO_FILE_									// La source = dossier (DVD)
 } DVDAUDIO_SOURCE;
 
 typedef struct {
-	gboolean		 bool_dvd;			// 
-	gchar			*path;				// 
+	gboolean		 bool_dvd;						// 
+	gchar			*path;							// 
 } INFO_DVDAUDIO;
 
 typedef struct {
-	gdouble			 double_TempsTotal;		//
-	guint			 guint_TempsTotal;		// 
-	GList			*list;				// 
+	gdouble			 double_TempsTotal;				//
+	guint			 guint_TempsTotal;				// 
+	GList			*list;							// 
 } PLAY_DVDAUDIO;
 
 typedef struct {
 
 	GtkComboBox		*Adr_combobox_normalise_dvd;	// Adresse
 	
-	GtkTreeModel		*Adr_Tree_Model;		// 
-	GtkWidget		*Adr_TreeView;			// 
-	GtkWidget		*Adr_scroll;			// Adresse
-	GtkTreeSelection	*Adr_Line_Selected;		// Adresse
-
-	GdkPixbuf		*Pixbuf_FilePlay;		// 
-	GdkPixbuf		*Pixbuf_FileStop;		// 
-	GdkPixbuf		*Pixbuf_Coche;			// 
-	GdkPixbuf		*Pixbuf_Coche_Exist;		// 
-	GdkPixbuf		*Pixbuf_Selected;		// 
-	GdkPixbuf		*Pixbuf_2ch;			// 
+	GtkTreeModel	*Adr_Tree_Model;				// 
+	GtkWidget		*Adr_TreeView;					// 
+	GtkWidget		*Adr_scroll;					// Adresse
+	GtkTreeSelection	*Adr_Line_Selected;			// Adresse
+
+	GdkPixbuf		*Pixbuf_FilePlay;				// 
+	GdkPixbuf		*Pixbuf_FileStop;				// 
+	GdkPixbuf		*Pixbuf_Coche;					// 
+	GdkPixbuf		*Pixbuf_Coche_Exist;			// 
+	GdkPixbuf		*Pixbuf_Selected;				// 
+	GdkPixbuf		*Pixbuf_2ch;					// 
 
 	GtkButton		*Adr_button_destination_dvd;	// 
-	GtkComboBox		*Adr_ComboBox_Reader;		// 
+	GtkComboBox		*Adr_ComboBox_Reader;			// 
 	
-	GtkComboBox		*Adr_combobox_sub_dvd;		// 
-	GtkComboBox		*Adr_combobox_ambiance_dvd;	// 
+	GtkComboBox		*Adr_combobox_sub_dvd;			// 
+	GtkComboBox		*Adr_combobox_ambiance_dvd;		// 
 
-	gboolean		 bool_click;			// 
+	gboolean		 bool_click;					// 
 
-	gint			 total_selected_2ch;		// 
-	gint			 total_selected;		// 
-	gboolean		 bool_selected;			// 
-	gboolean		 bool_sa;			// 
+	gint			 total_selected_2ch;			// 
+	gint			 total_selected;				// 
+	gboolean		 bool_selected;					// 
+	gboolean		 bool_sa;						// 
 
-	guint			 Handler_Timeout;		// 
-	gboolean		 bool_end_pthread;		// 
-	gboolean		 bool_read_dvd;			// 
-	gboolean		 bool_halt;			// 
+	guint			 Handler_Timeout;				// 
+	gboolean		 bool_end_pthread;				// 
+	gboolean		 bool_read_dvd;					// 
+	gboolean		 bool_halt;						// 
 
-	gint			 int_temp;			// 
+	gint			 int_temp;						// 
 
-	INFO_DVDAUDIO		 from;				// 
+	INFO_DVDAUDIO		 from;						// 
 
-	gint			 NumStruct;			// Numero pour dvdaudio_event
-	gboolean		 bool_dedans;			// 
+	gint			 NumStruct;						// Numero pour dvdaudio_event
+	gboolean		 bool_dedans;					// 
 	
-	gint			 bool_err;			// 
+	gint			 bool_err;						// 
 
-	GtkTreeViewColumn	*Adr_Column_Titres;		// 
-	GtkTreeViewColumn	*Adr_Column_Play;		// 
-	GtkTreeViewColumn	*Adr_Column_Temps;		// 
-	GtkTreeViewColumn	*Adr_Column_Format;		// 
-	GtkTreeViewColumn	*Adr_Column_Choix;		// 
+	GtkTreeViewColumn	*Adr_Column_Titres;			// 
+	GtkTreeViewColumn	*Adr_Column_Play;			// 
+	GtkTreeViewColumn	*Adr_Column_Temps;			// 
+	GtkTreeViewColumn	*Adr_Column_Format;			// 
+	GtkTreeViewColumn	*Adr_Column_Choix;			// 
 	GtkTreeViewColumn	*Adr_Column_Normalise;		// 
-	GtkCellRenderer		*Renderer;			// 
-	GtkTreeViewColumn	*Adr_Column_Nom;		// 
+	GtkCellRenderer		*Renderer;					// 
+	GtkTreeViewColumn	*Adr_Column_Nom;			// 
 		
-	guint			 GUINT_TempsTotal;		// Duree totale en secondes
+	guint			 GUINT_TempsTotal;				// Duree totale en secondes
 	
-	PLAY_DVDAUDIO		 PlayDvdAudio;			// 
+	PLAY_DVDAUDIO		 PlayDvdAudio;				// 
 	
-	gint			 TTNormPeak;			// Nombre total de Peak
-	gint			 TTNormPeakCollectif;		// Nombre total de Peak Collectif
+	gint			 TTNormPeak;					// Nombre total de Peak
+	gint			 TTNormPeakCollectif;			// Nombre total de Peak Collectif
 	
 	gboolean		 BoolNormIsSelected;
 	
@@ -153,15 +153,15 @@
 	
 } VAR_DVD;
 
-extern VAR_DVD var_dvd;						// 
+extern VAR_DVD var_dvd;								// 
 
-extern GList *GlistDvd;						// 
+extern GList *GlistDvd;								// 
 
 typedef struct {
-	VAR			*Var;				// 
+	VAR			*Var;								// 
 	gboolean		 EtatNormalise;
-	gchar			*Path;				// Nom du fichier final
-	GList			*list;				// Glist pour l'extraction
+	gchar			*Path;							// Nom du fichier final
+	GList			*list;							// Glist pour l'extraction
 } NEW_DVD_EXTRACT;
 
 extern GList *GlistDvdExtract;
@@ -187,17 +187,7 @@
 * DVD_READ.C
 *---------------------------------------------------------------------------
 */
-void      dvdread_create_list (TYPE_LIST_DVD type_list_dvd,
-				gchar *def,
-				gchar *time,
-				gchar *name_file,
-				gint   format_id,
-				gint   NumerateTitle,
-				gint   NumerateChapter,
-				gint   NumberChannel,
-				gchar *StrNumerateStreamId);
 void      dvdread_remove_list (void);
-gboolean  dvdread_dvd_found (void);
 gboolean  dvdread_dvd_read (void);
 
 /*

xcfa-4.2.8.tar.gz/src/dvd_extract.c -> xcfa-5.0.2.tar.gz/src/dvd_extract.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : dvd_extract.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,10 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
@@ -138,20 +134,25 @@
 }
 // 
 // 
-void dvdextract_set_arg (GList *p_list)
+gchar **dvdextract_set_arg( GList *p_list )
 {
 	GList	*list = NULL;
 	gchar	*ptr = NULL;
 	gint	pos = 0;
+	gchar	**PtrTabArgs = NULL;
+	
+	PtrTabArgs = filelc_AllocTabArgs();
 	
 	list = g_list_first (p_list);
 	while (list) {
 		if ((ptr = (gchar *)list->data)) {
-			conv.ArgConv [ pos++ ] = g_strdup (ptr);
+			PtrTabArgs [ pos++ ] = g_strdup (ptr);
 		}
 		list = g_list_next(list);
 	}
-	conv.ArgConv [ pos++ ] = NULL;
+	PtrTabArgs [ pos++ ] = NULL;
+	
+	return( (gchar **)PtrTabArgs );
 }
 // 
 // 
@@ -161,6 +162,8 @@
 	NEW_DVD_EXTRACT *StructDvdExtract = NULL;
 	/*gint value_fix;*/
 	gint		pos;
+	gchar		**PtrTabArgs = NULL;
+	gboolean	RetConvert;
 	
 	PRINT_FUNC_LF();
 	
@@ -173,54 +176,43 @@
 			VarDvdextract.file_active ++;
 			VarDvdextract.bool_mess = TRUE;
 
-			g_print ("****** Pathname **********************\n");
-			g_print ("%s\n", StructDvdExtract->Path);
-			g_print ("**************************************\n");
-			g_print ("\n");
+			if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
+				g_print ("****** Pathname **********************\n");
+				g_print ("%s\n", StructDvdExtract->Path);
+				g_print ("**************************************\n");
+				g_print ("\n");
+			}
 			
-			dvdextract_set_arg ((GList *)StructDvdExtract->list);		
+			PtrTabArgs = dvdextract_set_arg( (GList *)StructDvdExtract->list );
+			RetConvert = conv_to_convert( PtrTabArgs, FALSE, MPLAYER_AUDIO_TO_WAV, "NEW:-> MPLAYER_AUDIO_TO_WAV" );
+			PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 			
-			if (FALSE == conv.bool_stop && TRUE == conv_to_convert (FALSE, MPLAYER_AUDIO_TO_WAV, "NEW:-> MPLAYER_AUDIO_TO_WAV")) {
-				
-				/*gint	Channels;
-				gint	Hertz;
-				gint	Bits;
-				gchar	*StrHertz = NULL;
-				gchar	*StrBits = NULL;*/
-				
+			if( FALSE == conv.bool_stop && TRUE == RetConvert ) {
+								
 				VarDvdextract.bool_update = TRUE;
 				StructDvdExtract->Var->EtatChoix = _COCHE_;
 				
 				// MPLAYER
-				pos = filelc_get_command_line_nice ();
-				conv.ArgConv [ pos++ ] = g_strdup ("mplayer");
-				conv.ArgConv [ pos++ ] = g_strdup ("-nojoystick");
-				conv.ArgConv [ pos++ ] = g_strdup ("-nolirc");
-				conv.ArgConv [ pos++ ] = g_strdup (StructDvdExtract->Path);
-				conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-				conv.ArgConv [ pos++ ] = g_strdup ("pcm");
-				conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-				conv.ArgConv [ pos++ ] = g_strdup ("pcm:file=/tmp/toto.wav");
-				conv.ArgConv [ pos++ ] = g_strdup ("-srate");
-				conv.ArgConv [ pos++ ] = g_strdup ("44100");
-				conv.ArgConv [ pos++ ] = NULL;
-				conv_to_convert (FALSE, MPLAYER_WAV_TO_WAV, "MPLAYER_WAV_TO_WAV");
-				filelc_get_command_line_remove ();
+				PtrTabArgs = filelc_AllocTabArgs();
+				pos = 3;
+				PtrTabArgs [ pos++ ] = g_strdup ("mplayer");
+				PtrTabArgs [ pos++ ] = g_strdup ("-nojoystick");
+				PtrTabArgs [ pos++ ] = g_strdup ("-nolirc");
+				PtrTabArgs [ pos++ ] = g_strdup (StructDvdExtract->Path);
+				PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+				PtrTabArgs [ pos++ ] = g_strdup ("pcm");
+				PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+				PtrTabArgs [ pos++ ] = g_strdup ("pcm:file=/tmp/toto.wav");
+				PtrTabArgs [ pos++ ] = g_strdup ("-srate");
+				PtrTabArgs [ pos++ ] = g_strdup ("44100");
+				PtrTabArgs [ pos++ ] = NULL;
+				conv_to_convert( PtrTabArgs, FALSE, MPLAYER_WAV_TO_WAV, "MPLAYER_WAV_TO_WAV");
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 				
 				conv_copy_src_to_dest ("/tmp/toto.wav", StructDvdExtract->Path);
 				
 				g_unlink ("/tmp/toto.wav");
-				
-				// SOX
-				/*tagswav_file_GetBitrate (StructDvdExtract->Path, &Channels, &Hertz, &Bits);
-				StrHertz = g_strdup_printf ("%d", Hertz);
-				StrBits = g_strdup_printf ("%d", Bits);
-				conv_with_sox_get_param ("tmp/toto.wav", "/tmp/toto_new.wav", StrHertz, StrBits, "16");
-				conv_to_convert (FALSE, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
-				filelc_get_command_line_remove ();
-				g_free (StrHertz);	StrHertz = NULL;
-				g_free (StrBits);	StrBits = NULL;*/
-				
+								
 				// PEAK
 				// 
 				if (FALSE == conv.bool_stop && TRUE == StructDvdExtract->Var->EtatNormalise && FALSE == VarDvdextract.BoolListIsPeakAlbum) {
@@ -228,15 +220,15 @@
 					WindScan_set_label (StructDvdExtract->Path);
 					VarDvdextract.TTNormPeak ++;
 					
-					pos = filelc_get_command_line_nice ();
-					conv.ArgConv [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
-					conv.ArgConv [ pos++ ] = g_strdup ("--peak");
-					conv.ArgConv [ pos++ ] = g_strdup ("--");
-					conv.ArgConv [ pos++ ] = g_strdup (StructDvdExtract->Path);
-					conv.ArgConv [ pos++ ] = NULL;
-					
-					conv_to_convert (FALSE, NORMALISE_EXEC, "NORMALISE_EXEC Wav -> Peak");
-					filelc_get_command_line_remove ();
+					PtrTabArgs = filelc_AllocTabArgs();
+					pos = 3;
+					PtrTabArgs [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
+					PtrTabArgs [ pos++ ] = g_strdup ("--peak");
+					PtrTabArgs [ pos++ ] = g_strdup ("--");
+					PtrTabArgs [ pos++ ] = g_strdup (StructDvdExtract->Path);
+					PtrTabArgs [ pos++ ] = NULL;
+					conv_to_convert( PtrTabArgs, FALSE, NORMALISE_EXEC, "NORMALISE_EXEC Wav -> Peak");
+					PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 					
 					PRINT("TRAITEMENT NORMALISE PEAK OK");
 					
@@ -247,23 +239,28 @@
 			else {
 				gchar *ptr = NULL;
 				
-				g_print ("\n");
-				g_print ("---------------------------\n");
-				g_print ("SORTIE PAR: Audio: no sound\n");
-				g_print ("---------------------------\n");
-				g_print ("\n");
+				if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
+					g_print ("\n");
+					g_print ("---------------------------\n");
+					g_print ("SORTIE PAR: Audio: no sound\n");
+					g_print ("---------------------------\n");
+					g_print ("\n");
+				}
 				var_dvd.bool_err = 3;
 				
 				if ((ptr = strrchr (dvdextract_get_name_in_list ((GList *)StructDvdExtract->list), '/'))) {
-					g_print ("%s\n", dvdextract_get_name_in_list ((GList *)StructDvdExtract->list));
+					if( TRUE == OptionsCommandLine.BoolVerboseMode )
+						g_print ("%s\n", dvdextract_get_name_in_list ((GList *)StructDvdExtract->list));
 					ptr ++;
-					g_print ("%s\n", ptr);
+					if( TRUE == OptionsCommandLine.BoolVerboseMode )
+						g_print ("%s\n", ptr);
 				}
 			}
 
 			if (TRUE == conv.bool_stop) {
 				g_unlink (StructDvdExtract->Path);
-				g_print ("\n\nARRET PAR L'UTILISATEUR.\n\tSuppression du fichier\n\t[%s]\n", StructDvdExtract->Path);
+				if( TRUE == OptionsCommandLine.BoolVerboseMode )
+					g_print ("\n\nARRET PAR L'UTILISATEUR.\n\tSuppression du fichier\n\t[%s]\n", StructDvdExtract->Path);
 				break;
 			}
 		}
@@ -288,38 +285,40 @@
 						NEW_DVD_EXTRACT *StructExtract = NULL;
 						if (FALSE == conv.bool_stop) {
 							// -- CHERCHER LA MOYENNE PEAK
-							pos = filelc_get_command_line_nice ();
-							conv.ArgConv [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
-							conv.ArgConv [ pos++ ] = g_strdup ("-n");
+							PtrTabArgs = filelc_AllocTabArgs();
+							pos = 3;
+							PtrTabArgs [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
+							PtrTabArgs [ pos++ ] = g_strdup ("-n");
 							// -- AJOUTER LA LISTE DES FICHIERS
 							List = g_list_first (GlistDvdExtract);
 							while (List) {
 								if ((StructExtract = (NEW_DVD_EXTRACT *)List->data) && StructExtract->EtatNormalise == TRUE) {
-									conv.ArgConv [ pos++ ] = g_strdup (StructDvdExtract->Path);
+									PtrTabArgs [ pos++ ] = g_strdup (StructDvdExtract->Path);
 								}
 								List = g_list_next(List);
 							}
-							conv.ArgConv [ pos++ ] = NULL;
-							conv_to_convert (FALSE, NORMALISE_GET_LEVEL, "NORMALISE_GET_LEVEL TEST -> PEAK/GROUP");
-							filelc_get_command_line_remove ();
+							PtrTabArgs [ pos++ ] = NULL;
+							conv_to_convert( PtrTabArgs, FALSE, NORMALISE_GET_LEVEL, "NORMALISE_GET_LEVEL TEST -> PEAK/GROUP");
+							PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 						}
 						if (FALSE == conv.bool_stop) {
 							// -- APPLIQUER LA MOYENNE PEAK-GROUP
-							pos = filelc_get_command_line_nice ();
-							conv.ArgConv [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
-							conv.ArgConv [ pos++ ] = g_strdup_printf ("--gain=%fdB", conv.value_PEAK_RMS_GROUP_ARGS);
+							PtrTabArgs = filelc_AllocTabArgs();
+							pos = 3;
+							PtrTabArgs [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
+							PtrTabArgs [ pos++ ] = g_strdup_printf ("--gain=%fdB", conv.value_PEAK_RMS_GROUP_ARGS);
 							// -- AJOUTER LA LISTE DES FICHIERS
 							List = g_list_first (GlistDvdExtract);
 							while (List) {
 								if ((StructExtract = (NEW_DVD_EXTRACT *)List->data) && StructExtract->EtatNormalise == TRUE) {
-									conv.ArgConv [ pos++ ] = g_strdup (StructExtract->Path);
+									PtrTabArgs [ pos++ ] = g_strdup (StructExtract->Path);
 									StructExtract->Var->EtatNormalise = FALSE;
 								}
 								List = g_list_next(List);
 							}
-							conv.ArgConv [ pos++ ] = NULL;
-							conv_to_convert (FALSE, NORMALISE_EXEC, "NORMALISE_EXEC Wav -> PEAK/GROUP");
-							filelc_get_command_line_remove ();
+							PtrTabArgs [ pos++ ] = NULL;
+							conv_to_convert( PtrTabArgs, FALSE, NORMALISE_EXEC, "NORMALISE_EXEC Wav -> PEAK/GROUP");
+							PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 							
 							PRINT("TRAITEMENT NORMALISE PEAK_COLLECTIF OK");
 						}
@@ -374,11 +373,12 @@
 		GList *listTwo = NULL;
 		gchar *ptr = NULL;
 		
-		gtk_timeout_remove (VarDvdextract.Handler_Timeout);
+		g_source_remove (VarDvdextract.Handler_Timeout);
 
 		WindScan_close ();
 		
-		g_print ("Suppression des structures\n");
+		if( TRUE == OptionsCommandLine.BoolVerboseMode )
+			g_print ("Suppression des structures\n");
 		listOne = g_list_first (GlistDvdExtract);
 		while (listOne) {
 			if ((StructDvdExtract = (NEW_DVD_EXTRACT *)listOne->data)) {
@@ -409,9 +409,9 @@
 		dvd_set_flag_buttons_dvd ();
 		
 		if (FALSE == conv.bool_stop) {
-			NotifySend_msg (_("XCFA: Extraction DVD"), _("Ok"), conv.bool_stop);
+			NotifySend_msg (_("XCFA: DVD rip"), _("Ok"), conv.bool_stop);
 		} else {
-			NotifySend_msg (_("XCFA: Extraction DVD"), _("Arret par l'utilisateur"), conv.bool_stop);
+			NotifySend_msg (_("XCFA: DVD rip"), _("Stop by user"), conv.bool_stop);
 		}
 	}
 	else if (TRUE == VarDvdextract.bool_mess) {
@@ -445,11 +445,16 @@
 	VarDvdextract.bool_update = TRUE;
 	VarDvdextract.BoolListIsPeakAlbum = dvd_get_value_normalise_dvd () == 0 ? TRUE : FALSE;
 	
-	WindScan_open ("Extract With Mplayer", WINDSCAN_PULSE);
-	WindScan_set_label ("Extraction en cours ...");
+	// WindScan_open ("Extract With Mplayer", WINDSCAN_PULSE);
+	wind_scan_init(
+		WindMain,
+		"Extract With Mplayer",
+		WINDSCAN_PULSE
+		);
+	WindScan_set_label ("Extraction in progress ...");
 
 	VarDvdextract.bool_end_pthread = FALSE;
-	VarDvdextract.Handler_Timeout = gtk_timeout_add (100, dvdextract_timeout, 0);
+	VarDvdextract.Handler_Timeout = g_timeout_add (100, dvdextract_timeout, 0);
 
 	pthread_create (&nmr_tid, NULL ,(void *)dvdextract_pthread, (void *)NULL);
 	// DEBUG

xcfa-4.2.8.tar.gz/src/dvd_read.c -> xcfa-5.0.2.tar.gz/src/dvd_read.c Changed

@@ -1,25 +1,25 @@
 /*
 * file : dvd_read.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
 *
 * This file is part of XCFA.
- * 
+ *
 * XCFA is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * at your option) any later version.
- * 
+ *
 * XCFA is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with XCFA. If not, see <http://www.gnu.org/licenses/>.
 */
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <glib.h>
 #include <glib/gstdio.h>
@@ -50,9 +45,7 @@
 #endif
 
 #include "global.h"
-#include "scan.h"
 #include "conv.h"
-#include "configuser.h"
 #include "dvd.h"
 
 /*
@@ -81,78 +74,35 @@
 
 */
 
-typedef struct {
-	gint tst;
-	gchar		*Language;
-	gchar *Lang;
-	gchar		*Format;
-	gint		 Frequency;
-	gchar		*Quantization;
-	gint		 Channels;
-	gchar		*StreamId;
-	gint ValStreamId;
-} DVD_AUDIO;
-
-typedef struct {
-	gchar		*Length;
-} DVD_CHAPTERS;
-
-typedef struct {
-	gint NumTitle;
-	gint		 max_chapter;
-	DVD_CHAPTERS *chapters;
-	gint		 max_audio;
-	DVD_AUDIO *audio;
-	gchar		*length;
-} DVD_TITLE;
-
-
-typedef struct {
-	gchar		*DiscTitle;
-	gint		 LongestTrack;
-
-	gint		 max_cells;
-	gint		 max_subpictures;
-
-	gint		 max_titles;
-	DVD_TITLE *titles;
-
-} DVD_LIST;
-
-DVD_LIST dvd_data = {NULL, 0,0,0,0, NULL};
-
-
 
-void dvdread_remove_list (void)
+void dvdread_remove_list( void )
 {
-	// PRINT_FUNC_LF();
-	if (NULL != GlistDvd) {
-		GList *list = NULL;
-		VAR *var = NULL;
-
-		list = g_list_first (GlistDvd);
-		while (list) {
-			if (NULL != (var = (VAR *)list->data)) { 
-				if (var->def)			{ g_free (var->def);			var->def = NULL;			}
-				if (var->time)			{ g_free (var->time);			var->time = NULL;			}
+	GList	*list = NULL;
+	VAR		*var = NULL;
+	
+	if( NULL != (list = g_list_first( GlistDvd ))) {
+		while( list ) {
+			if( NULL != (var = (VAR *)list->data )) {
+				if( var->def )					{ g_free( var->def );					var->def = NULL;					}
+				if( var->time )					{ g_free( var->time );					var->time = NULL;					}
 				var->GUINT_TempsTotal = 0;
-				if (var->name_file)		{ g_free (var->name_file);		var->name_file = NULL;			}
-				if (var->StaticNameFile)	{ g_free (var->StaticNameFile);		var->StaticNameFile = NULL;		}
-				if (var->StrNumerateTitle)	{ g_free (var->StrNumerateTitle);	var->StrNumerateTitle = NULL;		}
-				if (var->StrNumerateChapter)	{ g_free (var->StrNumerateChapter);	var->StrNumerateChapter = NULL;		}
-				if (var->StrNumberChannel)	{ g_free (var->StrNumberChannel);	var->StrNumberChannel = NULL;		}
-				if (var->StrNumerateStreamId)	{ g_free (var->StrNumerateStreamId);	var->StrNumerateStreamId = NULL;	}
+				if( var->name_file )			{ g_free( var->name_file );				var->name_file = NULL;				}
+				if( var->StaticNameFile )		{ g_free( var->StaticNameFile );		var->StaticNameFile = NULL;			}
+				if( var->StrNumerateTitle )		{ g_free( var->StrNumerateTitle );		var->StrNumerateTitle = NULL;		}
+				if( var->StrNumerateChapter )	{ g_free( var->StrNumerateChapter );	var->StrNumerateChapter = NULL;		}
+				if( var->StrNumberChannel )		{ g_free( var->StrNumberChannel );		var->StrNumberChannel = NULL;		}
+				if( var->StrNumerateStreamId )	{ g_free( var->StrNumerateStreamId );	var->StrNumerateStreamId = NULL;	}
 				g_free (var);
 				var = list->data = NULL;
 			}
-			list = g_list_next (list);
+			list = g_list_next( list );
 		}
-		g_list_free (GlistDvd);
+		g_list_free( GlistDvd );
 		GlistDvd = NULL;
 	}
 }
 
-void dvdread_create_list (TYPE_LIST_DVD type_list_dvd,
+void dvdread_create_list( TYPE_LIST_DVD type_list_dvd,
 			 gchar *def,
 			 gchar *time,
 			 gchar *name_file,
@@ -160,16 +110,14 @@
 			 gint NumerateTitle,
 			 gint NumerateChapter,
 			 gint NumberChannel,
-			 gchar *StrNumerateStreamId)
+			 gchar *StrNumerateStreamId )
 {
-	VAR *var = g_malloc0( sizeof (VAR));
-
+	VAR *var = g_malloc0( sizeof(VAR) );
 	var->type_list_dvd = type_list_dvd;
 	var->def = g_strdup (def ? def : "");
-	
 	var->time = g_strdup (time ? time : "");
 	var->GUINT_TempsTotal = 0;
-	
+
 	if (NULL != time) {
 		guint H = 0;
 		guint M = 0;
@@ -183,13 +131,11 @@
 		M = atoi (Ptr);
 		Ptr += 3;
 		S = atoi (Ptr);
-		
+
 		var->GUINT_TempsTotal = (H * 60) * 60;
 		var->GUINT_TempsTotal += M * 60;
 		var->GUINT_TempsTotal += S;
 	}
-
-
 	var->name_file = g_strdup (name_file ? name_file : "");
 	var->StaticNameFile = g_strdup (var->name_file);
 	var->format_id = format_id;
@@ -200,757 +146,197 @@
 	var->StrNumberChannel = g_strdup_printf ("%d", NumberChannel);
 	var->StrNumerateStreamId = g_strdup (StrNumerateStreamId ? StrNumerateStreamId : "");
 	var->EtatChoix = _COCHE_;
-
 	var->DebutLecture = 0;
 	var->EtatNormalise = FALSE;
-	
-	GlistDvd = g_list_append (GlistDvd, var);
-}
-
-void dvdread_compteur (void)
-{
-	GList *list = NULL;
-	gint title_actif;
-	VAR *var = NULL;
-	gint Ch = 0;
-	gint OldChapter = 0;
-	
-	for (title_actif = 0; title_actif < dvd_data.max_titles; title_actif ++) {
-
-		list = g_list_first (GlistDvd);
-		while (list) {
-			if (NULL != (var = (VAR *)list->data)) {
-				if (var->NumerateTitle == title_actif +1) {
-					if (var->NumerateChapter == 1) {
-						/* Init */
-						Ch = var->GUINT_TempsTotal;
-					}
-					else if (var->NumerateChapter > 1) {
-						/* Ajout */
-						
-						var->DebutLecture += Ch;
-						if (OldChapter == var->NumerateChapter) {
-							Ch += var->GUINT_TempsTotal;
-						} 
-						if (OldChapter != var->NumerateChapter) OldChapter = var->NumerateChapter;
-					}
-				}
-			}
-			list = g_list_next (list);
-		}
-	}
-}
-
-void dvdread_create_list_with_data (void)
-{
-	gint title_actif = -1;
-	gint audio_actif = -1;
-	gint chapter_actif = -1;
-	gchar *str = NULL;
-	gchar *ptr_length = NULL;
-	gchar *name_file = NULL;
-	gchar *format = NULL;
-	gint format_id = 0;
-
-	guint H = 0;
-	guint M = 0;
-	guint S = 0;
-	gchar *Ptr = NULL;
-
-	dvdread_remove_list ();
-
-	dvdread_create_list (_DVD_NAME, dvd_data.DiscTitle, NULL, NULL, 0, 0, 0, 0, NULL);
-
-	for (title_actif = 0; title_actif < dvd_data.max_titles; title_actif ++) {
-
-		if (title_actif +1 == dvd_data.LongestTrack) {
-			str = g_strdup_printf (_("Titre [%02d ** ]"), title_actif +1);
-		}
-		else {
-			str = g_strdup_printf (_("Titre [%02d]"), title_actif +1);
-		}
-		dvdread_create_list (_DVD_TITLE, str, NULL, NULL, 0, 0, 0, 0, NULL);
-		g_free (str);
-		str = NULL;
-
-		if (title_actif +1 == dvd_data.LongestTrack) {
-
-			/* PRECAUTION
-			*/
-			if (dvd_data.titles[ title_actif ].length == NULL) {
-				g_print ("******* SORTIE UN\n");
-				continue;
-			}
-
-			for (audio_actif = 0; audio_actif < dvd_data.titles[ title_actif ].max_audio; audio_actif ++) {
-				if (dvd_data.titles [ title_actif ].audio [ audio_actif ].tst == 0) {
-
-					/* PRECAUTION
-					*/
-					if (dvd_data.titles[ title_actif ].audio[ audio_actif ].Frequency == 0) continue;
-
-					if (strstr (dvd_data.titles[ title_actif ].audio[ audio_actif ].Format, "dts")) {
-						format = g_strdup_printf ("%s", dvd_data.titles[ title_actif ].audio[ audio_actif ].Format);
-						format_id = _DTS_;
-					}
-					else if (strstr (dvd_data.titles[ title_actif ].audio[ audio_actif ].Format, "ac3")) {
-						format = g_strdup_printf ("%s", dvd_data.titles[ title_actif ].audio[ audio_actif ].Format);
-						format_id = _AC3_;
-					}
-					else {
-						format = g_strdup_printf ("%s", dvd_data.titles[ title_actif ].audio[ audio_actif ].Format);
-						format_id = _INCONNU_;
-					}
-
-					str = g_strdup_printf ("Audio: [%02d] %s, %s, %d KHz, %s",
-								audio_actif +1,
-								dvd_data.titles[ title_actif ].audio[ audio_actif ].Language,
-								format,
-								dvd_data.titles[ title_actif ].audio[ audio_actif ].Frequency / 1000,
-								dvd_data.titles[ title_actif ].audio[ audio_actif ].Quantization
-								);
-
-					name_file = g_strdup_printf (_("Fichier_complet_%02d_%s"),
-							audio_actif +1, dvd_data.titles[ title_actif ].audio[ audio_actif ].Lang);
-					
-					Ptr = dvd_data.titles[ title_actif ].length;
-					/*
-					TIME=00:08:36
-					*/
-					H = atoi (Ptr);
-					Ptr += 3;
-					M = atoi (Ptr);
-					Ptr += 3;
-					S = atoi (Ptr);
-					
-					var_dvd.GUINT_TempsTotal = (H * 60) * 60;
-					var_dvd.GUINT_TempsTotal += M * 60;
-					var_dvd.GUINT_TempsTotal += S;
-
-
-					dvdread_create_list (_DVD_DATA_ALL,
-								str,
-								dvd_data.titles[ title_actif ].length,
-								name_file,
-								format_id,
-								title_actif +1,
-								0,
-								dvd_data.titles[ title_actif ].audio[ audio_actif ].Channels,
-								dvd_data.titles[ title_actif ].audio[ audio_actif ].StreamId);
-
-					g_free (name_file); name_file = NULL;
-					g_free (format); format = NULL;
-					g_free (str); str = NULL;
-				}
-			}
-		}
-
-		/* PRECAUTION
-		*/
-		if (NULL == (dvd_data.titles[ title_actif ].length)) {
-			g_print ("******* SORTIE DEUX\n");
-			continue;
-		}
-
-		for (chapter_actif = 0; chapter_actif < dvd_data.titles[ title_actif ].max_chapter; chapter_actif ++) {
-
-			str = g_strdup_printf (_("Chapitre: [%02d]"), chapter_actif +1);
-			dvdread_create_list (_DVD_CHAPTER, str, NULL, NULL, 0, 0, 0, 0, NULL);
-			g_free (str);
-			str = NULL;
-			
-			for (audio_actif = 0; audio_actif < dvd_data.titles[ title_actif ].max_audio; audio_actif ++) {
-
-				if (dvd_data.titles [ title_actif ].audio [ audio_actif ].tst == 0) {
-
-					/* PRECAUTION
-					*/
-					if (dvd_data.titles[ title_actif ].audio[ audio_actif ].Frequency == 0) {
-						g_print ("******* SORTIE TROIS\n");
-						continue;
-					}
-
-					if (dvd_data.titles[ title_actif ].chapters[ chapter_actif ].Length != NULL) {
-						ptr_length = dvd_data.titles[ title_actif ].chapters[ chapter_actif ].Length;
-					}
-					else {
-						ptr_length = dvd_data.titles[ title_actif ].length;
-					}
-
-
-					if (strstr (dvd_data.titles[ title_actif ].audio[ audio_actif ].Format, "dts")) {
-						format = g_strdup_printf ("%s", dvd_data.titles[ title_actif ].audio[ audio_actif ].Format);
-						format_id = _DTS_;
-					}
-					else if (strstr (dvd_data.titles[ title_actif ].audio[ audio_actif ].Format, "ac3")) {
-						format = g_strdup_printf ("%s", dvd_data.titles[ title_actif ].audio[ audio_actif ].Format);
-						format_id = _AC3_;
-					}
-					else {
-						format = g_strdup_printf ("%s", dvd_data.titles[ title_actif ].audio[ audio_actif ].Format);
-						format_id = _INCONNU_;
-					}
-
-					str = g_strdup_printf ("Audio: [%02d] %s, %s, %d KHz, %s",
-								audio_actif +1,
-								dvd_data.titles[ title_actif ].audio[ audio_actif ].Language,
-								format,
-								dvd_data.titles[ title_actif ].audio[ audio_actif ].Frequency / 1000,
-								dvd_data.titles[ title_actif ].audio[ audio_actif ].Quantization
-								);
-
-					name_file = g_strdup_printf (_("Titre_%02d_Chapitre_%02d_audio_%02d_%s"),
-							title_actif+1, chapter_actif+1, audio_actif+1, dvd_data.titles[ title_actif ].audio[ audio_actif ].Lang);
-
-					dvdread_create_list (_DVD_DATA,
-								str,
-								ptr_length,
-								name_file,
-								format_id,
-								title_actif +1,
-								chapter_actif +1,
-								dvd_data.titles[ title_actif ].audio[ audio_actif ].Channels,
-								dvd_data.titles[ title_actif ].audio[ audio_actif ].StreamId);
-					g_free (name_file); name_file = NULL;
-					g_free (format); format = NULL;
-					g_free (str); str = NULL;
-					ptr_length = NULL;
-				}
-			}
-		}
-	}
-}
-
-void dvdread_print_data_struct (void)
-{
-	gint title_actif = -1;
-	gint chapter_actif = -1;
-	gint audio_actif = -1;
-
-	/*PRINT_FUNC_LF();*/
-
-	g_print ("DiscTitle: %s\n", dvd_data.DiscTitle);
-	g_print ("LongestTrack: %d\n", dvd_data.LongestTrack);
-
-	g_print ("max_cells: %d\n", dvd_data.max_cells);
-	g_print ("max_subpictures: %d\n", dvd_data.max_subpictures);
-	g_print ("max_titles: %d\n", dvd_data.max_titles);
-	for (title_actif = 0; title_actif < dvd_data.max_titles; title_actif ++) {
-		g_print ("Title: %02d\n", title_actif +1);
-
-		g_print ("dvd_data.titles[ %02d ].length: %s\n", title_actif +1, dvd_data.titles[ title_actif ].length);
-
-		g_print ("dvd_data.titles[ %02d ].max_chapter: %d\n", title_actif +1, dvd_data.titles[ title_actif ].max_chapter);
-		for (chapter_actif = 0; chapter_actif < dvd_data.titles[ title_actif ].max_chapter; chapter_actif ++) {
-			g_print ("dvd_data.titles[ %02d ].chapters[ %02d ].Length: %s\n",
-					title_actif +1,
-					chapter_actif +1,
-					dvd_data.titles[ title_actif ].chapters[ chapter_actif ].Length);
-		}
-
-		g_print ("dvd_data.titles[ %02d ].max_audio: %d\n", title_actif +1, dvd_data.titles[ title_actif ].max_audio);
-		for (audio_actif = 0; audio_actif < dvd_data.titles[ title_actif ].max_audio; audio_actif ++) {
-			g_print ("dvd_data.titles[ %02d ].audio[ %02d ].Language: %s\n",
-				title_actif +1,
-				audio_actif +1,
-				dvd_data.titles[ title_actif ].audio[ audio_actif ].Language);
-			g_print ("dvd_data.titles[ %02d ].audio[ %02d ].Lang: %s\n",
-				title_actif +1,
-				audio_actif +1,
-				dvd_data.titles[ title_actif ].audio[ audio_actif ].Lang);
-			g_print ("dvd_data.titles[ %02d ].audio[ %02d ].Format: %s\n",
-				title_actif +1,
-				audio_actif +1,
-				dvd_data.titles[ title_actif ].audio[ audio_actif ].Format);
-			g_print ("dvd_data.titles[ %02d ].audio[ %02d ].Frequency: %d\n",
-				title_actif +1,
-				audio_actif +1,
-				dvd_data.titles[ title_actif ].audio[ audio_actif ].Frequency);
-			g_print ("dvd_data.titles[ %02d ].audio[ %02d ].Quantization: %s\n",
-				title_actif +1,
-				audio_actif +1,
-				dvd_data.titles[ title_actif ].audio[ audio_actif ].Quantization);
-			g_print ("dvd_data.titles[ %02d ].audio[ %02d ].Channels: %d\n",
-				title_actif +1,
-				audio_actif +1,
-				dvd_data.titles[ title_actif ].audio[ audio_actif ].Channels);
-			g_print ("dvd_data.titles[ %02d ].audio[ %02d ].StreamId: %s\n",
-				title_actif +1,
-				audio_actif +1,
-				dvd_data.titles[ title_actif ].audio[ audio_actif ].StreamId);
-		}
-	}
-
-}
-
-void dvdread_remove (void)
-{
-	gint title;
-	gint audio;
-	gint chapter;
-
-	/*PRINT_FUNC_LF();*/
-
-	for (title=0; title < dvd_data.max_titles; title ++) {
-
-		for (audio=0; audio < dvd_data.titles[ title ].max_audio; audio ++) {
-			g_free (dvd_data.titles[ title ].audio[ audio ].Language);	dvd_data.titles[ title ].audio[ audio ].Language= NULL;
-			g_free (dvd_data.titles[ title ].audio[ audio ].Lang);		dvd_data.titles[ title ].audio[ audio ].Lang= NULL;
-			g_free (dvd_data.titles[ title ].audio[ audio ].Format);	dvd_data.titles[ title ].audio[ audio ].Format= NULL;
-			g_free (dvd_data.titles[ title ].audio[ audio ].Quantization);	dvd_data.titles[ title ].audio[ audio ].Quantization= NULL;
-			g_free (dvd_data.titles[ title ].audio[ audio ].StreamId);	dvd_data.titles[ title ].audio[ audio ].StreamId= NULL;
-		}
-		g_free (dvd_data.titles[ title ].audio);
-		dvd_data.titles[ title ].audio = NULL;
-
-		for (chapter=0; chapter < dvd_data.titles[ title ].max_chapter; chapter ++) {
-			g_free (dvd_data.titles[ title ].chapters[ chapter ].Length);
-			dvd_data.titles[ title ].chapters[ chapter ].Length= NULL;
-		}
-
-		g_free (dvd_data.titles[ title ].chapters);
-		dvd_data.titles[ title ].chapters = NULL;
-		g_free (dvd_data.titles[ title ].length);
-		dvd_data.titles[ title ].length = NULL;
-	}
-
-	g_free (dvd_data.titles);
-	dvd_data.titles = NULL;
-
-	g_free (dvd_data.DiscTitle);
-	dvd_data.DiscTitle = NULL;
-	dvd_data.LongestTrack = 0;
-	dvd_data.max_cells = 0;
-	dvd_data.max_subpictures = 0;
-	dvd_data.max_titles = 0;
-}
-
-void dvdread_create_recap_audio (void)
-{
-	gint cpt;
-	gchar *LineCommand = NULL;
-	FILE *fp = NULL;
-	gint Dummy;
-
-	// Suppression du fichier precedant si il existe
-	g_unlink ("/tmp/get_infos_dvd.sh");
-	g_unlink ("/tmp/infos_dvd.txt");
-
-	fp = fopen ("/tmp/get_infos_dvd.sh", "w");
-
-	fprintf (fp, "#!/bin/sh\n");
-	fprintf (fp, "\n");
-	fprintf (fp, "set -e\n");
-	fprintf (fp, "\n");
-
-	for (cpt = 0; cpt < dvd_data.max_titles; cpt ++) {
-
-		LineCommand = g_strdup_printf ("mplayer -dvd-device %s dvd://%d -vo null -frames 0 -v 2>&1 | grep aid >> /tmp/infos_dvd.txt",
-					scan_get_text_combo_cd (_DVD_), cpt +1);
-		fprintf (fp, "echo \"Title:%d\" >> /tmp/infos_dvd.txt\n", cpt+1);
-		fprintf (fp, "%s\n", LineCommand);
-		fprintf (fp, "echo \"\" >> /tmp/infos_dvd.txt\n");
-		g_free (LineCommand);
-		LineCommand = NULL;
-	}
 
-	fprintf (fp, "\n");
-
-	fclose (fp);
-
-	Dummy = system ("chmod +x /tmp/get_infos_dvd.sh");
-
-	Dummy = system ("/tmp/get_infos_dvd.sh");
-	g_unlink ("/tmp/get_infos_dvd.sh");
-}
-
-
-typedef struct {
-	gint NumTitle;
-	gint NumLang;
-	gchar StrLang [ 30 ];
-} LIST_AUDIO;
-GList *GListAudio = NULL;
-
-GList *dvdread_remove_ListAudio (GList *p_list)
-{
-	GList *list = NULL;
-	LIST_AUDIO *var = NULL;
-	
-	list = g_list_first (GListAudio);
-	while (list) {
-		if (NULL != (var = (LIST_AUDIO *)list->data)) {
-			g_free (var);
-			var = NULL;
-			list->data = NULL;
-		}
-		list = g_list_next (list);
-	}
-	g_list_free (GListAudio);
-	GListAudio = NULL;
-	return ((GList *)NULL);
-}
-
-gboolean dvdread_syncro (gint NumTitle, gint NumLang, gchar *StrLang)
-{
-	gint t, a;
-	
-	for (t=0; t < dvd_data.max_titles; t++) {
-		
-		if (NumTitle == dvd_data.titles [ t ].NumTitle) {
-		
-			for (a=0; a < dvd_data.titles [ t ].max_audio; a++) {
-				if (NumLang == dvd_data.titles [ t ].audio [ a ].ValStreamId) {
-					dvd_data.titles [ t ].audio [ a ].tst = 0;
-					return (TRUE);
-				}
-			}
-			return (FALSE);
-		}
-	}
-	
-	return (FALSE);
-}
-
-void dvdread_read_info_audio (void)
-{
-	FILE *fp = NULL;
-	size_t size;
-	gchar *buf = NULL;
-	gchar **Larrbuf = NULL;
-	gint line;
-	gchar *ptr = NULL;
-	gint nmr_title = -1;
-	gint max_audio = 0;
-	gint t, a;
-
-	LIST_AUDIO *list_audio = NULL;
-	GList *list = NULL;
-	
-	size = libutils_get_size_file ("/tmp/infos_dvd.txt");
-	buf = (gchar *)g_malloc0 (sizeof (gchar) * (size +10));
-	fp = fopen ("/tmp/infos_dvd.txt", "r");
-	size = fread (buf, size, 1, fp);
-	fclose (fp);
-
-	Larrbuf = g_strsplit (buf, "\n", 0);
-	g_free (buf);
-	buf = NULL;
-
-	for (t=0; t <dvd_data.max_titles; t++) {
-		for (a=0; a<dvd_data.titles [ t ].max_audio; a++) {
-			dvd_data.titles [ t ].audio [ a ].tst = -1;
-		}
-	}
-	
-	/* TEST GLIST
-	*/
-	list_audio = (LIST_AUDIO *)g_malloc0 (sizeof(LIST_AUDIO));
-	nmr_title = -1;
-	for (line=0; Larrbuf[line]; line++) {
-		if ((ptr = strstr (Larrbuf[line], "Title:"))) {
-			ptr += 6;
-			nmr_title = atoi (ptr);
-		}
-		else if ((ptr = strstr (Larrbuf[line], " aid: "))) {
-			/*
-			Title:3
-			audio stream: 0 format: ac3 (5.1) language: en aid: 128.
-			audio stream: 1 format: ac3 (5.1) language: fr aid: 129.
-			audio stream: 2 format: dts (5.1) language: fr aid: 138.
-			*/
-			if (NULL == list_audio) list_audio = (LIST_AUDIO *)g_malloc0 (sizeof(LIST_AUDIO));
-			list_audio->NumTitle = nmr_title;
-			list_audio->NumLang = (gint)atoi(ptr + 6);
-			/*
-			unknown
-			*/
-			while (*ptr != ':') ptr --;
-			ptr ++;
-			ptr ++;
-			t = 0;
-			while (*ptr != ' ') {
-				list_audio->StrLang[ t ++ ] = *ptr ++;
-			}
-			list_audio->StrLang[ t ] = '\0';
-			GListAudio = g_list_append (GListAudio, list_audio);
-			list_audio = NULL;
-		}
-	
-		if (*Larrbuf[line] == '\0') {
-			nmr_title = -1;
-		}
-	}
-	max_audio = 0;
-	list = g_list_first (GListAudio);
-	while (list) {
-		if ((list_audio = (LIST_AUDIO *)list->data)) {
-			dvdread_syncro (list_audio->NumTitle -1, list_audio->NumLang, list_audio->StrLang);
-		}
-		list = g_list_next (list);
-	}
-
-	if (NULL == GListAudio) {
-		for (t=0; t <dvd_data.max_titles; t++) {
-			for (a=0; a<dvd_data.titles [ t ].max_audio; a++) {
-				dvd_data.titles [ t ].audio [ a ].tst = 0;
-			}
-		}
-	}
-	
-	GListAudio = dvdread_remove_ListAudio (GListAudio);
-	
-	g_unlink ("/tmp/infos_dvd.txt");
-	
-	g_strfreev (Larrbuf);
+	GlistDvd = g_list_append (GlistDvd, var);
 }
 
-gboolean dvdread_dvd_read (void)
+gboolean dvdread_dvd_read( void )
 {
 	gchar	**Larrbuf = NULL;
-	gchar	*ptr = NULL;
+	gchar	*Ptr = NULL;
 	gint	line;
-	gint	cpt;
-	gchar	str [ 512 ];
-	gint	title_actif = -1;
-	gint	audio_actif = -1;
-	gint	max_audio = 1;
-	gint	chapter_actif = -1;
-	gint	max_chapters;
-	gint	chapters_per_title;
+	gchar	*Str = NULL;
 	gchar	*buf = NULL;
-	gint	pos;
+	gchar	**PtrTabArgs = NULL;
+	gint	cpt_chapter;
+	gint	cpt_data;
+	gint	LongestTrack = 0;
+	gint	max_line_chapter;
 	
-	dvdread_remove ();
-
-	// PRINT_FUNC_LF();
-	
-	pos = 0;
-	conv.ArgConv [ pos++ ] = "nice";
-	conv.ArgConv [ pos++ ] = "-n";
-	conv.ArgConv [ pos++ ] = "0";
-	conv.ArgConv [ pos++ ] = "lsdvd";
-	conv.ArgConv [ pos++ ] = var_dvd.PathDvd;
-	conv.ArgConv [ pos++ ] = "-x";
-	conv.ArgConv[ pos++ ] = "2>&1";
-	conv.ArgConv [ pos++ ] = NULL;
-
-	// lsdvd_exec ();
-
-	conv_to_convert (FALSE, LSDVD, "NEW2:-> LSDVD");
-	
-	if (NULL != (buf = libutils_get_datas_on_disk ())) {
-		Larrbuf = g_strsplit (buf, "\n", 0);
-		g_free (buf);
-		buf = NULL;
+	gint	Frequency = 0;
+	gchar	*StrTime = NULL;
+	gchar	*StrNameFile = NULL;
+	gint	format_id = _INCONNU_;
+	gint	NumerateTitle = -1;
+	gint	NumerateChapter;
+	gint	NumberChannel = 2;
+	gchar	*StrNumerateStreamId = NULL;
+	gchar	*StrLanguage = NULL;
+	gint	NumerateAudio = 0;
+
+	if( FALSE == g_file_test( "/tmp/data_xcfa.txt", G_FILE_TEST_IS_REGULAR )) {
+		printf("Lecture du contenu de: %s\n",var_dvd.PathDvd );
+		PtrTabArgs = conv_lsdvd_read_get_param( var_dvd.PathDvd );
+		conv_to_convert( PtrTabArgs, FALSE, LSDVD, "NEW2:-> LSDVD" );
+		PtrTabArgs = conv_RemoveTab( PtrTabArgs );
 	}
-	else {
-		PRINT("PROBLEME ALLOC BUF");
+	
+	if( NULL == (buf = libutils_get_datas_on_disk() )) {
+		return FALSE;
 	}
-
-	for (line = 0; Larrbuf[line]; line++) {
-		if ((ptr = strstr (Larrbuf[line], "Disc Title: "))) {
-			if (var_dvd.from.path != NULL && (ptr = strrchr (var_dvd.from.path, '/'))) {
-					ptr ++;
-			}
-			else {
-				ptr += 12;
-			}
-			dvd_data.DiscTitle = g_strdup (ptr);
-		}
-
-		if ((ptr = strstr (Larrbuf[line], "Longest track: "))) {
-			ptr += 15;
-
-			/* ALLOC */
-			dvd_data.LongestTrack = atoi (ptr);
-		}
-
-		if (line > 0 && (ptr = strstr (Larrbuf[line], "Title: "))) {
-				/* ALLOC */
-				dvd_data.max_titles ++;
-		}
+	else if( NULL != buf ) {
+		Larrbuf = g_strsplit( buf, "\n", 0 );
+		g_free( buf );
+		buf = NULL;
 	}
 
-	dvd_data.titles = (DVD_TITLE *)g_malloc0 (sizeof (DVD_TITLE) * dvd_data.max_titles);
-
-	// CHERCHER: le nombre coherent de chapitres
-	chapters_per_title = -1;
-	max_chapters = -1;
-	title_actif = -1;
-	for (line = 1; Larrbuf[line]; line++) {
-		if ((ptr = strstr (Larrbuf[line], "Title: ")) && strstr (Larrbuf[line], "Chapters: ")) {
-
-			title_actif ++;
-
-			if ((ptr = strstr (Larrbuf[line], "Chapters: "))) {
-				for (ptr+=10, cpt=0; *ptr!=','; cpt++,ptr++) str[cpt]=*ptr;
-				str[cpt]='\0';
-
-				max_chapters = atoi (str);
-			}
-		}
-		if ((ptr=strstr (Larrbuf[line], "Chapter: ")) && strstr (Larrbuf[line], ", Length: ")) {
-
-			for (ptr+=9, cpt=0; *ptr!=','; cpt++,ptr++) str[cpt]=*ptr;
-			str[cpt]='\0';
-			chapters_per_title = atoi (str);
+	// Search dvd title 
+	for( line = 0; Larrbuf && Larrbuf[ line ]; line++ )
+		if( NULL != (Ptr = strstr( Larrbuf[ line ], "Disc Title: " ))) {
+			Ptr += 12;
+			dvdread_create_list( _DVD_NAME, Ptr, NULL, NULL, 0, 0, 0, 0, NULL );
+			break;
 		}
-
-		if (*Larrbuf[line] == '\0') {
-			if (chapters_per_title > -1 && max_chapters > -1) {
-				/* ALLOC */
-				dvd_data.titles [ title_actif ].NumTitle = title_actif;
-				dvd_data.titles [ title_actif ].chapters = (DVD_CHAPTERS *)g_malloc0 (sizeof (DVD_CHAPTERS) * (chapters_per_title));
-				dvd_data.titles [ title_actif ].max_chapter = chapters_per_title;
-				chapters_per_title = -1;
-				max_chapters = -1;
-			}
-		}
-	}
-
-	// RECUPERE: tous les parametres pour chaque 'Title: xx'
-	title_actif = -1;
-	for (line = 1; Larrbuf[line]; line++) {
-
-		if ((ptr = strstr (Larrbuf[line], "Title: ")) && strstr (Larrbuf[line], "Length: ")) {
-			ptr += 7;
-			memset (str, '\0', 500);
-
-			title_actif ++;
-			audio_actif = -1;
-			chapter_actif = -1;
-
-			if ((ptr = strstr (Larrbuf[line], "Length: "))) {
-				for (ptr+=8, cpt=0; *ptr!='.'; cpt++,ptr++) str[cpt]=*ptr;
-				str[cpt]='\0';
-				dvd_data.titles[ title_actif ].length = g_strdup (str);
-			}
-			if ((ptr = strstr (Larrbuf[line], "Cells: "))) {
-				for (ptr+=7, cpt=0; *ptr!=','; cpt++,ptr++) str[cpt]=*ptr;
-				str[cpt]='\0';
-				dvd_data.max_cells = atoi (str);
-			}
-			if ((ptr = strstr (Larrbuf[line], "Audio streams: "))) {
-				for (ptr+=15, cpt=0; *ptr!=','; cpt++,ptr++) str[cpt]=*ptr;
-				str[cpt]='\0';
-				max_audio = atoi (str);
-			}
-			if ((ptr = strstr (Larrbuf[line], "Subpictures: "))) {
-				for (ptr+=13, cpt=0; *ptr; cpt++,ptr++) str[cpt]=*ptr;
-				str[cpt]='\0';
-				dvd_data.max_subpictures = atoi (str);
-			}
-
-			dvd_data.titles [ title_actif ].audio = (DVD_AUDIO *)g_malloc0 (sizeof (DVD_AUDIO) * (max_audio));
-			dvd_data.titles [ title_actif ].max_audio = max_audio;
+	
+	// Search Longest track
+	for( line = 0; Larrbuf && Larrbuf[ line ]; line++ )
+		if( NULL != (Ptr = strstr( Larrbuf[ line ], "Longest track: " ))) {
+			Ptr += 15;
+			LongestTrack = atoi( Ptr );
+			break;
 		}
 
-		if ((ptr = strstr (Larrbuf[line], "Audio: "))) {
-
-			audio_actif ++;
-
-			for (ptr+=7, cpt=0; *ptr!=','; cpt++,ptr++) str[cpt]=*ptr;
-			str[cpt]='\0';
-
-			if ((ptr = strstr (Larrbuf[line], "Language: "))) {
-				for (ptr+=10, cpt=0; *ptr!=','; cpt++,ptr++) str[cpt]=*ptr;
-				str[cpt]='\0';
-				dvd_data.titles [ title_actif ].audio [ audio_actif ].Language = g_strdup (str);
-				str [ 2 ] = '\0';
-				dvd_data.titles [ title_actif ].audio [ audio_actif ].Lang = g_strdup (str);
-
-			}
-			if ((ptr = strstr (Larrbuf[line], "Format: "))) {
-				for (ptr+=8, cpt=0; *ptr!=','; cpt++,ptr++) str[cpt]=*ptr;
-				str[cpt]='\0';
-				dvd_data.titles [ title_actif ].audio [ audio_actif ].Format = g_strdup (str);
-			}
-			if ((ptr = strstr (Larrbuf[line], "Frequency: "))) {
-				for (ptr+=11, cpt=0; *ptr!=','; cpt++,ptr++) str[cpt]=*ptr;
-				str[cpt]='\0';
-				dvd_data.titles [ title_actif ].audio [ audio_actif ].Frequency = atoi (str);
-			}
-			if ((ptr = strstr (Larrbuf[line], "Quantization: "))) {
-				for (ptr+=14, cpt=0; *ptr!=','; cpt++,ptr++) str[cpt]=*ptr;
-				str[cpt]='\0';
-				dvd_data.titles [ title_actif ].audio [ audio_actif ].Quantization = g_strdup (str);
-			}
-			if ((ptr = strstr (Larrbuf[line], "Channels: "))) {
-				for (ptr+=10, cpt=0; *ptr!=','; cpt++,ptr++) str[cpt]=*ptr;
-				str[cpt]='\0';
-				dvd_data.titles [ title_actif ].audio [ audio_actif ].Channels = atoi (str);
+	// List Building
+	for( line = 1; Larrbuf && Larrbuf[ line ]; line ++ ) {
+
+		// Title: 15, Length: 02:05:00.600 Chapters: 21, Cells: 22, Audio streams: 04, Subpictures: 06
+		Ptr = Larrbuf[ line ];
+		if( *(Ptr +0) == 'T' &&
+			*(Ptr +1) == 'i' &&
+			*(Ptr +2) == 't' &&
+			*(Ptr +3) == 'l' &&
+			*(Ptr +4) == 'e' &&
+			*(Ptr +5) == ':' &&
+			*(Ptr +6) == ' ' ) {
+
+			NumerateTitle = atoi( Ptr +7 );
+			if( NumerateTitle == LongestTrack )
+					Str = g_strdup_printf( _("Title [%02d ** ]"), NumerateTitle );
+			else 	Str = g_strdup_printf( _("Title [%02d]"), NumerateTitle );
+			dvdread_create_list( _DVD_TITLE, Str, NULL, NULL, 0, 0, 0, 0, NULL );
+			g_free( Str );
+			Str = NULL;
+			
+			// Seeking the number of lines per chapter for: max_line_chapter
+			for( max_line_chapter = line +1; Larrbuf && Larrbuf[ max_line_chapter ]; max_line_chapter ++ ) {
+				Ptr = Larrbuf[ max_line_chapter ];
+				if( *(Ptr +0) == 'T' &&
+					*(Ptr +1) == 'i' &&
+					*(Ptr +2) == 't' &&
+					*(Ptr +3) == 'l' &&
+					*(Ptr +4) == 'e' &&
+					*(Ptr +5) == ':' &&
+					*(Ptr +6) == ' ' ) {
+					break;
+				}
 			}
-			if ((ptr = strstr (Larrbuf[line], "Stream id: "))) {
-				for (ptr+=11, cpt=0; *ptr; cpt++,ptr++) str[cpt]=*ptr;
-				str[cpt]='\0';
-				dvd_data.titles [ title_actif ].audio [ audio_actif ].StreamId = g_strdup (str);
-				dvd_data.titles [ title_actif ].audio [ audio_actif ].ValStreamId = (gint)libutils_hexa_to_int (str);
-				dvd_data.titles [ title_actif ].audio [ audio_actif ].tst = 0;
+			
+			// Search all "Chapter: " in: (line +1) .. max_line_chapter
+			// Chapter: 01, Length: 00:07:26.640, Start Cell: 01
+			for( cpt_chapter = line +1; cpt_chapter < max_line_chapter; cpt_chapter ++ ) {
+				if( NULL != (Ptr = strstr( Larrbuf[ cpt_chapter ], "Chapter: ")) && strstr( Larrbuf[ cpt_chapter ], ", Start Cell: " )) {
+					Ptr += 9;
+					NumerateChapter = atoi( Ptr );
+					Str = g_strdup_printf( _("Chapter: [%02d]"), NumerateChapter );
+					dvdread_create_list( _DVD_CHAPTER, Str, NULL, NULL, 0, 0, 0, 0, NULL );
+					g_free( Str );
+					Str = NULL;
+					
+					if( StrTime )				{ g_free( StrTime );				StrTime = NULL;				}
+					Ptr = strstr( Larrbuf[ cpt_chapter ], "Length: ");
+					Ptr += 8;
+					StrTime = g_strdup( Ptr );
+					Ptr = StrTime;
+					*(Ptr +8 ) = '\0';
+					
+					// Search all "Audio: " in: (line +1) .. max_line_chapter
+					// Audio: 1, Language: en - English, Format: ac3, Frequency: 48000, Quantization: drc, Channels: 6, AP: 0, Content: Undefined, Stream id: 0x80
+					for( cpt_data = line +1; cpt_data < max_line_chapter; cpt_data ++ ) {
+						if( NULL != (Ptr = strstr( Larrbuf[ cpt_data ], "Audio: " ))) {
+							
+							Ptr += 7;
+							NumerateAudio = atoi( Ptr );
+							
+							if( NULL != (Ptr = strstr( Larrbuf[ cpt_data ], "Frequency: " ))) {
+								Ptr += 11;
+								Frequency = atoi( Ptr ) / 1000;
+							}
+							if( NULL != (Ptr = strstr( Larrbuf[ cpt_data ], "Format: " ))) {
+								Ptr += 8;
+								if( *Ptr == 'a' && *(Ptr +1) == 'c' && *(Ptr +2) == '3' )
+									format_id = _AC3_;
+								else if( *Ptr == 'd' && *(Ptr +1) == 't' && *(Ptr +2) == 's' )
+									format_id = _DTS_;
+								else
+									format_id = _INCONNU_;
+							}
+							if( NULL != (Ptr = strstr( Larrbuf[ cpt_data ], "Channels: " ))) {
+								Ptr += 10;
+								NumberChannel = atoi( Ptr );
+							}
+							if( NULL != (Ptr = strstr( Larrbuf[ cpt_data ], "Stream id: " ))) {
+								Ptr += 11;
+								StrNumerateStreamId = g_strdup( Ptr );
+							}
+							if( NULL != (Ptr = strstr( Larrbuf[ cpt_data ], "Language: " ))) {
+								Ptr += 10;
+								StrLanguage = g_strdup( Ptr );
+								for( Ptr = StrLanguage; *Ptr != ','; Ptr ++ );
+								*Ptr = '\0';
+							}
+							
+							StrNameFile = g_strdup_printf( "Title_%d_chapter_%d_audio_%d_lang_%c%c",
+														NumerateTitle,
+														NumerateChapter,
+														NumerateAudio,
+														*(StrLanguage +0),
+														*(StrLanguage +1)
+														);
+														
+							Str = g_strdup_printf( "%s %s %d KHz",
+												StrLanguage,
+												format_id == _AC3_ ? "AC3" : format_id == _DTS_ ? "DTS" : "???",
+												Frequency
+												);
+												
+							dvdread_create_list (_DVD_DATA,		// TYPE_LIST_DVD type_list_dv
+										Str,					// gchar *def
+										StrTime,				// gchar *time
+										StrNameFile,			// gchar *name_file
+										format_id,				// gint format_id
+										NumerateTitle,			// gint NumerateTitle
+										NumerateChapter,		// gint NumerateChapter
+										NumberChannel,			// gint NumberChannel
+										StrNumerateStreamId		// gchar *StrNumerateStreamId
+										);
+										
+							if( Str ) 					{ g_free( Str );					Str = NULL;					}
+							if( StrNameFile ) 			{ g_free( StrNameFile );			StrNameFile = NULL;			}
+							if( StrNumerateStreamId )	{ g_free( StrNumerateStreamId );	StrNumerateStreamId = NULL;	}
+							if( StrLanguage )			{ g_free( StrLanguage );			StrLanguage = NULL;			}
+							
+						}
+					}
+				}
 			}
 		}
-
-		if ((ptr=strstr (Larrbuf[line], "Chapter: ")) && strstr (Larrbuf[line], ", Length: ")) {
-
-			chapter_actif ++;
-
-			for (ptr+=9, cpt=0; *ptr!=','; cpt++,ptr++) str[cpt]=*ptr;
-			str[cpt]='\0';
-
-			ptr=strstr (Larrbuf[line], ", Length: ");
-			for (ptr+=10, cpt=0; *ptr!='.'; cpt++,ptr++) str[cpt]=*ptr;
-			str[cpt]='\0';
-			dvd_data.titles [ title_actif ].chapters [ chapter_actif ].Length = g_strdup (str);
-		}
 	}
-
-	g_strfreev(Larrbuf);
-
-	dvdread_create_recap_audio ();
-	dvdread_read_info_audio ();
-	dvdread_create_list_with_data ();
-	dvdread_compteur ();
+	g_strfreev( Larrbuf );
 
 	return (TRUE);
 }
-/*
-lsdvd /dev/hdd -a
-Can't open disc
-*/
-gboolean dvdread_dvd_found (void)
-{
-	gchar		*buf = NULL;
-	gboolean	 BoolRet = TRUE;
-	gint		pos;
-	
-	// PRINT_FUNC_LF();
-	
-	pos = 0;
-	conv.ArgConv [ pos++ ] = "nice";
-	conv.ArgConv [ pos++ ] = "-n";
-	conv.ArgConv [ pos++ ] = "0";
-	conv.ArgConv [ pos++ ] = "lsdvd";
-	conv.ArgConv [ pos++ ] = var_dvd.PathDvd;
-	conv.ArgConv [ pos++ ] = "-x";
-	conv.ArgConv[ pos++ ] = "2>&1";
-	conv.ArgConv [ pos++ ] = NULL;
-
-	conv_to_convert (FALSE, LSDVD, "NEW1:-> LSDVD");
-	
-	if (NULL == (buf = libutils_get_datas_on_disk ())) {
-		return (FALSE);
-	}
-	if (NULL != buf && (*buf == '\b' || *buf == '\r' || *buf == '\n')) {
-		BoolRet = FALSE;
-	}
-	if (NULL != buf) {
-		g_free (buf);
-		buf = NULL;
-	}
-
-	return (BoolRet);
-}
-

xcfa-4.2.8.tar.gz/src/dvd_table.c -> xcfa-5.0.2.tar.gz/src/dvd_table.c Changed

xcfa-4.2.8.tar.gz/src/extra.c -> xcfa-5.0.2.tar.gz/src/extra.c Changed

xcfa-4.2.8.tar.gz/src/extra.h -> xcfa-5.0.2.tar.gz/src/extra.h Changed

xcfa-4.2.8.tar.gz/src/file.c -> xcfa-5.0.2.tar.gz/src/file.c Changed

@@ -1,25 +1,25 @@
 /*
 * file : file.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
 *
 * This file is part of XCFA.
- * 
+ *
 * XCFA is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * at your option) any later version.
- * 
+ *
 * XCFA is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with XCFA. If not, see <http://www.gnu.org/licenses/>.
 */
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <glib.h>
 #include <glib/gprintf.h>
@@ -125,8 +120,8 @@
 
 
 
-// 
-// 
+//
+//
 gboolean file_get_bool_ReplaygainApply (void)
 {
 	GList *list = NULL;
@@ -139,7 +134,7 @@
 				detail->type_infosong_file_is == FILE_IS_MP3 ||
 				detail->type_infosong_file_is == FILE_IS_FLAC ||
 				detail->type_infosong_file_is == FILE_IS_WAVPACK) {
-				
+
 				if (detail->Etat_ReplayGain != RPG_EFFACER && detail->Etat_ReplayGain != RPG_ATTENTE) {
 				// if (detail->Etat_ReplayGain != RPG_ATTENTE) {
 					return (TRUE);
@@ -150,8 +145,8 @@
 	}
 	return (FALSE);
 }
-// 
-// 
+//
+//
 gboolean file_get_bool_is_conversion (void)
 {
 	GList *list = NULL;
@@ -174,8 +169,8 @@
 	}
 	return (FALSE);
 }
-// 
-// 
+//
+//
 void file_get_etat (guint *total, guint *total_select)
 {
 	gboolean valid;
@@ -232,8 +227,8 @@
 		valid = gtk_tree_model_iter_next (var_file.Adr_Tree_Model, &iter);
 	}
 }
-// 
-// 
+//
+//
 gboolean file_get_line_is_selected (void)
 {
 	GtkTreeModel *model = NULL;
@@ -245,8 +240,8 @@
 	list = gtk_tree_selection_get_selected_rows (var_file.Adr_Line_Selected, &model);
 	return (list ? TRUE : FALSE);
 }
-// 
-// 
+//
+//
 gboolean file_get_etat_normalise (void)
 {
 	GList		*list = NULL;
@@ -267,8 +262,8 @@
 	}
 	return (FALSE);
 }
-// 
-// 
+//
+//
 gboolean file_get_etat_replaygain (void)
 {
 	GList *list = NULL;
@@ -281,7 +276,7 @@
 				detail->type_infosong_file_is == FILE_IS_MP3 ||
 				detail->type_infosong_file_is == FILE_IS_FLAC ||
 				detail->type_infosong_file_is == FILE_IS_WAVPACK) {
-				
+
 				if (detail->Etat_ReplayGain != RPG_ATTENTE) return (TRUE);
 			}
 		}
@@ -289,8 +284,8 @@
 	}
 	return (FALSE);
 }
-// 
-// 
+//
+//
 void file_set_flag_buttons (void)
 {
 	gchar	*Ptr = NULL;
@@ -304,7 +299,7 @@
 	// SELECTION PAR TYPE
 	BoolButtonsAudio [ 1 ] = (NULL == entetefile) ? FALSE : TRUE;
 	gtk_widget_set_sensitive (GTK_WIDGET (GLADE_GET_OBJECT("eventbox_combobox_select_type")), BoolButtonsAudio [ 1 ]);
-	// 
+	//
 	BoolButtonsAudio [ 2 ] = file_get_etat_normalise ();
 	gtk_widget_set_sensitive (GTK_WIDGET (GTK_COMBO_BOX (var_file.AdrComboboxNormalise)), BoolButtonsAudio [ 2 ]);
 	switch (gtk_combo_box_get_active (GTK_COMBO_BOX (var_file.AdrComboboxNormalise))) {
@@ -314,7 +309,7 @@
 		break;
 	case 2:
 	case 3:
-		if (GTK_WIDGET_IS_SENSITIVE(GTK_COMBO_BOX (var_file.AdrComboboxNormalise)) == TRUE) {
+		if (gtk_widget_is_sensitive(GTK_WIDGET(var_file.AdrComboboxNormalise)) == TRUE) {
 			gtk_widget_set_sensitive (GTK_WIDGET (GTK_SPIN_BUTTON (var_file.AdrSpinbuttonNormalise)), TRUE);
 		}
 		else {
@@ -322,14 +317,14 @@
 		}
 		break;
 	}
-	// 
+	//
 	BoolButtonsAudio [ 3 ] = file_get_etat_normalise () ||
 				 file_get_etat_replaygain () ||
 				 file_get_bool_is_conversion ();
 	gtk_widget_set_sensitive (GTK_WIDGET (GLADE_GET_OBJECT("button_conv_file")), BoolButtonsAudio [ 3 ]);
-	
+
 	file_get_etat (&total, &total_select);
-	Ptr = g_strdup_printf (_("Total fichiers: %d, Selections: %d"), total, total_select);
+	Ptr = g_strdup_printf (_("Total files: %d, Selections: %d"), total, total_select);
 	if (NULL != var_file.Adr_Label_Number) {
 		gtk_label_set_use_markup (GTK_LABEL (var_file.Adr_Label_Number), TRUE);
 		gtk_label_set_markup (GTK_LABEL (var_file.Adr_Label_Number), Ptr);
@@ -337,8 +332,8 @@
 	g_free (Ptr);
 	Ptr = NULL;
 }
-// 
-// 
+//
+//
 gboolean file_peak_get_size_is_ok (ETAT_NORMALISE p_EtatNormalise, SIZE_TMP *SizeTmp)
 {
 	GtkTreeIter	 iter;
@@ -410,12 +405,12 @@
 	}
 	return (TRUE);
 }
-// 
-// 
+//
+//
 void on_button_apply_file_clicked (GtkButton *button, gpointer user_data)
 {
 	SIZE_TMP SizeTmp;
-	
+
 	/*if (GTK_BUTTON (GTK_WIDGET (GLADE_GET_OBJECT("button_conv_file"))) == button) {
 		g_print(">NOTEBOOK_FICHIERS_CONVERSION :\n");
 	}
@@ -424,7 +419,7 @@
 	}
 	else if (GTK_BUTTON (GTK_WIDGET (GLADE_GET_OBJECT("button_applique_file_mp3ogg"))) == button) {
 		g_print(">NOTEBOOK_FICHIERS_MP3OGG :\n");
-		
+
 	}
 	else if (GTK_BUTTON (GTK_WIDGET (GLADE_GET_OBJECT("button_tag_appliquer"))) == button) {
 		g_print(">NOTEBOOK_FICHIERS_TAGS :\n");
@@ -441,15 +436,16 @@
 				Str1 = g_strdup_printf (" %s/ = %lu Ko", Config.PathnameTMP, SizeTmp.SizeTmpKo);
 				Str2 = g_strdup_printf (" %lu Ko en selection", SizeTmp.SizeFileKo);
 
-				wininfo_create (
-					_("CAPACITE DOSSIER TEMPORAIRE TROP FAIBLE"),
-					_("Pas assez de place dans le dossier temporaire"),
+				wind_info_init (
+					WindMain,
+					_("TEMPORARY CAPACITY TOO LOW"),
+					_("WARNING: Not enough space available in the temp folder."),
 					 "\n",
 					 Str1,
 					 "\n",
 					 Str2,
 					 "\n\n",
-					_("Veuillez deselectionner des PeakGroup."),
+					_("Please deselect PeakGroup."),
 					"");
 
 				g_free (Str1);
@@ -475,17 +471,17 @@
 			FileTags_appliquer_clicked ();
 			break;
 		}
-		
+
 	}
 }
-// 
-// 
+//
+//
 gchar *file_get_pathname_dest (DETAIL *detail, gchar *NewExt)
 {
 	gchar	*PathName = NULL;
 	gchar	*Dummy = NULL;
 	gchar	*Ptr = NULL;
-	
+
 	switch (gtk_combo_box_get_active (var_file.Adr_combobox_DestFile)) {
 	// CONVERSION VERS LA SOURCE
 	case 0 :
@@ -495,7 +491,7 @@
 		g_free (Dummy);
 		Ptr = Dummy = NULL;
 		break;
-		
+
 	// CHOIX D UNE NOUVELLE DESTINATION
 	case 1 :
 		break;
@@ -517,27 +513,27 @@
 	return ((gchar *)PathName);
 }
 // RENVOIE TRUE SI LE FICHIER EXISTE SINON FALSE
-// 
+//
 gboolean file_test_with_new_ext_exist (DETAIL *detail, gchar *NewExt)
 {
 	gchar		*NewPathName = file_get_pathname_dest (detail, NewExt);
 	gboolean	BoolFileExist;
-	
+
 	BoolFileExist = libutils_test_file_exist (NewPathName);
 
 	g_free (NewPathName);
 	NewPathName = NULL;
-	
+
 	return (BoolFileExist);
 }
-// 
-// 
+//
+//
 void on_label_number_files_realize (GtkWidget *widget, gpointer user_data)
 {
 	var_file.Adr_Label_Number = widget;
 }
-// 
-// 
+//
+//
 gint file_get_scan (void)
 {
 	DETAIL *detail = NULL;
@@ -560,8 +556,8 @@
 	}
 	return (compteur);
 }
-// 
-// 
+//
+//
 gchar *file_get_size (DETAIL *detail)
 {
 	gchar *ptr = NULL;
@@ -576,8 +572,8 @@
 	}
 	return (ptr);
 }
-// 
-// 
+//
+//
 gchar *file_get_time (DETAIL *detail)
 {
 	gchar *ptr = NULL;
@@ -627,8 +623,8 @@
 	}
 	return ((gchar *)ptr);
 }
-// 
-// 
+//
+//
 typedef struct {
 	TYPE_FILE_IS	From;
 	TYPE_FILE_IS	To;
@@ -813,16 +809,16 @@
 	return TRUE;
 }
 // BASCULE DE L ETAT DU FLAG SUR L ETAT SUIVANT
-// 
+//
 ETAT_SELECTION file_get_next_flag (DETAIL *detail, TYPE_FILE_IS type)
 {
 	ETAT_SELECTION	etat = ETAT_ATTENTE;
 	gboolean	BoolFileExist = FALSE;
 	gboolean	BoolOpExpertExist = FALSE;
-	
+
 	if (detail->type_infosong_file_is == type) return (ETAT_PRG_NONE);
 	if (FALSE == file_bool_from_to (detail, type)) return (ETAT_PRG_ABSENT);
-	
+
 	if (type == FILE_IS_WAV) {
 		etat = detail->EtatSelection_Wav;
 		BoolFileExist = file_test_with_new_ext_exist (detail, "wav");
@@ -866,7 +862,7 @@
 		BoolFileExist = file_test_with_new_ext_exist (detail, "mp3");
 		BoolOpExpertExist = Config.StringExpanderLame != NULL && '\0' != *Config.StringExpanderLame ? TRUE : FALSE;
 	}
-	
+
 	switch (etat) {
 	case ETAT_PRG_NONE :
 		if (type == FILE_IS_FLAC) {
@@ -912,21 +908,21 @@
 	case ETAT_SELECT_EXPERT_EXIST :
 		return (TRUE == BoolFileExist ? ETAT_ATTENTE_EXIST : ETAT_ATTENTE);
 	}
-	
+
 	return (etat);
 }
 // RENVOIE L ETAT ACTUEL SOUS FORME D UN PIXBUF
-// 
+//
 GdkPixbuf *file_get_pixbuf (DETAIL *detail, TYPE_FILE_IS type)
 {
 	ETAT_SELECTION	*etat = NULL;
 	gboolean	BoolFileExist = FALSE;
-	
+
 	if( detail->type_infosong_file_is == type ) return ((GdkPixbuf *)NULL);
 	if( FILE_IS_VID_M4A == detail->type_infosong_file_is && type == FILE_IS_M4A ) return ((GdkPixbuf *)NULL);
-	
+
 	if (FALSE == file_bool_from_to (detail, type)) return (var_file.Pixbuf_NotInstall);
-	
+
 	if (detail->type_infosong_file_is != type) {
 
 		if (type == FILE_IS_WAV) { etat = &detail->EtatSelection_Wav;		BoolFileExist = file_test_with_new_ext_exist (detail, "wav"); }
@@ -967,35 +963,31 @@
 	}
 	return ((GdkPixbuf *)NULL);
 }
-// 
-// 
+//
+//
 gchar *file_get_str_level_normalise (DETAIL *detail)
 {
 	gint		 level = 0;
 	gint		 NewLevel = 0;
 	gchar		*Str = NULL;
-	gboolean	 BoolOk = FALSE;
-	
+
 	if (detail->type_infosong_file_is == FILE_IS_WAV) {
 		INFO_WAV *info = (INFO_WAV *)detail->info;
 
 		level = info->LevelDbfs.level;
 		NewLevel = info->LevelDbfs.NewLevel;
-		BoolOk = TRUE;
 	}
 	else if (detail->type_infosong_file_is == FILE_IS_MP3) {
 		INFO_MP3 *info = (INFO_MP3 *)detail->info;
 
 		level = info->LevelDbfs.level;
 		NewLevel = info->LevelDbfs.NewLevel;
-		BoolOk = TRUE;
 	}
 	else if (detail->type_infosong_file_is == FILE_IS_OGG) {
 		INFO_OGG *info = (INFO_OGG *)detail->info;
 
 		level = info->LevelDbfs.level;
 		NewLevel = info->LevelDbfs.NewLevel;
-		BoolOk = TRUE;
 	}
 	else {
 		detail->Etat_Normalise = NORM_NONE;
@@ -1062,7 +1054,7 @@
 	return (Str);
 }
 // CETTE FONCTION RETOURNE UN TYPE DE PIXBUF REFLETANT L ETA DU REPLAGAIN
-// 
+//
 GdkPixbuf *file_get_pixbuf_replaygain (DETAIL *detail, gboolean p_bool_next)
 {
 	GdkPixbuf *PixBuf = NULL;
@@ -1160,8 +1152,8 @@
 
 	return ((GdkPixbuf *)PixBuf);
 }
-// 
-// 
+//
+//
 GdkPixbuf *file_get_pixbuf_trash (DETAIL *detail)
 {
 	if (FILE_TRASH_NONE == detail->EtatTrash) {
@@ -1175,72 +1167,58 @@
 
 	return ((GdkPixbuf *)NULL);
 }
-// 
-// 
+//
+//
 gchar *file_get_name_to_treview( DETAIL *detail )
 {
 	gchar		*NameSrc = libutils_get_name_without_ext( detail->namefile );
 	gchar		*NameEperluette = utf8_eperluette_name( detail->NameDest );
 	gboolean	BoolIdem = FALSE;
-	
+
 	BoolIdem = ( strlen( detail->NameDest ) == strlen( NameSrc ) && 0 == strcmp( detail->NameDest, NameSrc )) ? TRUE : FALSE;
 	g_free (NameSrc);	NameSrc = NULL;
-	
+
 	if( TRUE == BoolIdem )
 		NameSrc = g_strdup( NameEperluette );
 	else	NameSrc = g_strdup_printf( "%s", NameEperluette );
-	
+
 	g_free( NameEperluette );	NameEperluette = NULL;
-	
+
 	return( (gchar *)NameSrc );
 }
-// 
-// 
+//
+//
 void file_make_combobox_select_type (void);
 void file_affiche_glist (void)
 {
 	DETAIL		*detail = NULL;
 	GList		*List = NULL;
-	GList		*FreegList = NULL;
 	GtkTreeIter	iter;
 	GtkAdjustment	*Adj = NULL;
 	gdouble		AdjValue;
-	gint		*TabInt = NULL;		// TABLEAU DES LIGNES EN SELECTION
-	gint		Cpt = 0;		// INDICE DANS LE TABLEAU
 	gint		Line = 0;		// LIGNE EN COURS
 	gchar		*NameDest = NULL;
-	
-	// LIBERATION LIGNE(S) DU GLIST SI NECESSARE
-	// 
-	List = g_list_first (entetefile);
-	while (List) {
-		if ((detail = (DETAIL *)List->data) && TRUE == detail->BoolRemove) {
-			FreegList = List;
-			FreegList->data = NULL;
-			List = g_list_next (List);
-			entetefile = g_list_remove_link (entetefile, FreegList);
-			List = g_list_first (entetefile);
-			continue;
-		}
-		List = g_list_next (List);
-	}
-	
+	gint		NumLineSelected = -1;
+	gboolean	BoolNumLineSelected = FALSE;
+
 	// RECUP SELECTION
-	// 
-	TabInt = libutils_get_tab_selected_line (var_file.Adr_Line_Selected, var_file.Adr_Tree_Model);
+	//
+	NumLineSelected = libutils_get_first_line_is_selected( var_file.Adr_Line_Selected, var_file.Adr_Tree_Model );
+
+	gtk_tree_selection_unselect_all (var_file.Adr_Line_Selected);
 
 	// DELETE TREEVIEW
-	// 
+	//
 	gtk_list_store_clear (GTK_LIST_STORE (var_file.Adr_List_Store));
-	
+
 	// COORDONNEES POUR UN REAJUSTEMENT VISUEL DE LA PAGE
-	// 
+	//
 	Adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (var_file.Adr_scroll));
 	AdjValue = gtk_adjustment_get_value (Adj);
-	
+
 	// AFFICHAGE DE LA LISTE
-	// 
-	Cpt = 0;
+	//
+	// Cpt = 0;
 	Line = 0;
 	List = g_list_first (entetefile);
 	while (List) {
@@ -1253,7 +1231,7 @@
 						COLUMN_FILE_PLAY,		var_file.Pixbuf_FileStop,
 						COLUMN_FILE_TRASH,		file_get_pixbuf_trash (detail),
 						COLUMN_FILE_TYPE,		tags_get_str_type_file_is (detail->type_infosong_file_is),
-						
+
 						COLUMN_FILE_WAV,		file_get_pixbuf (detail, FILE_IS_WAV),
 						COLUMN_FILE_FLAC,		file_get_pixbuf (detail, FILE_IS_FLAC),
 						COLUMN_FILE_APE,		file_get_pixbuf (detail, FILE_IS_APE),
@@ -1263,52 +1241,52 @@
 						COLUMN_FILE_AAC,		file_get_pixbuf (detail, FILE_IS_AAC),
 						COLUMN_FILE_MPC,		file_get_pixbuf (detail, FILE_IS_MPC),
 						COLUMN_FILE_MP3,		file_get_pixbuf (detail, FILE_IS_MP3),
-						
+
 						COLUMN_FILE_TIME,		file_get_time (detail),
 						COLUMN_FILE_NORMALIZE,		file_get_str_level_normalise (detail),
 						COLUMN_FILE_REPLAYGAIN,		file_get_pixbuf_replaygain (detail, FALSE),
 						COLUMN_FILE_NAME,		NameDest,
 						COLUMN_FILE_EDITABLE,		TRUE,
+						//COLUMN_FILE_COLOR,		&YellowColor,
 						COLUMN_FILE_POINTER_STRUCT,	detail,
 						-1);
-		
+
 			// AFFICHE LES EVENTUELLES LIGNES EN SELECTION
-			// 
-			if (NULL != TabInt) {
-				if (Line == *(TabInt + Cpt)) {
-					gtk_tree_selection_select_iter (var_file.Adr_Line_Selected, &iter);
-					Cpt ++;
-				}
-				Line ++;
+			//
+			if( NumLineSelected == Line ) {
+				gtk_tree_selection_select_iter (var_file.Adr_Line_Selected, &iter);
+				BoolNumLineSelected = TRUE;
 			}
 
 			g_free (NameDest);	NameDest = NULL;
+
+			Line ++;
 		}
 		List = g_list_next (List);
 	}
-	
+
 	// SUPPRESSON TABLEAU DES EVENTUELLES LIGNES EN SELECTION
-	// 
-	if (NULL != TabInt) {
-		g_free (TabInt);
-		TabInt = NULL;
-	}
-	else {
-		if (gtk_tree_model_get_iter_first (var_file.Adr_Tree_Model, &iter))
+	//
+	if( NumLineSelected == -1 ) {
+		if (gtk_tree_model_get_iter_first (var_file.Adr_Tree_Model, &iter)) {
 			gtk_tree_selection_select_iter (var_file.Adr_Line_Selected, &iter);
+			BoolNumLineSelected = TRUE;
+		}
+	}
+	if( NumLineSelected > 0 && NULL != entetefile && BoolNumLineSelected == FALSE ) {
+		gtk_tree_selection_select_iter (var_file.Adr_Line_Selected, &iter);
 	}
-
 	// REAJUSTEMENT DE LA LISTE
-	// 
+	//
 	gtk_adjustment_set_value (Adj, AdjValue);
 	gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (var_file.Adr_scroll), Adj);
-	
+
 	file_make_combobox_select_type ();
 	file_pixbuf_update_glist();
 	file_set_flag_buttons ();
 }
-// 
-// 
+//
+//
 void file_maj_file_load (gchar *path)
 {
 	switch (Config.NotebookFile) {
@@ -1334,8 +1312,8 @@
 		break;
 	}
 }
-// 
-// 
+//
+//
 void on_button_import_file_clicked (GtkButton *button, gpointer user_data)
 {
 	switch (Config.NotebookFile) {
@@ -1354,7 +1332,7 @@
 	}
 }
 // SUPPRESSION DES LIGNES DANS LE GLIST entetefile DONT CIBLE N EXISTE PLUS
-// 
+//
 void file_verify_before_conversion (void)
 {
 	GList *list = NULL;
@@ -1364,9 +1342,9 @@
 	list = g_list_first (entetefile);
 	while (list) {
 		if (NULL != (detail = (DETAIL *)list->data)) {
-			// 
+			//
 			// @Shankarius : Suppression d'un fichier qui n'existe plus avant conversion
-			// 
+			//
 			if (FALSE == libutils_test_file_exist (detail->namefile)) {
 				g_print ("@Shankarius: NOT EXIST: DEL IN LISTE -> %s\n", detail->namefile);
 				detail->BoolRemove = TRUE;
@@ -1381,7 +1359,7 @@
 	}
 }
 // MARQUER LES LIGNES POUR LA DESTRUCTION
-// 
+//
 void on_file_button_del_file_clicked (GtkButton *button, gpointer user_data)
 {
 	GtkTreeIter	iter;
@@ -1391,6 +1369,7 @@
 	GtkTreePath	*path;
 	DETAIL		*detail = NULL;
 	gboolean	 BoolPrint = FALSE;
+	gboolean	valid;
 
 	if (NOTEBOOK_FICHIERS == Config.NotebookGeneral) {
 		if (NOTEBOOK_FICHIERS_CONVERSION == Config.NotebookFile) {
@@ -1401,14 +1380,14 @@
 				list = g_list_first (BeginList);
 				while (list) {
 					if ((path = list->data)) {
-						gtk_tree_model_get_iter (model, &iter, path);				
+						gtk_tree_model_get_iter (model, &iter, path);
 						gtk_tree_model_get (var_file.Adr_Tree_Model, &iter, COLUMN_FILE_POINTER_STRUCT, &detail, -1);
 						// MARQUER LA LIGNE DU GLIST A DETRUIRE AVANT LE REAFFICHAGE
 						if (NULL != detail) detail->BoolRemove = TRUE;
 					}
 					list = g_list_next (list);
 				}
-				gtk_tree_selection_unselect_all (var_file.Adr_Line_Selected);
+				// gtk_tree_selection_unselect_all (var_file.Adr_Line_Selected);
 			}
 		}
 		else if (NOTEBOOK_FICHIERS_WAV == Config.NotebookFile) {
@@ -1420,45 +1399,58 @@
 		else if (NOTEBOOK_FICHIERS_TAGS == Config.NotebookFile) {
 			BoolPrint = FileTags_del_file_clicked ();
 		}
-		
+
 		// LA SUPPRESSION SE FAIT DEPUIS LA FONCTION D AFFICHAGE
 		if (TRUE == BoolPrint) {
 			file_affiche_glist ();
 			FileWav_affiche_glist ();
 			FileMp3Ogg_affiche_glist ();
 			FileTags_affiche_glist ();
+
+			// LIST DESTROY with detail->BoolRemove
+			fileanalyze_remove_entetefile_detail();
+
+			// MAKE NEW LIST
+			valid = gtk_tree_model_get_iter_first( var_file.Adr_Tree_Model, &iter );
+			while (valid) {
+				gtk_tree_model_get (var_file.Adr_Tree_Model, &iter, COLUMN_FILE_POINTER_STRUCT, &detail, -1);
+
+				if( NULL != detail )
+					entetefile = g_list_append( entetefile, detail );
+
+				valid = gtk_tree_model_iter_next( var_file.Adr_Tree_Model, &iter );
+			}
 		}
 	}
 }
-// 
-// 
+//
+//
 void on_combobox_dest_file_realize (GtkWidget *widget, gpointer user_data)
 {
 	var_file.Adr_combobox_DestFile = GTK_COMBO_BOX (widget);
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), _("Conversion(s) vers la source"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), _("Choix d'une nouvelle destination"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_DestFile), _("Conversion(s) to source"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_DestFile), _("Select a new destination"));
 	switch (Config.NotebookFile) {
 	case NOTEBOOK_FICHIERS_CONVERSION :
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), Config.PathDestinationFileAll);
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_DestFile), Config.PathDestinationFileAll);
 		gtk_combo_box_set_active (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), Config.TabIndiceComboDestFile[ NOTEBOOK_FICHIERS_CONVERSION ]);
 		break;
 	case NOTEBOOK_FICHIERS_WAV :
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), Config.PathDestinationFileWav);
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_DestFile), Config.PathDestinationFileWav);
 		gtk_combo_box_set_active (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), Config.TabIndiceComboDestFile[ NOTEBOOK_FICHIERS_WAV ]);
 		break;
 	case NOTEBOOK_FICHIERS_MP3OGG :
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), Config.PathDestinationFileMp3Ogg);
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_DestFile), Config.PathDestinationFileMp3Ogg);
 		gtk_combo_box_set_active (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), Config.TabIndiceComboDestFile[ NOTEBOOK_FICHIERS_MP3OGG ]);
 		break;
 	case NOTEBOOK_FICHIERS_TAGS :
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), Config.PathDestinationFileTags);
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_DestFile), Config.PathDestinationFileTags);
 		gtk_combo_box_set_active (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), Config.TabIndiceComboDestFile[ NOTEBOOK_FICHIERS_TAGS ]);
 		break;
 	}
 }
-// 
-// 
+//
+//
 void file_make_combobox_select_type (void)
 {
 	GList	*list = NULL;
@@ -1504,41 +1496,39 @@
 		list = g_list_next (list);
 	}
 
-	// libcombo_alloc (GTK_COMBO_BOX (var_file.Adr_combobox_select_type));
 	libcombo_remove_options (GTK_COMBO_BOX (var_file.Adr_combobox_select_type));
-	
-	gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_select_type), _("Select type: --"));
-	if (bool_flac > 0) { g_sprintf (Str, "%03d FLAC", bool_flac);	gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_select_type), Str);	}
-	if (bool_wav > 0) { g_sprintf (Str, "%03d WAV", bool_wav);		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_select_type), Str);	}
-	if (bool_mp3 > 0) { g_sprintf (Str, "%03d MP3", bool_mp3);		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_select_type), Str);	}
-	if (bool_ogg > 0) { g_sprintf (Str, "%03d OGG", bool_ogg);		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_select_type), Str);	}
-	if (bool_m4a > 0) { g_sprintf (Str, "%03d M4A", bool_m4a);		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_select_type), Str);	}
-	if (bool_aac > 0) { g_sprintf (Str, "%03d AAC", bool_aac);		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_select_type), Str);	}
-	if (bool_shn > 0) { g_sprintf (Str, "%03d SHN", bool_shn);		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_select_type), Str);	}
-	if (bool_wma > 0) { g_sprintf (Str, "%03d WMA", bool_wma);		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_select_type), Str);	}
-	if (bool_rm > 0) { g_sprintf (Str, "%03d RM", bool_rm);		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_select_type), Str);	}
-	if (bool_dts > 0) { g_sprintf (Str, "%03d DTS", bool_dts);		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_select_type), Str);	}
-	if (bool_aiff > 0) { g_sprintf (Str, "%03d AIF", bool_aiff);	gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_select_type), Str);	}
-	if (bool_mpc > 0) { g_sprintf (Str, "%03d MPC", bool_mpc);		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_select_type), Str);	}
-	if (bool_ape > 0) { g_sprintf (Str, "%03d APE", bool_ape);		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_select_type), Str);	}
-	if (bool_wavpack > 0) { g_sprintf (Str, "%03d WAVPACK", bool_wavpack);	gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_select_type), Str);	}
+
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_select_type), _("Select type: --"));
+	if (bool_flac > 0) { g_sprintf (Str, "%03d FLAC", bool_flac);	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_select_type), Str);	}
+	if (bool_wav > 0) { g_sprintf (Str, "%03d WAV", bool_wav);		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_select_type), Str);	}
+	if (bool_mp3 > 0) { g_sprintf (Str, "%03d MP3", bool_mp3);		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_select_type), Str);	}
+	if (bool_ogg > 0) { g_sprintf (Str, "%03d OGG", bool_ogg);		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_select_type), Str);	}
+	if (bool_m4a > 0) { g_sprintf (Str, "%03d M4A", bool_m4a);		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_select_type), Str);	}
+	if (bool_aac > 0) { g_sprintf (Str, "%03d AAC", bool_aac);		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_select_type), Str);	}
+	if (bool_shn > 0) { g_sprintf (Str, "%03d SHN", bool_shn);		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_select_type), Str);	}
+	if (bool_wma > 0) { g_sprintf (Str, "%03d WMA", bool_wma);		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_select_type), Str);	}
+	if (bool_rm > 0) { g_sprintf (Str, "%03d RM", bool_rm);		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_select_type), Str);	}
+	if (bool_dts > 0) { g_sprintf (Str, "%03d DTS", bool_dts);		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_select_type), Str);	}
+	if (bool_aiff > 0) { g_sprintf (Str, "%03d AIF", bool_aiff);	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_select_type), Str);	}
+	if (bool_mpc > 0) { g_sprintf (Str, "%03d MPC", bool_mpc);		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_select_type), Str);	}
+	if (bool_ape > 0) { g_sprintf (Str, "%03d APE", bool_ape);		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_select_type), Str);	}
+	if (bool_wavpack > 0) { g_sprintf (Str, "%03d WAVPACK", bool_wavpack);	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_select_type), Str);	}
 	gtk_combo_box_set_active (GTK_COMBO_BOX (var_file.Adr_combobox_select_type), 0);
 
 	bool_val = bool_flac + bool_wav + bool_mp3 + bool_ogg + bool_m4a + bool_aac + bool_shn + bool_wma + bool_rm + bool_dts + bool_aiff + bool_mpc + bool_ape + bool_wavpack;
 	gtk_widget_set_sensitive (GTK_WIDGET (var_file.Adr_combobox_select_type), (bool_val > 0) ? TRUE : FALSE);
 }
-// 
-// 
+//
+//
 void on_combobox_select_type_realize (GtkWidget *widget, gpointer user_data)
 {
-	// libcombo_alloc (GTK_COMBO_BOX (widget));
 	// gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Select type: --"));
 	// gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
 	var_file.Adr_combobox_select_type = GTK_COMBO_BOX (widget);
 	file_make_combobox_select_type ();
 }
-// 
-// 
+//
+//
 void on_combobox_select_type_changed (GtkComboBox *combobox, gpointer user_data)
 {
 	gchar *ptr = NULL;
@@ -1551,7 +1541,7 @@
 	if (var_file.Adr_combobox_select_type != NULL) {
 		if ((nmr = gtk_combo_box_get_active (GTK_COMBO_BOX (var_file.Adr_combobox_select_type)) > 0)) {
 
-			ptr = gtk_combo_box_get_active_text (GTK_COMBO_BOX (var_file.Adr_combobox_select_type));
+			ptr = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (var_file.Adr_combobox_select_type));
 			gtk_combo_box_set_active (GTK_COMBO_BOX (var_file.Adr_combobox_select_type), 0);
 			if (NULL != strstr (ptr, "FLAC")) type_file_is = FILE_IS_FLAC;
 			if (NULL != strstr (ptr, "WAV")) type_file_is = FILE_IS_WAV;
@@ -1587,20 +1577,19 @@
 		}
 	}
 }
-// 
-// 
+//
+//
 void on_combobox_normalise_file_realize (GtkWidget *widget, gpointer user_data)
 {
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Peak/album"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Peak"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Mix (scan)Rms/album"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Fix (scan)Rms"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("Peak/album"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("Peak"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("Mix (scan)Rms/album"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("Fix (scan)Rms"));
 	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
 	var_file.AdrComboboxNormalise = GTK_COMBO_BOX (widget);
 }
-// 
-// 
+//
+//
 void on_combobox_normalise_file_changed (GtkComboBox *combobox, gpointer user_data)
 {
 	GList		*list = NULL;
@@ -1670,15 +1659,15 @@
 
 	file_pixbuf_update_glist ();
 }
-// 
-// 
+//
+//
 void on_spinbutton_choix_niveau_file_realize (GtkWidget *widget, gpointer user_data)
 {
 	var_file.AdrSpinbuttonNormalise = GTK_SPIN_BUTTON (widget);
 	gtk_spin_button_set_value (var_file.AdrSpinbuttonNormalise, -10);
 }
-// 
-// 
+//
+//
 void on_spinbutton_choix_niveau_file_value_changed (GtkSpinButton *spinbutton, gpointer user_data)
 {
 	gint		 FicLevelMix = (gint)gtk_spin_button_get_value (var_file.AdrSpinbuttonNormalise);
@@ -1723,8 +1712,8 @@
 	}
 	file_pixbuf_update_glist ();
 }
-// 
-// 
+//
+//
 void file_maj_destination (gchar *path)
 {
 	if (TRUE == libutils_test_write (path)) {
@@ -1733,45 +1722,45 @@
 			g_free (Config.PathDestinationFileAll);
 			Config.PathDestinationFileAll = NULL;
 			Config.PathDestinationFileAll = g_strdup (path);
-			gtk_combo_box_remove_text (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), 2);
-			gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), Config.PathDestinationFileAll);
+			gtk_combo_box_text_remove (GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_DestFile), 2 );
+			gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_DestFile), Config.PathDestinationFileAll);
 			gtk_combo_box_set_active (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), Config.TabIndiceComboDestFile[ NOTEBOOK_FICHIERS_CONVERSION ]);
 			break;
 		case NOTEBOOK_FICHIERS_WAV :
 			g_free (Config.PathDestinationFileWav);
 			Config.PathDestinationFileWav = NULL;
 			Config.PathDestinationFileWav = g_strdup (path);
-			gtk_combo_box_remove_text (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), 2);
-			gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), Config.PathDestinationFileWav);
+			gtk_combo_box_text_remove (GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_DestFile), 2);
+			gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_DestFile), Config.PathDestinationFileWav);
 			gtk_combo_box_set_active (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), Config.TabIndiceComboDestFile[ NOTEBOOK_FICHIERS_WAV ]);
 			break;
 		case NOTEBOOK_FICHIERS_MP3OGG :
 			g_free (Config.PathDestinationFileMp3Ogg);
 			Config.PathDestinationFileMp3Ogg = NULL;
 			Config.PathDestinationFileMp3Ogg = g_strdup (path);
-			gtk_combo_box_remove_text (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), 2);
-			gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), Config.PathDestinationFileMp3Ogg);
+			gtk_combo_box_text_remove (GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_DestFile), 2);
+			gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_DestFile), Config.PathDestinationFileMp3Ogg);
 			gtk_combo_box_set_active (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), Config.TabIndiceComboDestFile[ NOTEBOOK_FICHIERS_MP3OGG ]);
 			break;
 		case NOTEBOOK_FICHIERS_TAGS :
 			g_free (Config.PathDestinationFileTags);
 			Config.PathDestinationFileTags = NULL;
 			Config.PathDestinationFileTags = g_strdup (path);
-			gtk_combo_box_remove_text (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), 2);
-			gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), Config.PathDestinationFileTags);
+			gtk_combo_box_text_remove (GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_DestFile), 2);
+			gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_DestFile), Config.PathDestinationFileTags);
 			gtk_combo_box_set_active (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), Config.TabIndiceComboDestFile[ NOTEBOOK_FICHIERS_TAGS ]);
 			break;
 		}
 		file_pixbuf_update_glist ();
 	}
 }
-// 
-// 
+//
+//
 void on_combobox_dest_file_changed (GtkComboBox *combobox, gpointer user_data)
 {
 	// file_combobox_dest_file_changed ();
 	if (NULL != var_file.Adr_combobox_DestFile) {
-				
+
 		switch (gtk_combo_box_get_active (var_file.Adr_combobox_DestFile)) {
 		// CONVERSIONS VERS LA SOURCE
 		case 0 :
@@ -1805,7 +1794,7 @@
 	}
 }
 // INIT TREVIEW
-// 
+//
 static void file_cell_edited (GtkCellRendererText *cell, const gchar *path_string, const gchar *new_text, gpointer data)
 {
 	GtkTreeModel *model = (GtkTreeModel *)data;
@@ -1820,26 +1809,26 @@
 		DETAIL	*detail = NULL;
 		gchar	*StrVerif = NULL;
 		gchar	*ptr = NULL;
-		
+
 		StrVerif = g_strdup (new_text );
 		if (NULL != strchr (StrVerif, '/')) {
 			while (NULL != (ptr = strchr (StrVerif, '/'))) {
 				strcpy (ptr, ptr+1);
 			}
 		}
-		
+
 		gtk_tree_model_get (model, &iter, COLUMN_FILE_NAME, &old_text, -1);
 		g_free (old_text);	old_text = NULL;
 
 		gtk_tree_model_get (var_file.Adr_Tree_Model, &iter, COLUMN_FILE_POINTER_STRUCT, &detail, -1);
 		if(NULL != detail) {
-			
+
 			// STOCKE LE NOM DE FICHIER ORIGINAL
 			if (NULL != detail->NameDest) {
 				g_free (detail->NameDest);	detail->NameDest = NULL;
 			}
-			
-			// LE NOM D'ORIGINE 
+
+			// LE NOM D'ORIGINE
 			if( 0 == strlen( StrVerif )) {
 				// POUR L'AFFICHAGE
 				g_free( StrVerif );	StrVerif = NULL;
@@ -1905,14 +1894,14 @@
 					COLUMN_FILE_WAVPACK,
 					file_get_pixbuf (detail, FILE_IS_WAVPACK),
 					-1);
-		
+
 		g_free (StrVerif);	StrVerif = NULL;
 	}
 	gtk_tree_path_free (path);
 	file_pixbuf_update_glist();
 }
 // SELECTION DES COLONNES TypeFileIs DONT LES LIGNES SONT EN SELECTION
-// 
+//
 void file_select_from_click_column (TYPE_FILE_IS TypeFileIs)
 {
 	GtkTreeIter	iter;
@@ -1924,7 +1913,7 @@
 	gboolean	 valid;
 
 	model = gtk_tree_view_get_model (GTK_TREE_VIEW(var_file.Adr_TreeView));
-	
+
 	// RECUP. DE LA LIGNE EN SELECTION ET VALIDATION
 	if (NULL != (BeginList = gtk_tree_selection_get_selected_rows (var_file.Adr_Line_Selected, &model))) {
 		list = g_list_first (BeginList);
@@ -1932,7 +1921,7 @@
 			if ((path = list->data)) {
 				gtk_tree_model_get_iter (model, &iter, path);
 				gtk_tree_model_get (var_file.Adr_Tree_Model, &iter, COLUMN_FILE_POINTER_STRUCT, &detail, -1);
-				
+
 				if (TypeFileIs == FILE_IS_WAV) {
 					detail->EtatSelection_Wav = file_get_next_flag (detail, FILE_IS_WAV);
 					gtk_list_store_set (var_file.Adr_List_Store,
@@ -2091,8 +2080,8 @@
 	}
 	file_set_flag_buttons ();
 }
-// 
-// 
+//
+//
 void file_pixbuf_update_glist (void)
 {
 	GtkTreeIter iter;
@@ -2101,18 +2090,18 @@
 	GdkPixbuf *pixbuf = NULL;
 
 	if (var_file.Adr_Tree_Model == NULL) return;
-	
+
 	valid = gtk_tree_model_get_iter_first (var_file.Adr_Tree_Model, &iter);
 	while (valid) {
 		gtk_tree_model_get (var_file.Adr_Tree_Model, &iter, COLUMN_FILE_POINTER_STRUCT, &detail, -1);
 		if (NULL != detail) {
-			
+
 			// pixbuf = file_get_pixbuf_play (detail, detail->EtatPlay);
 			// gtk_list_store_set (var_file.Adr_List_Store, &iter, COLUMN_FILE_PLAY, pixbuf, -1);
-			
+
 			pixbuf = file_get_pixbuf_trash (detail);
 			gtk_list_store_set (var_file.Adr_List_Store, &iter, COLUMN_FILE_TRASH, pixbuf, -1);
-			
+
 			pixbuf = file_get_pixbuf (detail, FILE_IS_FLAC);
 			gtk_list_store_set (var_file.Adr_List_Store, &iter, COLUMN_FILE_FLAC, pixbuf, -1);
 
@@ -2155,8 +2144,8 @@
 
 	file_set_flag_buttons ();
 }
-// 
-// 
+//
+//
 void file_set_etat_column_normalise (void)
 {
 	GList		*list = NULL;
@@ -2168,15 +2157,15 @@
 	GtkTreePath	*path;
 	gboolean	valid;
 	gint		NbrNormalise = 0;
-	
+
 	model = gtk_tree_view_get_model (GTK_TREE_VIEW(var_file.Adr_TreeView));
 
 	// RECUP. DES LIGNES EN SELECTION POUR LA SELECTION
-	// 
+	//
 	if (NULL != (BeginList = gtk_tree_selection_get_selected_rows (var_file.Adr_Line_Selected, &model))) {
 		list = g_list_first (BeginList);
 		while (list) {
-			if ((path = list->data)) {				
+			if ((path = list->data)) {
 				gtk_tree_model_get_iter (model, &iter, path);
 				gtk_tree_model_get (var_file.Adr_Tree_Model, &iter, COLUMN_FILE_POINTER_STRUCT, &detail, -1);
 				if (NULL != detail) {
@@ -2185,9 +2174,9 @@
 					 detail->type_infosong_file_is == FILE_IS_WAV) {
 
 						if (NbrNormalise ++ >= MAX_ARG_CONV) break;
-						
+
 						if (detail->Etat_Normalise > NORM_READY_FOR_SELECT) {
-							
+
 							detail->Etat_Normalise = NORM_READY_FOR_SELECT;
 							detail->Etat_Scan = ETAT_SCAN_NONE;
 						}
@@ -2224,7 +2213,7 @@
 		}
 	}
 	// SINON SUPPRESSION DES SELECTIONS
-	// 
+	//
 	else {
 		valid = gtk_tree_model_get_iter_first (var_file.Adr_Tree_Model, &iter);
 		while (valid) {
@@ -2237,8 +2226,8 @@
 	if (BoolScanACtion == TRUE) FileScanDB_action (TRUE);
 	file_pixbuf_update_glist ();
 }
-// 
-// 
+//
+//
 void file_set_etat_column_replaygain (void)
 {
 	GList		*list = NULL;
@@ -2248,11 +2237,11 @@
 	GList		*BeginList = NULL;
 	GtkTreePath	*path;
 	gboolean	 valid;
-	
+
 	model = gtk_tree_view_get_model (GTK_TREE_VIEW(var_file.Adr_TreeView));
 
 	// RECUP. DES LIGNES EN SELECTION POUR LA SELECTION
-	// 
+	//
 	if (NULL != (BeginList = gtk_tree_selection_get_selected_rows (var_file.Adr_Line_Selected, &model))) {
 		list = g_list_first (BeginList);
 		while (list) {
@@ -2267,7 +2256,7 @@
 		}
 	}
 	// SINON SUPPRESSION DES SELECTIONS
-	// 
+	//
 	else {
 		valid = gtk_tree_model_get_iter_first (var_file.Adr_Tree_Model, &iter);
 		while (valid) {
@@ -2278,8 +2267,8 @@
 	}
 	file_pixbuf_update_glist ();
 }
-// 
-// 
+//
+//
 void file_set_etat_column_trash (void)
 {
 	GList		*list = NULL;
@@ -2289,11 +2278,11 @@
 	GList		*BeginList = NULL;
 	GtkTreePath	*path;
 	gboolean	 valid;
-	
+
 	model = gtk_tree_view_get_model (GTK_TREE_VIEW(var_file.Adr_TreeView));
 
 	// RECUP. DES LIGNES EN SELECTION POUR LA SELECTION
-	// 
+	//
 	if (NULL != (BeginList = gtk_tree_selection_get_selected_rows (var_file.Adr_Line_Selected, &model))) {
 		list = g_list_first (BeginList);
 		while (list) {
@@ -2308,7 +2297,7 @@
 		}
 	}
 	// SINON SUPPRESSION DES SELECTIONS
-	// 
+	//
 	else {
 		valid = gtk_tree_model_get_iter_first (var_file.Adr_Tree_Model, &iter);
 		while (valid) {
@@ -2319,14 +2308,14 @@
 	}
 	file_pixbuf_update_glist ();
 }
-// 
-// 
+//
+//
 gboolean file_ok_to_normalise (void)
 {
 	GList		*list = NULL;
 	DETAIL		*detail = NULL;
 	gint		Nbr = 0;
-	
+
 	list = g_list_first (entetefile);
 	while (list) {
 		if (NULL != (detail = (DETAIL *)list->data)) {
@@ -2342,8 +2331,8 @@
 	}
 	return (Nbr < MAX_ARG_CONV ? TRUE : FALSE);
 }
-// 
-// 
+//
+//
 void file_selected_column (GtkTreeViewColumn *treeviewcolumn, gpointer user_data)
 {
 	gint		NumColonne = GPOINTER_TO_INT(user_data);
@@ -2365,8 +2354,8 @@
 	}
 	file_select_from_click_column (TypeFileIs);
 }
-// 
-// 
+//
+//
 gboolean file_event_click_mouse (GtkWidget *treeview, GdkEventButton *event, gpointer data)
 {
 	gboolean BoolFlac = FALSE;
@@ -2402,18 +2391,18 @@
 	GtkTreeViewColumn *column;
 	GtkTreeViewColumn *ColumnDum;
 	gint i;
-	
+
 	GtkTreeIter iter;
 	GtkTreeModel *model = (GtkTreeModel *)data;
 	// GdkPixbuf *Pixbuf = NULL;
 	DETAIL *detail = NULL;
 	gint Pos_X = 0, Pos_Y = 0;
-	gboolean bool_key_Control = (keys.keyval == GDK_Control_L || keys.keyval == GDK_Control_R);
-	gboolean bool_key_Shift = (keys.keyval == GDK_Shift_L || keys.keyval == GDK_Shift_R);
+	gboolean bool_key_Control = (keys.keyval == GDK_KEY_Control_L || keys.keyval == GDK_KEY_Control_R);
+	gboolean bool_key_Shift = (keys.keyval == GDK_KEY_Shift_L || keys.keyval == GDK_KEY_Shift_R);
 	gboolean bool_key_Release = (bool_key_Control == FALSE && bool_key_Shift == FALSE);
 	gboolean bool_click_gauche = (event->button == 1);
-	gboolean bool_click_droit = (event->button == 3);	
-	
+	gboolean bool_click_droit = (event->button == 3);
+
 	/* Single clicks only */
 	if (event->type != GDK_BUTTON_PRESS) return (FALSE);
 
@@ -2436,7 +2425,7 @@
 	gtk_tree_model_get_iter (model, &iter, path);
 	gtk_tree_model_get (var_file.Adr_Tree_Model, &iter, COLUMN_FILE_POINTER_STRUCT, &detail, -1);
 	if (NULL == detail) return (FALSE);
-	
+
 	/* IDEE POUR REMPLACER LES COMPARAISON PAR NOMS. EXEMPLES:
 	 * 	PLAY	= 0
 	 * 	TRASH	= 1
@@ -2472,17 +2461,19 @@
 			break;
 		}
 	}
-	
-	
+	if( BoolSelectColNom );
+	if( BoolSelectColTime );
+	if( BoolSelectColType );
+
 	BoolSelectColNorm &= (detail->type_infosong_file_is == FILE_IS_WAV ||
 			 detail->type_infosong_file_is == FILE_IS_OGG ||
 			 detail->type_infosong_file_is == FILE_IS_MP3);
-	
+
 	if (FALSE == BoolSelectColNorm && FALSE == BoolSelectColReplayGain) {
 		if (Pos_X < 18 || Pos_X > 30) return (FALSE);
 		if (Pos_Y < 6 || Pos_Y > 18) return (FALSE);
 	}
-	
+
 	if (bool_click_droit &&
 	 (BoolSelectColFlac ||
 	 BoolSelectColWav ||
@@ -2508,9 +2499,9 @@
 		else if (BoolSelectColWavP) {Pixbuf = file_get_pixbuf (detail, FILE_IS_WAVPACK);	TypeFileIs = FILE_IS_WAVPACK;	}
 
 		if (Pixbuf != NULL && Pixbuf != var_file.Pixbuf_NotInstall) popup_file (detail, TypeFileIs);*/
-	 
+
 	 	TYPE_FILE_IS TypeFileIs = FILE_IS_NONE;
-		
+
 		if (BoolSelectColFlac)		TypeFileIs = FILE_IS_FLAC;
 		else if (BoolSelectColWav)	TypeFileIs = FILE_IS_WAV;
 		else if (BoolSelectColMp3)	TypeFileIs = FILE_IS_MP3;
@@ -2520,7 +2511,7 @@
 		else if (BoolSelectColMpc)	TypeFileIs = FILE_IS_MPC;
 		else if (BoolSelectColApe)	TypeFileIs = FILE_IS_APE;
 		else if (BoolSelectColWavP)	TypeFileIs = FILE_IS_WAVPACK;
-		
+
 		popup_file (detail, TypeFileIs);
 		return (FALSE);
 	}
@@ -2541,7 +2532,7 @@
 		popup_trash ();
 	}
 
-	
+
 	if (detail->type_infosong_file_is != FILE_IS_FLAC && BoolSelectColFlac) {
 		BoolFlac = file_bool_from_to (detail, FILE_IS_FLAC);
 	}
@@ -2569,13 +2560,13 @@
 	else if (detail->type_infosong_file_is != FILE_IS_WAVPACK && BoolSelectColWavP) {
 		BoolWavPack = file_bool_from_to (detail, FILE_IS_WAVPACK);
 	}
-	
+
 	if (BoolFlac || BoolWav || BoolMp3 || BoolOgg || BoolShn || BoolM4a || BoolAac || BoolWma || BoolMpc || BoolApe || BoolWavPack) {
 		if (TRUE == bool_key_Control && TRUE == bool_click_gauche) {
 			PRINT("TRUE == bool_key_Control && TRUE == bool_click_gauche");
 		}
 		else if (TRUE == bool_key_Release && TRUE == bool_click_gauche) {
-			
+
 			if (TRUE == BoolWav) {
 				detail->EtatSelection_Wav = file_get_next_flag (detail, FILE_IS_WAV);
 				gtk_list_store_set (var_file.Adr_List_Store,
@@ -2648,19 +2639,19 @@
 							file_get_pixbuf (detail, FILE_IS_MP3),
 							-1);
 			}
-			
+
 		}
 	}
 	else if (TRUE == BoolSelectColNorm) {
-		
+
 
 			/* Une seule selection par l'utilisateur */
 			if (TRUE == bool_key_Release && TRUE == bool_click_gauche) {
 
 				gtk_widget_set_sensitive (GTK_WIDGET (GTK_COMBO_BOX (var_file.AdrComboboxNormalise)), TRUE);
-				
+
 				if (file_ok_to_normalise () && detail->Etat_Normalise == NORM_READY_FOR_SELECT) {
-				
+
 					switch (gtk_combo_box_get_active (GTK_COMBO_BOX (var_file.AdrComboboxNormalise))) {
 					case 0 :
 						detail->Etat_Normalise = NORM_PEAK_ALBUM;
@@ -2693,7 +2684,7 @@
 	else if (TRUE == BoolSelectColReplayGain) {
 
 		if (TRUE == bool_key_Release && TRUE == bool_click_gauche) {
-			
+
 			gtk_list_store_set (
 					var_file.Adr_List_Store,
 					&iter,
@@ -2717,27 +2708,27 @@
 	else if (TRUE == BoolSelectColPlay) {
 		PlayFile_play (detail->namefile);
 	}
-	
+
 	file_set_flag_buttons ();
 
 	return (FALSE);
 }
-// 
-// 
+//
+//
 void file_changed_selection_row (GtkTreeSelection *selection, gpointer data)
 {
 	var_file.Adr_Line_Selected = selection;
 	file_set_flag_buttons ();
 }
-// 
-// 
+//
+//
 gboolean file_key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data)
 {
 	if( TRUE == keys.BoolGDK_Control_A ) {	// CONTROL_A
 		gtk_tree_selection_unselect_all (var_file.Adr_Line_Selected);
 		gtk_tree_selection_select_all (var_file.Adr_Line_Selected);
 	}
-	if (keys.keyval == GDK_Delete) {
+	if (keys.keyval == GDK_KEY_Delete) {
 		GtkTreeIter iter;
 		if (gtk_tree_model_get_iter_first (var_file.Adr_Tree_Model, &iter)) {
 			on_file_button_del_file_clicked (NULL, NULL);
@@ -2746,29 +2737,36 @@
 	}
 	return (TRUE);
 }
-// 
-// 
-static void file_drag_data_received (GtkWidget	 *widget,
-					GdkDragContext *drag_context,
-					gint x,
-					gint y,
-					GtkSelectionData *data,
-					guint info,
-					guint time)
+//
+// Drag import
+//
+static void file_drag_data_received(
+					GtkWidget *widget,
+					GdkDragContext *context,
+					gint x,
+					gint y,
+					GtkSelectionData *data,
+					guint info,
+					guint time,
+					gpointer user_data)
 {
+
 	// Une copie ne peut aller vers elle meme !!!
-	if (gtk_drag_get_source_widget(drag_context) != widget) {
-		dragndrop_list_drag_data (widget, (gchar *)data->data);
+	if (gtk_drag_get_source_widget(context) != widget) {
+		// dragndrop_list_drag_data (widget, (gchar *)data->data);
+		dragndrop_list_drag_data( widget, (gchar*)gtk_selection_data_get_data( data ));
 	}
 }
-// 
-// 
-static void file_drag_data_drop( GtkWidget *widget,
-				 GdkDragContext *dc,
-				 GtkSelectionData *selection_data,
-				 guint info,
-				 guint t,
-				 gpointer data )
+//
+// DRag export
+//
+static void file_drag_data_drop(
+					GtkWidget *widget,
+					GdkDragContext *dc,
+					GtkSelectionData *selection_data,
+					guint info,
+					guint t,
+					gpointer data )
 {
 	GtkTreeIter	iter;
 	GtkTreeModel	*model = NULL;
@@ -2777,8 +2775,7 @@
 	GtkTreePath	*path;
 	DETAIL		*detail = NULL;
 	gchar		*text = NULL;
-	
-	
+
 	model = gtk_tree_view_get_model (GTK_TREE_VIEW(widget));
 	begin_list = gtk_tree_selection_get_selected_rows (var_file.Adr_Line_Selected, &model);
 	list = g_list_first (begin_list);
@@ -2786,7 +2783,7 @@
 		if( NULL != ( path = list->data )) {
 			gtk_tree_model_get_iter( model, &iter, path );
 			gtk_tree_model_get( var_file.Adr_Tree_Model, &iter, COLUMN_FILE_POINTER_STRUCT, &detail, -1 );
-			
+
 			// DEBUG DRAG AND DROP
 			// [ Tue, 03 May 2011 17:39:08 +0200 ]
 			// XCFA-4.1.0
@@ -2795,12 +2792,22 @@
 			// 	text = g_strdup( detail->namefile );
 			// NEW_CODE:
 			text = g_strdup_printf( "file://%s", detail->namefile );
-			
-			gdk_drag_status (dc, GDK_ACTION_COPY, t); 
 
-			gtk_selection_data_set( selection_data,
+			gdk_drag_status (dc, GDK_ACTION_COPY, t);
+
+			/*
+			gtk_selection_data_set(
+						GtkSelectionData *selection_data,
+						GdkAtom type,
+						gint format,
+						const guchar *data,
+						gint length);
+			*/
+			gtk_selection_data_set(
+						selection_data,
 						// GDK_SELECTION_TYPE_STRING,
-						selection_data->target,
+						// selection_data->target,
+						GDK_POINTER_TO_ATOM(gtk_selection_data_get_data( selection_data )),
 						8,
 						(guchar *)text,
 						strlen( text )
@@ -2811,12 +2818,12 @@
 		list = g_list_next( list );
 	}
 }
-// 
-// 
+//
+//
 void file_set_help (DETAIL *detail, TYPE_FILE_IS TypeFileIs)
 {
 	ETAT_SELECTION	etat = ETAT_ATTENTE;
-	
+
 	etat = file_get_next_flag( detail, TypeFileIs );
 
 	switch( etat ) {
@@ -2824,34 +2831,34 @@
 		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, "" );
 		break;
 	case ETAT_PRG_ABSENT :
-		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("Le programme externe d'extraction est absent."));
+		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("The external ripping program is missing"));
 		break;
 	case ETAT_ATTENTE :
-		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / En attente de selection."));
+		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Right click = Menu) / Waiting for selection."));
 		break;
 	case ETAT_ATTENTE_EXIST :
-		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / En attente de selection. Le fichier existe."));
+		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Right click = Menu) / Waiting for Selection. File exists."));
 		break;
 	case ETAT_SELECT :
-		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / En selection."));
+		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Right click = Menu) / Selected files"));
 		break;
 	case ETAT_SELECT_EXIST :
-		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / En selection. Le fichier existe."));
+		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Right click = Menu) / Selected files. File exists."));
 		break;
 	case ETAT_SELECT_EXPERT :
-		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / Selection avec options expert."));
+		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Right click = Menu) / Selection - expert mode."));
 		break;
 	case ETAT_SELECT_EXPERT_EXIST :
-		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / Selection avec options expert. Le fichier existe."));
+		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Right click = Menu) / Selection - expert mode. File exists."));
 		break;
 	}
 }
 //
-// 
+//
 void file_set_normalise (ETAT_NORMALISE p_EtatNormalise)
 {
 	if (FALSE == file_ok_to_normalise ()) {
-		gchar	*Str = g_strdup_printf (_("MAX FICHIERS ATTEINT = %d"), MAX_ARG_CONV);
+		gchar	*Str = g_strdup_printf (_("MAX FILES REACHED = %d"), MAX_ARG_CONV);
 		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, Str );
 		g_free (Str);	Str = NULL;
 	}
@@ -2861,30 +2868,30 @@
 			StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, "VOIR LA FONCTION: file_set_normalise()");
 			break;
 		case NORM_READY_FOR_SELECT :
-			StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("Normalise: En attente de selection."));
+			StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("Normalise: Waiting for selection."));
 			break;
 		case NORM_PEAK_ALBUM :
 			if (FALSE == file_peak_get_size_is_ok (NORM_PEAK_ALBUM, NULL)) {
-				StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("ATTENTION: Pas assez de place dans le dossier temporaire."));
+				StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("WARNING: Not enough space available in the temp folder."));
 			}
 			else {
-				StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("PEAK-ALBUM: Amplification maximale du volume pour un groupe de fichiers en respectant les ecarts de niveau entre chacun d'eux."));
-			}
+				StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("PEAK-ALBUM: Maximum volume amplification for a group of files according to the deviations in level between them"));
+			}			
 			break;
 		case NORM_PEAK :
-			StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("PEAK: Amplification maximale du volume pour chaque de fichier."));
+			StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("PEAK: Maximum volume amplification of each file."));
 			break;
 		case NORM_RMS_MIX_ALBUM :
-			StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("RMS-ALBUM: Ajustement du volume moyen pour un groupe de fichiers en respectant les ecarts de niveau moyen entre chacun d'eux."));
+			StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("RMS-ALBUM: Adjusting the average volume for a group of files according to the average level of deviation between them."));
 			break;
 		case NORM_RMS_FIX :
-			StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("RMS: Ajustement du volume moyen de chaque de fichier."));
+			StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("RMS: Average volume amplification of each file."));
 			break;
 		}
 	}
 }
-// 
-// 
+//
+//
 void file_set_replaygain (ETAT_REPLAYGAIN p_EtatReplayGain)
 {
 	switch (p_EtatReplayGain) {
@@ -2892,21 +2899,21 @@
 		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, "" );
 		break;
 	case RPG_ATTENTE :
-		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / ReplayGain: En attente de selection."));
+		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Right Click = Menu) / ReplayGain: Waiting for selection."));
 		break;
 	case RPG_PISTE :
-		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / Mode piste."));
+		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Right Click = Menu) / Track mode."));
 		break;
 	case RPG_ALBUM :
-		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / Mode album."));
+		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Right Click = Menu) / Album mode."));
 		break;
 	case RPG_EFFACER :
-		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / Mode effacer."));
+		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Right Click = Menu) / Erase mode."));
 		break;
 	}
 }
 // AFFICHAGE DU NOM COMPLET DU FICHIER SI SURVOL PAR LE CURSEUR SOURIS DU CHAMPS 'Nom'
-// 
+//
 gboolean file_event (GtkWidget *treeview, GdkEvent *event, gpointer user_data)
 {
 	gint x, y;
@@ -2935,27 +2942,30 @@
 	gboolean BoolSelectColNorm = FALSE;
 	gboolean BoolSelectColReplayGain = FALSE;
 	gboolean BoolSelectColNom = FALSE;
-	
-	// SI PAS DANS LE TREEVIEW
-	gdk_window_get_pointer (((GdkEventButton*)event)->window, &x, &y, &state);
+
+	/* Si pas de selection a cet endroit retour */
+	GdkDeviceManager *manager = gdk_display_get_device_manager( gdk_display_get_default() );
+	GdkDevice		 *device = gdk_device_manager_get_client_pointer( manager );
+	gdk_window_get_device_position( ((GdkEventButton*)event)->window, device, &x, &y, &state );
+	// gdk_window_get_pointer (((GdkEventButton*)event)->window, &x, &y, &state);
 	if (FALSE == gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW(treeview),
 					 x, y,
 					 &path, &column, &Pos_X, &Pos_Y)) {
 		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, " ");
 		return (FALSE);
 	}
-	
+
 	// RECUPERATION DE LA STRUCTURE POINTEE PAR LE CURSEUR SOURIS
 	gtk_tree_model_get_iter (model, &iter, path);
 	gtk_tree_model_get (var_file.Adr_Tree_Model, &iter, COLUMN_FILE_POINTER_STRUCT, &detail, -1);
 	if (NULL == detail) return (FALSE);
-	
+
 	// SORTIE SI LE WIDGET SOUS LE CURSEUR NE CORRESPOND PAS AU TREEVIEW
 	if (gtk_get_event_widget (event) != var_file.Adr_TreeView) {
 		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, "");
 		return (FALSE);
 	}
-	
+
 	/* IDEE POUR REMPLACER LES COMPARAISON PAR NOMS. EXEMPLES:
 	 * 	PLAY	= 0
 	 * 	TRASH	= 1
@@ -2985,7 +2995,7 @@
 			case NUM_TREE_FILE_Normalise :		BoolSelectColNorm	= TRUE;	break;
 			case NUM_TREE_FILE_ReplayGain :		BoolSelectColReplayGain	= TRUE;	break;
 			case NUM_TREE_FILE_Name :		BoolSelectColNom	= TRUE;	break;
-			default: 
+			default:
 				StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, "");
 				StatusBar_puts();
 				return (FALSE);
@@ -2998,7 +3008,7 @@
 	BoolSelectColNorm &= (detail->type_infosong_file_is == FILE_IS_WAV ||
 			 detail->type_infosong_file_is == FILE_IS_OGG ||
 			 detail->type_infosong_file_is == FILE_IS_MP3);
-	
+
 	if (BoolSelectColFlac || BoolSelectColWav || BoolSelectColMp3 || BoolSelectColOgg || BoolSelectColM4a ||
 	 BoolSelectColAac || BoolSelectColMpc || BoolSelectColApe || BoolSelectColWavP) {
 		if ((Pos_X < 18 || Pos_X > 30) || (Pos_Y < 6 || Pos_Y > 18)) {
@@ -3013,10 +3023,10 @@
 	else if (TRUE == BoolSelectColTrash) {
 		switch (detail->EtatTrash) {
 		case FILE_TRASH_NONE :
-			StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / Cliquez ici pour envoyer ce fichier apres traitement a la corbeille"));
+			StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / Click here to send the processed file to the trash"));
 			break;
 		case FILE_TRASH_OK :
-			StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / Ce fichier sera dirige apres traitement vers la corbeille"));
+			StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Right Click = Menu) / This file will be sent to the trash after processing"));
 			break;
 		case FILE_TRASH_VERIF_OK :
 			StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, "");
@@ -3068,13 +3078,13 @@
 	else {
 		// StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, "");
 	}
-	
+
 	StatusBar_puts();
-	
+
 	return (FALSE);
 }
-// 
-// 
+//
+//
 static void file_add_columns_scrolledwindow (GtkTreeView *treeview)
 {
 	GtkTreeModel *model = gtk_tree_view_get_model (treeview);
@@ -3092,24 +3102,25 @@
 			"key-press-event",
 			(GCallback) file_key_press_event,
 			model);
-	
+
 	// SIGNAL : 'Gestion click click'
 	g_signal_connect(G_OBJECT(treeview),
 			 "button-press-event",
 	 (GCallback) file_event_click_mouse,
 			 model);
-	
+
 	// SIGNAL : Ligne actuellement selectionnee 'changed'
 	var_file.Adr_Line_Selected = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
 	g_signal_connect(G_OBJECT(var_file.Adr_Line_Selected),
 			 "changed",
 	 G_CALLBACK(file_changed_selection_row),
 	 "1");
-	
+
 	// Drag and drop support
 	// SIGNAL : 'drag-data-received'
 	gtk_drag_dest_set (GTK_WIDGET (treeview),
-			 GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP | GTK_DEST_DEFAULT_HIGHLIGHT,
+			 // GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP | GTK_DEST_DEFAULT_HIGHLIGHT,
+			 GTK_DEST_DEFAULT_ALL,
 			 drag_types,
 			 n_drag_types,
 			 GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_DEFAULT
@@ -3130,13 +3141,13 @@
 	g_signal_connect(G_OBJECT(treeview),
 			"drag-data-get",
 			 G_CALLBACK(file_drag_data_drop),
-			 NULL);	
+			 NULL);
 
 	// COLUMN_FILE_PLAY
 	renderer = gtk_cell_renderer_pixbuf_new ();
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_file.Adr_ColumnFilePlay =
-	column = gtk_tree_view_column_new_with_attributes (_("Play"),
+	column = gtk_tree_view_column_new_with_attributes( "Play",
 						 renderer,
 						 "pixbuf", COLUMN_FILE_PLAY,
 						 NULL);
@@ -3201,7 +3212,7 @@
 	renderer = gtk_cell_renderer_pixbuf_new ();
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_file.Adr_ColumnFileWav =
-	column = gtk_tree_view_column_new_with_attributes (_("Wav"),
+	column = gtk_tree_view_column_new_with_attributes ("Wav",
 						 renderer,
 						 "pixbuf", COLUMN_FILE_WAV,
 						 NULL);
@@ -3220,7 +3231,7 @@
 	renderer = gtk_cell_renderer_pixbuf_new ();
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_file.Adr_ColumnFileFlac =
-	column = gtk_tree_view_column_new_with_attributes (_("Flac"),
+	column = gtk_tree_view_column_new_with_attributes ("Flac",
 						 renderer,
 						 "pixbuf", COLUMN_FILE_FLAC,
 						 NULL);
@@ -3239,7 +3250,7 @@
 	renderer = gtk_cell_renderer_pixbuf_new ();
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_file.Adr_ColumnFileApe =
-	column = gtk_tree_view_column_new_with_attributes (_("Ape"),
+	column = gtk_tree_view_column_new_with_attributes ("Ape",
 						 renderer,
 						 "pixbuf", COLUMN_FILE_APE,
 						 NULL);
@@ -3258,7 +3269,7 @@
 	renderer = gtk_cell_renderer_pixbuf_new ();
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_file.Adr_ColumnFileWavPack =
-	column = gtk_tree_view_column_new_with_attributes (_("WavP"),
+	column = gtk_tree_view_column_new_with_attributes ("WavP",
 						 renderer,
 						 "pixbuf", COLUMN_FILE_WAVPACK,
 						 NULL);
@@ -3277,7 +3288,7 @@
 	renderer = gtk_cell_renderer_pixbuf_new ();
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_file.Adr_ColumnFileOgg =
-	column = gtk_tree_view_column_new_with_attributes (_("Ogg"),
+	column = gtk_tree_view_column_new_with_attributes ("Ogg",
 						 renderer,
 						 "pixbuf", COLUMN_FILE_OGG,
 						 NULL);
@@ -3296,7 +3307,7 @@
 	renderer = gtk_cell_renderer_pixbuf_new ();
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_file.Adr_ColumnFileM4a =
-	column = gtk_tree_view_column_new_with_attributes (_("M4a"),
+	column = gtk_tree_view_column_new_with_attributes ("M4a",
 						 renderer,
 						 "pixbuf", COLUMN_FILE_M4A,
 						 NULL);
@@ -3315,7 +3326,7 @@
 	renderer = gtk_cell_renderer_pixbuf_new ();
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_file.Adr_ColumnFileAac =
-	column = gtk_tree_view_column_new_with_attributes (_("Aac"),
+	column = gtk_tree_view_column_new_with_attributes ("Aac",
 						 renderer,
 						 "pixbuf", COLUMN_FILE_AAC,
 						 NULL);
@@ -3334,7 +3345,7 @@
 	renderer = gtk_cell_renderer_pixbuf_new ();
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_file.Adr_ColumnFileMpc =
-	column = gtk_tree_view_column_new_with_attributes (_("Mpc"),
+	column = gtk_tree_view_column_new_with_attributes ("Mpc",
 						 renderer,
 						 "pixbuf", COLUMN_FILE_MPC,
 						 NULL);
@@ -3353,7 +3364,7 @@
 	renderer = gtk_cell_renderer_pixbuf_new ();
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_file.Adr_ColumnFileMp3 =
-	column = gtk_tree_view_column_new_with_attributes (_("Mp3"),
+	column = gtk_tree_view_column_new_with_attributes ("Mp3",
 						 renderer,
 						 "pixbuf", COLUMN_FILE_MP3,
 						 NULL);
@@ -3372,7 +3383,7 @@
 	renderer = gtk_cell_renderer_text_new ();
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_file.Adr_ColumnFileTime =
-	column = gtk_tree_view_column_new_with_attributes (_("Temps"),
+	column = gtk_tree_view_column_new_with_attributes (_("Time"),
 						 renderer,
 						 /*"pixbuf", COLUMN_FILE_TYPE,*/
 						 "text", COLUMN_FILE_TIME,
@@ -3408,7 +3419,7 @@
 	renderer = gtk_cell_renderer_pixbuf_new ();
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_file.Adr_ColumnFileReplayGain =
-	column = gtk_tree_view_column_new_with_attributes (_("ReplayGain"),
+	column = gtk_tree_view_column_new_with_attributes( "ReplayGain",
 						 renderer,
 						 "pixbuf", COLUMN_FILE_REPLAYGAIN,
 						 NULL);
@@ -3431,10 +3442,11 @@
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	g_object_set_data (G_OBJECT (renderer), "column", (gint *)COLUMN_FILE_NAME);
 	var_file.Adr_ColumnFileName =
-	column = gtk_tree_view_column_new_with_attributes (_("Nom"),
+	column = gtk_tree_view_column_new_with_attributes (_("Name"),
 							renderer,
 							"markup", COLUMN_FILE_NAME,
 							"editable", COLUMN_FILE_EDITABLE,
+						 // "background-gdk", COLUMN_FILE_COLOR,
 							NULL);
 	gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
 				 GTK_TREE_VIEW_COLUMN_FIXED);
@@ -3444,14 +3456,14 @@
 	gtk_tree_view_column_set_sort_column_id (column, COLUMN_FILE_NAME);
 	gtk_tree_view_append_column (treeview, column);
 }
-// 
-// 
+//
+//
 void on_file_scrolledwindow_file_realize (GtkWidget *widget, gpointer user_data)
 {
 	GtkListStore *store;
 	GtkTreeModel *model;
 	GtkWidget *treeview;
-	
+
 	var_file.Adr_scroll = widget;
 
 	var_file.Pixbuf_Coche			= libutils_init_pixbufs ("coche.png");
@@ -3474,7 +3486,7 @@
 	var_file.Pixbuf_Normalize_Coche		= libutils_init_pixbufs ("normalize2.png");
 	var_file.Pixbuf_NoTrash			= libutils_init_pixbufs ("coche.png");
 	var_file.Pixbuf_Trash			= libutils_init_pixbufs ("trash.png");
-	
+
 	var_file.Adr_List_Store = store =
 	gtk_list_store_new (	COLUMN_FILE_NUM,	/* TOTAL NUMBER			*/
 				GDK_TYPE_PIXBUF,	/* COLUMN_FILE_PLAY		*/
@@ -3494,20 +3506,21 @@
 				GDK_TYPE_PIXBUF,	/* COLUMN_FILE_REPLAYGAIN	*/
 				G_TYPE_STRING,		/* COLUMN_FILE_NAME		*/
 				G_TYPE_BOOLEAN, /* COLUMN_FILE_EDITABLE		*/
+				//GDK_TYPE_COLOR,		/* COLUMN_FILE_COLOR		*/
 				G_TYPE_POINTER /* COLUMN_FILE_POINTER_STRUCT	*/
 			 );
 	var_file.Adr_Tree_Model = model = GTK_TREE_MODEL (store);
 	var_file.Adr_TreeView =
 	treeview = gtk_tree_view_new_with_model (model);
-	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
+	// gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
 	gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)), GTK_SELECTION_MULTIPLE);	// GTK_SELECTION_BROWSE MULTIPLE
 	g_object_unref (model);
 	gtk_container_add (GTK_CONTAINER (widget), treeview);
 	file_add_columns_scrolledwindow (GTK_TREE_VIEW (treeview));
 	gtk_widget_show_all (widget);
 }
-// 
-// 
+//
+//
 void file_from_popup_select_verticaly (ETAT_SELECTION EtatSelection, TYPE_FILE_IS type_file_is)
 {
 	DETAIL *detail = NULL;
@@ -3597,8 +3610,8 @@
 	}
 	file_set_flag_buttons ();
 }
-// 
-// 
+//
+//
 void file_from_popup_select_horizontaly (DETAIL *p_detail, ETAT_SELECTION EtatSelection)
 {
 	DETAIL *detail = NULL;
@@ -3630,15 +3643,15 @@
 			if (EtatSelection == ETAT_PRG_NONE)		detail->EtatSelection_Ogg = ETAT_PRG_NONE;
 			else if (EtatSelection == ETAT_SELECT)		detail->EtatSelection_Ogg = ETAT_ATTENTE_EXIST;
 			else if (EtatSelection == ETAT_SELECT_EXPERT)	detail->EtatSelection_Ogg = ETAT_SELECT_EXIST;
-			
+
 			if (EtatSelection == ETAT_PRG_NONE)		detail->EtatSelection_M4a = ETAT_PRG_NONE;
 			else if (EtatSelection == ETAT_SELECT)		detail->EtatSelection_M4a = ETAT_ATTENTE_EXIST;
 			else if (EtatSelection == ETAT_SELECT_EXPERT)	detail->EtatSelection_M4a = ETAT_SELECT_EXIST;
-			
+
 			if (EtatSelection == ETAT_PRG_NONE)		detail->EtatSelection_Aac = ETAT_PRG_NONE;
 			else if (EtatSelection == ETAT_SELECT)		detail->EtatSelection_Aac = ETAT_ATTENTE_EXIST;
 			else if (EtatSelection == ETAT_SELECT_EXPERT)	detail->EtatSelection_Aac = ETAT_SELECT_EXIST;
-			
+
 			if (EtatSelection == ETAT_PRG_NONE)		detail->EtatSelection_Mpc = ETAT_PRG_NONE;
 			else if (EtatSelection == ETAT_SELECT)		detail->EtatSelection_Mpc = ETAT_ATTENTE_EXIST;
 			else if (EtatSelection == ETAT_SELECT_EXPERT)	detail->EtatSelection_Mpc = ETAT_SELECT_EXIST;
@@ -3646,7 +3659,7 @@
 			if (EtatSelection == ETAT_PRG_NONE)		detail->EtatSelection_Mp3 = ETAT_PRG_NONE;
 			else if (EtatSelection == ETAT_SELECT)		detail->EtatSelection_Mp3 = ETAT_ATTENTE_EXIST;
 			else if (EtatSelection == ETAT_SELECT_EXPERT)	detail->EtatSelection_Mp3 = ETAT_SELECT_EXIST;
-			
+
 			detail->EtatSelection_Flac = file_get_next_flag (detail, FILE_IS_FLAC);
 			detail->EtatSelection_Wav = file_get_next_flag (detail, FILE_IS_WAV);
 			detail->EtatSelection_Mp3 = file_get_next_flag (detail, FILE_IS_MP3);
@@ -3719,8 +3732,8 @@
 		valid = gtk_tree_model_iter_next (var_file.Adr_Tree_Model, &iter);
 	}
 }
-// 
-// 
+//
+//
 void file_from_popup_clear (void)
 {
 	DETAIL *detail = NULL;
@@ -3782,8 +3795,8 @@
 	}
 	file_set_flag_buttons ();
 }
-// 
-// 
+//
+//
 void file_from_popup_replaygain (ETAT_REPLAYGAIN EtatReplayGain)
 {
 	GtkTreeIter iter;
@@ -3798,7 +3811,7 @@
 			 detail->type_infosong_file_is == FILE_IS_MP3 ||
 			 detail->type_infosong_file_is == FILE_IS_OGG ||
 			 detail->type_infosong_file_is == FILE_IS_WAVPACK) {
-				
+
 				detail->Etat_ReplayGain = EtatReplayGain;
 
 				gtk_list_store_set (
@@ -3813,8 +3826,8 @@
 	}
 	file_set_flag_buttons ();
 }
-// 
-// 
+//
+//
 void file_from_popup_trash (gboolean BoolSelect)
 {
 	GtkTreeIter	iter;
@@ -3842,14 +3855,14 @@
 	}
 	file_set_flag_buttons ();
 }
-// 
-// 
+//
+//
 void file_from_popup (TYPE_SET_FROM_POPUP_FILE TypeSetFromPopup, DETAIL *detail, TYPE_FILE_IS TypeFileIs)
 {
 	switch (TypeSetFromPopup) {
-	
+
 	// SELECTION ou DESELECTION POUR LES ICONES DE CONVERSIONS
-	
+
 	case FILE_CONV_DESELECT_ALL :			// Deselection globale
 		file_from_popup_clear ();
 		break;
@@ -3871,9 +3884,9 @@
 	case FILE_CONV_SELECT_EXPERT_H :		// Selection Expert horizontale
 		file_from_popup_select_horizontaly (detail, ETAT_SELECT_EXPERT);
 		break;
-	
+
 	// SELECTION ou DESELECTION POUR LES ICONES DE REPLAYGAIN
-	
+
 	case FILE_REPLAYGAIN_DESELECT_V :		// Deselection verticale
 		file_from_popup_replaygain (RPG_ATTENTE);
 		break;
@@ -3886,66 +3899,24 @@
 	case FILE_REPLAYGAIN_SELECT_NETTOYER :		// Selection NETTOYER
 		file_from_popup_replaygain (RPG_EFFACER);
 		break;
-	
+
 	// SELECTION ou DESELECTION POUR TRASH
-	
+
 	case FILE_TRASH_DESELECT_V :			// Deselection verticale
 		file_from_popup_trash (FALSE);
 		break;
 	case FILE_TRASH_SELECT_V :			// Selection verticale
 		file_from_popup_trash (TRUE);
 		break;
-	
-	// SELECTION ou DESELECTION POUR FREQUENCES VOIE BITS 
-	
+
+	// SELECTION ou DESELECTION POUR FREQUENCES VOIE BITS
+
 	case FILEWAV_FREQUENCY_CELL_HERTZ :
-	case FILEWAV_FREQUENCY_COL_HERTZ :
 	case FILEWAV_TRACK_CELL :
-	case FILEWAV_TRACK_COL :
 	case FILEWAV_QUANTIFICATION_CELL :
-	case FILEWAV_QUANTIFICATION_COL :
 		break;
 	}
 }
-// 
-// CALL:
-// 
-// INFO_WAV *dummy = ( INFO_WAV *)file_get_ptr_info( detail );
-// OR
-// INFO_WAV *dummy = NULL;
-// if( NULL != ( dummy = ( INFO_WAV *)file_get_ptr_info( detail ))) {
-// 
-/*
-void *file_get_ptr_info( DETAIL *p_detail )
-{
-	switch( p_detail->type_infosong_file_is ) {
-	case FILE_IS_NONE :			break;
-	case FILE_IS_FLAC :			return( p_detail->info );
-	case FILE_IS_WAV :			return( p_detail->info );
-	case FILE_IS_MP3 :			return( p_detail->info );
-	case FILE_IS_OGG :			return( p_detail->info );
-	case FILE_IS_M4A :			return( p_detail->info );
-	case FILE_IS_VID_M4A :			return( p_detail->info );
-	case FILE_IS_AAC :			return( p_detail->info );
-	case FILE_IS_SHN :			return( p_detail->info );
-	case FILE_IS_WMA :			return( p_detail->info );
-	case FILE_IS_RM :			return( p_detail->info );
-	case FILE_IS_DTS :			return( p_detail->info );
-	case FILE_IS_AIFF :			return( p_detail->info );
-	case FILE_IS_MPC :			return( p_detail->info );
-	case FILE_IS_APE :			return( p_detail->info );
-	case FILE_IS_WAVPACK :			return( p_detail->info );
-	case FILE_IS_WAVPACK_MD5 :		break;
-	case FILE_IS_AC3 :			return( p_detail->info );
-	case FILE_TO_NORMALISE :		break;
-	case FILE_TO_NORMALISE_COLLECTIF :	break;
-	case FILE_TO_REPLAYGAIN :		break;
-	}
-	return( ( void * )NULL );
-}
-*/
-
-

xcfa-4.2.8.tar.gz/src/file.h -> xcfa-5.0.2.tar.gz/src/file.h Changed

@@ -1,25 +1,25 @@
 /*
 * file : file.h
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright :( C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
 *
 * This file is part of XCFA.
- * 
+ *
 * XCFA is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * at your option) any later version.
- * 
+ *
 * XCFA is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with XCFA. If not, see <http://www.gnu.org/licenses/>.
 */
@@ -29,190 +29,203 @@
 #define file_h 1
 
 typedef struct {
-	gboolean		 bool_tag_cd;				// TRUE is CD-AUDIO else is FILE
-	gboolean		 bool_save;				// TRUE -> save
-	gchar			*Album;					// %b
-	gchar			*Artist;				// %a
-	gchar			*Title;					// %d
-	gchar			*Number;				// %c
-	gint			 IntNumber;				// 
-	gchar			*Genre;					// %g
-	gint			 IntGenre;				// 
-	gchar			*Year;					// %e
-	gint			 IntYear;				// 
-	gchar			*Comment;				// 
-	gchar			*Description;				// 
+	gboolean		 bool_tag_cd;						// TRUE is CD-AUDIO else is FILE
+	gboolean		 bool_save;							// TRUE -> save
+	gchar			*Album;								// %b
+	gchar			*Artist;							// %a
+	gchar			*Title;								// %d
+	gchar			*Number;							// %c
+	gint			 IntNumber;							//
+	gchar			*Genre;								// %g
+	gint			 IntGenre;							//
+	gchar			*Year;								// %e
+	gint			 IntYear;							//
+	gchar			*Comment;							//
+	gchar			*Description;						//
 } TAGS;
 
-// 
+//
 // ---------------------------------------------------------------------------
 // I N F O _
 // ---------------------------------------------------------------------------
-// 
+//
 
 typedef struct {
-	gint			 level;					// Niveau en dBFS
-	gint			 NewLevel;				// Nouveau niveau en dBFS
+	gint			 level;								// Niveau en dBFS
+	gint			 NewLevel;							// Nouveau niveau en dBFS
 } LEVEL_DBFS;
 
 typedef struct {
-	gchar			*time;					// Temps d'ecoute
-	guint			 SecTime;				// Temps d'ecoute en secondes
-	gchar			*hertz;					// 
-	TAGS			*tags;					// Tags
+	gchar			*time;								// Temps d'ecoute
+	guint			 SecTime;							// Temps d'ecoute en secondes
+	gchar			*hertz;								//
+	TAGS			*tags;								// Tags
 } INFO_M4A;
 
 typedef struct {
-	gchar			*time;					// Temps d'ecoute
-	guint			 SecTime;				// Temps d'ecoute en secondes
-	gchar			*hertz;					// 
-	TAGS			*tags;					// Tags
+	gchar			*time;								// Temps d'ecoute
+	guint			 SecTime;							// Temps d'ecoute en secondes
+	gchar			*hertz;								//
+	TAGS			*tags;								// Tags
 } INFO_AAC;
 
 typedef struct {
-	gchar			*time;					// Temps d'ecoute
-	guint			 SecTime;				// Temps d'ecoute en secondes
-	gchar			*hertz;					// Taux d'échantillonnage en hertz( qualité du son)
-	gchar			*voie;					// 1, 2, 4, 6
-	gchar			*bits;					// 8, 16, ,24, 32 ou 64
-	gchar			*NewHertz;				// Nouvelle valeur
-	gchar			*NewVoie;				// Nouvelle valeur
-	gchar			*NewBits;				// Nouvelle valeur
-	gboolean		 BoolConv;				// TRUE si nouvelles valeurs differenetes de anciennes valeurs
-	TAGS			*tags;					// Tags
-	LEVEL_DBFS		 LevelDbfs;				// 
+	gboolean		 BoolBwf;							// 'fmt ', 'bext', 'qlty', 'levl', 'link','axml'
+	gchar			*time;								// Temps d'ecoute
+	guint			 SecTime;							// Temps d'ecoute en secondes
+	gchar			*hertz;								// Taux d'échantillonnage en hertz( qualité du son)
+	gchar			*voie;								// 1, 2, 4, 6
+	gchar			*bits;								// 8, 16, ,24, 32 ou 64
+	gchar			*NewHertz;							// Nouvelle valeur
+	gchar			*NewVoie;							// Nouvelle valeur
+	gchar			*NewBits;							// Nouvelle valeur
+	gboolean		 BoolConv;							// TRUE si nouvelles valeurs differenetes de anciennes valeurs
+	TAGS			*tags;								// Tags
+	LEVEL_DBFS		 LevelDbfs;							//
 } INFO_WAV;
 
-typedef enum {								// type: bitrate:
+typedef enum {											// type: bitrate:
 	NONE_MPEG = -1,
-	MPEG_1 = 0,							// MPV_1 [ 32 40 48 56 64 80 96 112 128 160 192 224 256 320 ]
-	MPEG_2,								// MPV_2 [ 8 16 24 32 40 48 56 64 80 96 112 128 144 160 ]
-	MPEG_25								// MPV_25 [ 8 16 24 32 40 48 56 64 80 96 112 128 144 160 ]
+	MPEG_1 = 0,											// MPV_1 [ 32 40 48 56 64 80 96 112 128 160 192 224 256 320 ]
+	MPEG_2,												// MPV_2 [ 8 16 24 32 40 48 56 64 80 96 112 128 144 160 ]
+	MPEG_25												// MPV_25 [ 8 16 24 32 40 48 56 64 80 96 112 128 144 160 ]
 } MPEG_IS;
 
 typedef struct {
-	gchar			*bitrate;				// 
-	gchar			*time;					// Temps d'ecoute
-	guint			 SecTime;				// Temps d'ecoute en secondes
-	MPEG_IS			 mpeg_is;				// 
-	gchar			*size;					// 
-	TAGS			*tags;					// Tags
-	LEVEL_DBFS		 LevelDbfs;				// 
+	gchar			*bitrate;							//
+	gchar			*time;								// Temps d'ecoute
+	guint			 SecTime;							// Temps d'ecoute en secondes
+	MPEG_IS			 mpeg_is;							//
+	gchar			*size;								//
+	TAGS			*tags;								// Tags
+	LEVEL_DBFS		 LevelDbfs;							//
 } INFO_MP3;
 
 typedef struct {
-	gchar			*Channels;				// 
-	gchar			*Rate;					// 
-	gchar			*Nominal_bitrate;			// 
-	gchar			*time;					// Temps d'ecoute
-	guint			 SecTime;				// Temps d'ecoute en secondes
-	gchar			*size;					// 
-	TAGS			*tags;					// Tags
-	LEVEL_DBFS		 LevelDbfs;				// Datas du dBFS
+	gchar			*Channels;							//
+	gchar			*Rate;								//
+	gchar			*Nominal_bitrate;					//
+	gchar			*time;								// Temps d'ecoute
+	guint			 SecTime;							// Temps d'ecoute en secondes
+	gchar			*size;								//
+	TAGS			*tags;								// Tags
+	LEVEL_DBFS		 LevelDbfs;							// Datas du dBFS
 } INFO_OGG;
 
 typedef struct {
-	gchar			*time;					// Temps d'ecoute
-	guint			 SecTime;				// Temps d'ecoute en secondes
-	TAGS			*tags;					// Tags
+	gchar			*time;								// Temps d'ecoute
+	guint			 SecTime;							// Temps d'ecoute en secondes
+	TAGS			*tags;								// Tags
 } INFO_FLAC;
 
 typedef struct {
-	TAGS			*tags;					// Tags
+	TAGS			*tags;								// Tags
 } INFO_WMA;
 
 typedef struct {
-	TAGS			*tags;					// Tags
+	TAGS			*tags;								// Tags
 } INFO_RM;
 
 typedef struct {
-	TAGS			*tags;					// Tags
+	TAGS			*tags;								// Tags
 } INFO_DTS;
 
 typedef struct {
-	TAGS			*tags;					// Tags
+	TAGS			*tags;								// Tags
 } INFO_AIFF;
 
 typedef struct {
-	gchar			*namefile;				// Nom complet du fichier
-	TAGS			*tags;					// Tags
+	gchar			*namefile;							// Nom complet du fichier
+	TAGS			*tags;								// Tags
 } INFO_MPC;
 
 typedef struct {
-	TAGS			*tags;					// Tags
-	gchar			*time;					// Temps d'ecoute
-	guint			 SecTime;				// Temps d'ecoute en secondes
-	gchar			*size;					// 
+	TAGS			*tags;								// Tags
+	gchar			*time;								// Temps d'ecoute
+	guint			 SecTime;							// Temps d'ecoute en secondes
+	gchar			*size;								//
 } INFO_SHN;
 
 typedef struct {
-	TAGS			*tags;					// Tags
-	gchar			*time;					// Temps d'ecoute
-	guint			 SecTime;				// Temps d'ecoute en secondes
-	gchar			*size;					// 
+	TAGS			*tags;								// Tags
+	gchar			*time;								// Temps d'ecoute
+	guint			 SecTime;							// Temps d'ecoute en secondes
+	gchar			*size;								//
 } INFO_APE;
 
 typedef struct {
-	TAGS			*tags;					// Tags
-	gchar			*time;					// Temps d'ecoute
-	guint			 SecTime;				// Temps d'ecoute en secondes
-	gchar			*size;					// 
+	TAGS			*tags;								// Tags
+	gchar			*time;								// Temps d'ecoute
+	guint			 SecTime;							// Temps d'ecoute en secondes
+	gchar			*size;								//
 } INFO_WAVPACK;
 
 typedef struct {
-	TAGS			*tags;					// Tags
+	TAGS			*tags;								// Tags
 } INFO_AC3;
 
-// 
-// ---------------------------------------------------------------------------
-// F I C M P 3 O G G
-// ---------------------------------------------------------------------------
-// 
+/*
+	M P 3
 
-typedef struct {
-	gint			type;					// 
-	gint			debit[4];				// 
-	gint			mode[4];				// 
-	gboolean		BoolChanged;				// 
-} TYPE_MP3OGG;
+	TYPE:	ABR
+	DEBIT:	32 40 48 56 64 80 96 112 128 160 192 224 320
+	MODE:	Defaut / Stereo / Join Stereo / Forced Join Stereo / Duo Channels / Mono
+
+	TYPE:	CBR
+	DEBIT:	32 40 48 56 64 80 96 112 128 160 192 224 320
+	MODE:	Defaut / Stereo / Join Stereo / Forced Join Stereo / Duo Channels / Mono
+
+	TYPE:	VBR
+	DEBIT:	preset medium / preset standard / preset extreme / preset fast standard / preset fast extreme / V0 V1 V2 V3 V4 V5 V6 V7 V8 V9
+	MODE:	Defaut / Stereo / Join Stereo / Forced Join Stereo / Duo Channels / Mono
+
+	TYPE:	VBR-NEW
+	DEBIT:	NONE / preset medium / preset standard / preset extreme / preset fast standard / preset fast extreme / V0 V1 V2 V3 V4 V5 V6 V7 V8 V9
+	MODE:	Defaut / Stereo / Join Stereo / Forced Join Stereo / Duo Channels / Mono
+
+	O G G
+
+	DEBIT:		45 kbit/s / 64 kbit/s / 80 kbit/s / 96 kbit/s / 112 kbit/s / 128 kbit/s / 160 kbit/s / 192 kbit/s / 224 kbit/s / 256 kbit/s / 320 kbit/s /
+			Qualite -1 -Moins bonne qualite / Qualite 0 / Qualite 1 / Qualite 2 / Qualite 3 -Defaut / Qualite 4 / Qualite 5 / Qualite 6 / Qualite 7 / Qualite 8 / Qualite 9 / Qualite 10 -Meilleure qualite
+	MANAGED:	Oui / Non
+	DOWNMIX:	Mono force / Stereo
+*/
 
 typedef struct {
-	gboolean		 Bool_Conv;				// TRUE si conversion
-	gchar			*New_src;				// Temporaire: Pathname
-	gchar			*destwav;				// Temporaire: Pathname
-	gchar			*destsox;				// Temporaire: Pathname
-	gchar			*destmp3;				// Temporaire: Pathname
-	gchar			*destogg;				// Temporaire: Pathname
-	gchar			*destfile;				// Destination du fichier apres rectification
-	gchar			*Bitrate;				// Le bitrate actuel
-	TYPE_MP3OGG		Lame;					// 
-	TYPE_MP3OGG		Oggenc;					// 
+	gboolean		 Bool_Conv;							// TRUE si conversion
+	gchar			*destwav;							// Temporaire: Pathname
+	gchar			*destsox;							// Temporaire: Pathname
+	gchar			*destmp3;							// Temporaire: Pathname
+	gchar			*destogg;							// Temporaire: Pathname
+	gchar			*destfile;							// Destination du fichier apres rectification
+	gchar			*Bitrate;							// Le bitrate actuel
 } CONV_FIC_MP3OGG;
 
-// 
+//
 // ---------------------------------------------------------------------------
 // F I C W A V
 // ---------------------------------------------------------------------------
-// 
+//
 
 typedef struct {
-	gchar			*Path;					// Path du fichier source
-	gchar			*TmpSrc;				// $TMP/original
-	gchar			*TmpDest;				// $TMP/modifie
-	gchar			*TmpMplayer;				// $TMP/
-	gchar			*NameDest;				// Copie vers la destination
+	gchar			*Path;								// Path du fichier source
+	gchar			*TmpSrc;							// $TMP/original
+	gchar			*TmpDest;							// $TMP/modifie
+	gchar			*TmpMplayer;						// $TMP/
+	gchar			*NameDest;							// Copie vers la destination
 } CONV_FIC_WAV;
 
-// 
+//
 // ---------------------------------------------------------------------------
 // F I C
 // ---------------------------------------------------------------------------
-// 
+//
 
 typedef enum {
 	FILE_IS_NONE = 0,
 	FILE_IS_FLAC,
 	FILE_IS_WAV,
+	// FILE_IS_BFW,										// BROADCAST WAVE FORMAT
 	FILE_IS_MP3,
 	FILE_IS_OGG,
 	/* Les fichiers au format AAC, portant l'extension
@@ -280,19 +293,19 @@
 */
 typedef enum {
 	NORM_NONE = 0,
-	NORM_READY_FOR_SELECT,						// Pret a la selection wav,mp3, ogg
-	NORM_PEAK_ALBUM,						// NORM_PEAK_ALBUM
-	NORM_PEAK,							// NORM_PEAK
-	NORM_RMS_MIX_ALBUM,						//( scan) NORM_RMS_MIX_ALBUM
-	NORM_RMS_FIX							//( scan) NORM_RMS_FIX
+	NORM_READY_FOR_SELECT,								// Pret a la selection wav,mp3, ogg
+	NORM_PEAK_ALBUM,									// NORM_PEAK_ALBUM
+	NORM_PEAK,											// NORM_PEAK
+	NORM_RMS_MIX_ALBUM,									//( scan) NORM_RMS_MIX_ALBUM
+	NORM_RMS_FIX										//( scan) NORM_RMS_FIX
 } ETAT_NORMALISE;
 
 typedef enum {
-	RPG_NONE = 0,							// Attente de selection
-	RPG_ATTENTE,							// Attente de selection
-	RPG_PISTE,							// Mode PISTE
-	RPG_ALBUM,							// Mode ALBUM
-	RPG_EFFACER							// Mode EFFACER
+	RPG_NONE = 0,										// Attente de selection
+	RPG_ATTENTE,										// Attente de selection
+	RPG_PISTE,											// Mode PISTE
+	RPG_ALBUM,											// Mode ALBUM
+	RPG_EFFACER											// Mode EFFACER
 } ETAT_REPLAYGAIN;
 
 typedef enum {
@@ -333,123 +346,132 @@
 
 
 typedef struct {
-	ETAT_PLAY_FILE		 EtatPlay;				// 
-	gchar			*name_dest;				// Nom du fichier de destination sans le path ni l'extension
-	gchar			*dest_flac;				// 
-	gchar			*dest_wav;				// 
-	gchar			*dest_mp3;				// 
-	gchar			*dest_ogg;				// 
-	gchar			*dest_m4a;				// 
-	gchar			*dest_aac;				// 
-	gchar			*dest_mpc;				// 
-	gchar			*dest_ape;				// 
-	gchar			*dest_wavpack;				// 
-	gchar			*dest_wavpack_md5;			// 
-	gchar			*tmp_flac;				// 
-	gchar			*tmp_wav;				// 
-	gchar			*tmp_sox;				// wav to wav
-	gchar			*tmp_sox_24;				// wav to wav
-	gchar			*tmp_mp3;				// 
-	gchar			*tmp_ogg;				// 
-	gchar			*tmp_m4a;				// 
-	gchar			*tmp_aac;				// 
-	gchar			*tmp_shn;				// 
-	gchar			*tmp_wma;				// 
-	gchar			*tmp_rm;				// 
-	gchar			*tmp_dts;				// 
-	gchar			*tmp_aiff;				// 
-	gchar			*tmp_mpc;				// 
-	gchar			*tmp_ape;				// 
-	gchar			*tmp_wavpack;				// 
-	gchar			*tmp_wavpack_md5;			// 
-	gchar			*tmp_ac3;				// 
-	gboolean		 BoolEtatConv [ ETAT_BOOL_TOTAL ];	// 
-	ETAT_CONV_FILE		 Etat_Flac;				// 
-	ETAT_CONV_FILE		 Etat_Wav;				// 
-	ETAT_CONV_FILE		 Etat_Mp3;				// 
-	ETAT_CONV_FILE		 Etat_Ogg;				// 
-	ETAT_CONV_FILE		 Etat_m4a;				// 
-	ETAT_CONV_FILE		 Etat_aac;				// 
-	ETAT_CONV_FILE		 Etat_Mpc;				// 
-	ETAT_CONV_FILE		 Etat_Ape;				// 
-	ETAT_CONV_FILE		 Etat_wavpack;				// 
-	gboolean		 BoolNewString;
+	ETAT_PLAY_FILE		 EtatPlay;						//
+	gchar			*name_dest;							// Nom du fichier de destination sans le path ni l'extension
+	gchar			*dest_flac;							//
+	gchar			*dest_wav;							//
+	gchar			*dest_mp3;							//
+	gchar			*dest_ogg;							//
+	gchar			*dest_m4a;							//
+	gchar			*dest_aac;							//
+	gchar			*dest_mpc;							//
+	gchar			*dest_ape;							//
+	gchar			*dest_wavpack;						//
+	gchar			*dest_wavpack_md5;					//
+	gchar			*tmp_flac;							//
+	gchar			*tmp_wav;							//
+	gchar			*tmp_sox;							// wav to wav
+	gchar			*tmp_sox_24;						// wav to wav
+	gchar			*tmp_mp3;							//
+	gchar			*tmp_ogg;							//
+	gchar			*tmp_m4a;							//
+	gchar			*tmp_aac;							//
+	gchar			*tmp_shn;							//
+	gchar			*tmp_wma;							//
+	gchar			*tmp_rm;							//
+	gchar			*tmp_dts;							//
+	gchar			*tmp_aiff;							//
+	gchar			*tmp_mpc;							//
+	gchar			*tmp_ape;							//
+	gchar			*tmp_wavpack;						//
+	gchar			*tmp_wavpack_md5;					//
+	gchar			*tmp_ac3;							//
+	gboolean		 BoolEtatConv [ ETAT_BOOL_TOTAL ];
+	ETAT_CONV_FILE		 Etat_Flac;						//
+	ETAT_CONV_FILE		 Etat_Wav;						//
+	ETAT_CONV_FILE		 Etat_Mp3;						//
+	ETAT_CONV_FILE		 Etat_Ogg;						//
+	ETAT_CONV_FILE		 Etat_m4a;						//
+	ETAT_CONV_FILE		 Etat_aac;						//
+	ETAT_CONV_FILE		 Etat_Mpc;						//
+	ETAT_CONV_FILE		 Etat_Ape;						//
+	ETAT_CONV_FILE		 Etat_wavpack;					//
+	gboolean		 BoolNewString;						//
+
 } CONV_FIC;
 
 typedef enum {
-	STRUCT_NO_REMOVE = 0,						// 
-	STRUCT_ALL_REMOVE,						// Remove in treeview ALL FILE
-	STRUCT_WAV_REMOVE_WAV,						// Remove in treeview WAV
-	STRUCT_MP3OGG_REMOVE,						// Remove in treeview MP3OGG
-	STRUCT_SPLIT_REMOVE						// Remove in treeview SPLIT
+	STRUCT_NO_REMOVE = 0,								//
+	STRUCT_ALL_REMOVE,									// Remove in treeview ALL FILE
+	STRUCT_WAV_REMOVE_WAV,								// Remove in treeview WAV
+	STRUCT_MP3OGG_REMOVE,								// Remove in treeview MP3OGG
+	STRUCT_SPLIT_REMOVE									// Remove in treeview SPLIT
 } TYPE_REMOVE_STRUCT;
 
 
-// 
+//
 // ---------------------------------------------------------------------------
-// F I C 
+// F I C
 // ---------------------------------------------------------------------------
-// 
+//
 
 
 typedef struct {
-	gchar			*namefile;				// Nom complet du fichier
-	gchar			*NameFileCopyFromNormalizate;		// 
-	gchar			*NameDest;				// Nom de la destination									
+	gchar			*namefile;							// Nom complet du fichier
+	gchar			*NameFileCopyFromNormalizate;		//
+	gchar			*NameDest;							// Nom de la destination
 	TYPE_FILE_IS		 type_infosong_file_is;			// Type du fichier
-	void 			*info;					// En fonction du type de fichier pointeur sur INFO_xxx
-	ETAT_TRASH_FILE		 EtatTrash;				// Etat pour la poubelle
-	ETAT_SELECTION		 EtatSelection_Wav;			// Etat de la selection WAV
+	void 			*info;								// En fonction du type de fichier pointeur sur INFO_xxx
+	ETAT_TRASH_FILE		 EtatTrash;						// Etat pour la poubelle
+	ETAT_SELECTION		 EtatSelection_Wav;				// Etat de la selection WAV
 	ETAT_SELECTION		 EtatSelection_Flac;			// Etat de la selection FLAC
-	ETAT_SELECTION		 EtatSelection_Ape;			// Etat de la selection APE
+	ETAT_SELECTION		 EtatSelection_Ape;				// Etat de la selection APE
 	ETAT_SELECTION		 EtatSelection_WavPack;			// Etat de la selection WAVPACK
-	ETAT_SELECTION		 EtatSelection_Ogg;			// Etat de la selection OGG
-	ETAT_SELECTION		 EtatSelection_M4a;			// Etat de la selection M4A
-	ETAT_SELECTION		 EtatSelection_Aac;			// Etat de la selection AAC
-	ETAT_SELECTION		 EtatSelection_Mpc;			// Etat de la selection MPC
-	ETAT_SELECTION		 EtatSelection_Mp3;			// Etat de la selection MP3
-	ETAT_NORMALISE		 Etat_Normalise;			// Etat de la selection de normalisation
-	ETAT_SCAN		 Etat_Scan;				// Etat de la selection du scan
-	gint			 LevelMix;				// Niveau du MIX
-	ETAT_REPLAYGAIN		 Etat_ReplayGain;			// Etat de la selection du gain
-	CONV_FIC		*PConv;					// Pointeur pour conversion de tous les fichiers
-	CONV_FIC_WAV		*PConvWav;				// Pointeur pour conversion WAV TO WAV
-	CONV_FIC_MP3OGG		*PConvMp3Ogg;				// Pointeur pour modification bitrate mp3 et ogg
-	TYPE_REMOVE_STRUCT	 BoolRemove;				// TRUE si suppression de la liste sinon FALSE
-	TYPE_MP3OGG		 TypeMp3Ogg;				// type, debit, mode
+	ETAT_SELECTION		 EtatSelection_Ogg;				// Etat de la selection OGG
+	ETAT_SELECTION		 EtatSelection_M4a;				// Etat de la selection M4A
+	ETAT_SELECTION		 EtatSelection_Aac;				// Etat de la selection AAC
+	ETAT_SELECTION		 EtatSelection_Mpc;				// Etat de la selection MPC
+	ETAT_SELECTION		 EtatSelection_Mp3;				// Etat de la selection MP3
+	ETAT_NORMALISE		 Etat_Normalise;				// Etat de la selection de normalisation
+	ETAT_SCAN		 Etat_Scan;							// Etat de la selection du scan
+	gint			 LevelMix;							// Niveau du MIX
+	ETAT_REPLAYGAIN		 Etat_ReplayGain;				// Etat de la selection du gain
+	CONV_FIC		*PConv;								// Pointeur pour conversion de tous les fichiers
+	CONV_FIC_WAV		*PConvWav;						// Pointeur pour conversion WAV TO WAV
+	CONV_FIC_MP3OGG		*PConvMp3Ogg;					// Pointeur pour modification bitrate mp3 et ogg
+	TYPE_REMOVE_STRUCT	 BoolRemove;					// TRUE si suppression de la liste sinon FALSE
+
+	// MP3: DEBIT MODE
+	gint			Mp3_Debit;							//
+	gint			Mp3_Mode;							//
+	// OGG: DEBIT MANAGED DOWNMIX
+	gint			Ogg_Debit;							//
+	gint			Ogg_Managed;						//
+	gint			Ogg_Downmix;						//
+	gboolean		BoolChanged;						//
 } DETAIL;
 
-extern GList *entetefile;						// pointeur sur DETAIL
+extern GList *entetefile;								// pointeur sur DETAIL
 
-// 
+//
 // ---------------------------------------------------------------------------
 // FILE.C
 // ---------------------------------------------------------------------------
-// 
+//
 typedef struct {
-	GtkComboBox		*AdrComboboxNormalise;			// Adresse
+	GtkComboBox		*AdrComboboxNormalise;				// Adresse
 	GtkSpinButton		*AdrSpinbuttonNormalise;		// Adresse
-	GtkWidget		*Adr_Label_Number;			// Adresse
-	GtkWidget		*Adr_scroll;				// Adresse
-	GtkListStore		*Adr_List_Store;			// Adresse
-	GtkTreeModel		*Adr_Tree_Model;			// Adresse
-	GtkTreeSelection	*Adr_Line_Selected;			// Adresse
-	GtkWidget		*Adr_TreeView;				// Adresse
-	GtkComboBox		*Adr_combobox_DestFile;			// Adresse
-	GtkComboBox		*Adr_combobox_select_type;		// Adresse
-	GtkComboBox		*Adr_combobox_normalise;		// Adresse
-	GdkPixbuf		*Pixbuf_Trash;				// trash.png
-	GdkPixbuf		*Pixbuf_NoTrash;			// coche.png
-	GdkPixbuf		*Pixbuf_FilePlay;			// play.png
-	GdkPixbuf		*Pixbuf_FileStop;			// sol.png
-	GdkPixbuf		*Pixbuf_Coche;				// coche.png
-	GdkPixbuf		*Pixbuf_Coche_exist;			// coche_exist.png
-	GdkPixbuf		*Pixbuf_Selected;			// selected.png
-	GdkPixbuf		*Pixbuf_Selected_exist;			// selected_exist.png
-	GdkPixbuf		*Pixbuf_Selected_expert;		// selected_expert.png
+	GtkWidget		*Adr_Label_Number;					// Adresse
+	GtkWidget		*Adr_scroll;						// Adresse
+	GtkListStore		*Adr_List_Store;				// Adresse
+	GtkTreeModel		*Adr_Tree_Model;				// Adresse
+	GtkTreeSelection	*Adr_Line_Selected;				// Adresse
+	GtkWidget		*Adr_TreeView;						// Adresse
+	GtkComboBox		*Adr_combobox_DestFile;				// Adresse
+	GtkComboBox		*Adr_combobox_select_type;			// Adresse
+	GtkComboBox		*Adr_combobox_normalise;			// Adresse
+	GdkPixbuf		*Pixbuf_Trash;						// trash.png
+	GdkPixbuf		*Pixbuf_NoTrash;					// coche.png
+	GdkPixbuf		*Pixbuf_FilePlay;					// play.png
+	GdkPixbuf		*Pixbuf_FileStop;					// sol.png
+	GdkPixbuf		*Pixbuf_Coche;						// coche.png
+	GdkPixbuf		*Pixbuf_Coche_exist;				// coche_exist.png
+	GdkPixbuf		*Pixbuf_Selected;					// selected.png
+	GdkPixbuf		*Pixbuf_Selected_exist;				// selected_exist.png
+	GdkPixbuf		*Pixbuf_Selected_expert;			// selected_expert.png
 	GdkPixbuf		*Pixbuf_Selected_expert_exist;		// selected_expert_exist.png
-	GdkPixbuf		*Pixbuf_Normalize_Coche;		// normalize2.png
-	GdkPixbuf		*Pixbuf_NotInstall;			// not_install.png
+	GdkPixbuf		*Pixbuf_Normalize_Coche;			// normalize2.png
+	GdkPixbuf		*Pixbuf_NotInstall;					// not_install.png
 	GtkCellRenderer		*Renderer;
 	GtkTreeViewColumn	*Adr_ColumnFilePlay;
 	GtkTreeViewColumn	*Adr_ColumnFileTrash;
@@ -468,29 +490,28 @@
 	GtkTreeViewColumn	*Adr_ColumnFileReplayGain;
 	GtkTreeViewColumn	*Adr_ColumnFileName;
 	gint			 PageNum;
-	GdkPixbuf		*Pixbuf_rpg_piste;			// rpg_piste.png
-	GdkPixbuf		*Pixbuf_rpg_album;			// rpg_album.png
-	GdkPixbuf		*Pixbuf_rpg_effacer;			// rpg_effacer.png
-	GdkPixbuf		*Pixbuf_rpg_wait;			// rpg_wait.png
-	
-	GdkPixbuf		*Pixbuf_norm_fix;			// norm_fix.png
-	GdkPixbuf		*Pixbuf_norm_mix;			// norm_mix.png
-	GdkPixbuf		*Pixbuf_norm_peak;			// norm_peak.png
-	GdkPixbuf		*Pixbuf_norm_wait;			// norm_wait.png
-	
+	GdkPixbuf		*Pixbuf_rpg_piste;					// rpg_piste.png
+	GdkPixbuf		*Pixbuf_rpg_album;					// rpg_album.png
+	GdkPixbuf		*Pixbuf_rpg_effacer;				// rpg_effacer.png
+	GdkPixbuf		*Pixbuf_rpg_wait;					// rpg_wait.png
+
+	GdkPixbuf		*Pixbuf_norm_fix;					// norm_fix.png
+	GdkPixbuf		*Pixbuf_norm_mix;					// norm_mix.png
+	GdkPixbuf		*Pixbuf_norm_peak;					// norm_peak.png
+	GdkPixbuf		*Pixbuf_norm_wait;					// norm_wait.png
+
 } VAR_FILE;
 
 extern VAR_FILE var_file;
 
 typedef struct {
-	GtkWidget		*Adr_scroll;				// Adresse
-	GtkListStore		*Adr_List_Store;			// Adresse
-	GtkTreeModel		*Adr_Tree_Model;			// Adresse
-	GtkTreeSelection	*Adr_Line_Selected;			// Adresse
-	GtkWidget		*Adr_TreeView;				// Adresse
-	GtkWidget		*Adr_Entry_Dest;			// Adresse
-	GdkPixbuf		*Pixbuf_NotInstall;			// not_install.png
-	gboolean		 BOOL_ENTER_SPIN;			// Because appel crash
+	GtkWidget		*Adr_scroll;						// Adresse
+	GtkListStore		*Adr_List_Store;				// Adresse
+	GtkTreeModel		*Adr_Tree_Model;				// Adresse
+	GtkTreeSelection	*Adr_Line_Selected;				// Adresse
+	GtkWidget		*Adr_TreeView;						// Adresse
+	GtkWidget		*Adr_Entry_Dest;					// Adresse
+	GdkPixbuf		*Pixbuf_NotInstall;					// not_install.png
 	GtkCellRenderer		*Renderer;
 	GtkTreeViewColumn	*Adr_ColumnFileWavHertz;
 	GtkTreeViewColumn	*Adr_ColumnFileWavVoie;
@@ -499,24 +520,21 @@
 	GtkTreeViewColumn	*Adr_ColumnFileWavNewVoie;
 	GtkTreeViewColumn	*Adr_ColumnFileWavNewBits;
 	GtkTreeViewColumn	*Adr_ColumnFileWavName;
-	GtkSpinButton		*Adr_spinbutton_frequence;		// 
-	GtkComboBox		*Adr_combobox_voie;			// 
-	GtkComboBox		*Adr_combobox_bit;			// 
-	
+
 } VAR_FILE_WAV;
 
 extern VAR_FILE_WAV var_file_wav;
 
 typedef struct {
-	GtkWidget		*Adr_scroll;				// Adresse
-	GtkListStore		*Adr_List_Store;			// Adresse
-	GtkTreeModel		*Adr_Tree_Model;			// Adresse
-	GtkTreeSelection	*Adr_Line_Selected;			// Adresse
-	GtkWidget		*Adr_TreeView;				// Adresse
-	GtkWidget		*Adr_Entry_Dest;			// Adresse
-	GtkWidget		*Adr_Button_Dest;			// Adresse
-	GtkComboBox		*Adr_combobox_DestFile;			// Adresse
-	GdkPixbuf		*Pixbuf_NotInstall;			// not_install.png
+	GtkWidget		*Adr_scroll;						// Adresse
+	GtkListStore		*Adr_List_Store;				// Adresse
+	GtkTreeModel		*Adr_Tree_Model;				// Adresse
+	GtkTreeSelection	*Adr_Line_Selected;				// Adresse
+	GtkWidget		*Adr_TreeView;						// Adresse
+	GtkWidget		*Adr_Entry_Dest;					// Adresse
+	GtkWidget		*Adr_Button_Dest;					// Adresse
+	GtkComboBox		*Adr_combobox_DestFile;				// Adresse
+	GdkPixbuf		*Pixbuf_NotInstall;					// not_install.png
 	GtkCellRenderer		*Renderer;
 	GtkTreeViewColumn	*Adr_ColumnFileMp3OggType;
 	GtkTreeViewColumn	*Adr_ColumnFileMp3OggBitrate;
@@ -524,29 +542,22 @@
 	GtkTreeViewColumn	*Adr_ColumnFileMp3OggSize;
 	GtkTreeViewColumn	*Adr_ColumnFileMp3OggTime;
 	GtkTreeViewColumn	*Adr_ColumnFileMp3OggName;
-	GtkComboBox		*Adr_Widget_Lame_abr_cbr_vbr;
-	GtkComboBox		*Adr_Widget_Lame_bitrate;		
-	GtkComboBox		*Adr_Widget_Lame_Mode;
-	GtkComboBox		*Adr_Widget_Oggenc_bitrate;
-	GtkComboBox		*Adr_Widget_Oggenc_managed;
-	GtkComboBox		*Adr_Widget_Oggenc_downmix;
 } VAR_FILE_MP3OGG;
 
 extern VAR_FILE_MP3OGG var_file_mp3ogg;
 
 typedef struct {
-	GtkWidget		*Adr_scroll;				// Adresse
-	GtkListStore		*Adr_List_Store;			// Adresse
-	GtkTreeModel		*Adr_Tree_Model;			// Adresse
-	GtkTreeSelection	*Adr_Line_Selected;			// Adresse
-	GtkWidget		*Adr_TreeView;				// Adresse
+	GtkWidget		*Adr_scroll;						// Adresse
+	GtkListStore		*Adr_List_Store;				// Adresse
+	GtkTreeModel		*Adr_Tree_Model;				// Adresse
+	GtkTreeSelection	*Adr_Line_Selected;				// Adresse
+	GtkWidget		*Adr_TreeView;						// Adresse
 	GtkWidget		*Adr_entry_tag_album;
 	GtkWidget		*Adr_entry_tag_title;
 	GtkWidget		*Adr_entry_tag_artist;
 	GtkWidget		*Adr_entry_tag_comment;
 	GtkWidget		*Adr_spinbutton_tag_year;
 	GtkWidget		*Adr_spinbutton_tag_track;
-	GtkComboBox		*Adr_combobox_tag_genre;
 	GtkWidget		*Adr_label_tag_change;
 	GtkWidget		*Adr_table_tag;
 	GtkCellRenderer		*Renderer;
@@ -577,18 +588,15 @@
 	FILE_TRASH_SELECT_V,
 	// SELECTION ou DESELECTION POUR TRASH
 	FILEWAV_FREQUENCY_CELL_HERTZ,
-	FILEWAV_FREQUENCY_COL_HERTZ,
 	FILEWAV_TRACK_CELL,
-	FILEWAV_TRACK_COL,
-	FILEWAV_QUANTIFICATION_CELL,
-	FILEWAV_QUANTIFICATION_COL
+	FILEWAV_QUANTIFICATION_CELL
 } TYPE_SET_FROM_POPUP_FILE;
 
-// 
+//
 // ---------------------------------------------------------------------------
 // FILE.C
 // ---------------------------------------------------------------------------
-// 
+//
 gchar		*file_get_time( DETAIL *detail );
 void		file_scrolledwindow_file_realize( GtkWidget *widget );
 void		file_set_flag_buttons( void );
@@ -605,73 +613,77 @@
 gchar		*file_get_size( DETAIL *detail );
 void		on_file_button_del_file_clicked( GtkButton *button, gpointer user_data );
 void		file_from_popup( TYPE_SET_FROM_POPUP_FILE TypeSetFromPopup, DETAIL *detail, TYPE_FILE_IS TypeFileIs );
-// 
+//
 // ---------------------------------------------------------------------------
 // FILE_SCAN_DB.C
 // ---------------------------------------------------------------------------
-// 
+//
 void		FileScanDB_action( gboolean BoolAllScan );
-// 
+//
 // ---------------------------------------------------------------------------
 // FILE_ANALYZE.C
 // ---------------------------------------------------------------------------
-// 
+//
 #include "fileselect.h"
 
+void		fileanalyze_remove_entetefile_detail( void );
 void		fileanalyze_remove_entetefile( void );
 void		fileanalyze_add_file_to_treeview( TYPE_FILESELECTION p_TypeFileselection, GSList *p_list );
 gboolean	fileanalyze_exist( DETAIL *detail, gchar *NewExt );
-// 
+//
 // ---------------------------------------------------------------------------
 // FILE_CONV.C
 // ---------------------------------------------------------------------------
-// 
+//
 void		fileconv_action( void );
-// 
+//
 // ---------------------------------------------------------------------------
 // FILE_MP3OGG.C
 // ---------------------------------------------------------------------------
-// 
+//
 void		FileMp3Ogg_set_flag_buttons( void );
 void		FileMp3Ogg_affiche_glist( void );
 gboolean	FileMp3Ogg_del_file_clicked( void );
 void		FileMp3Ogg_change_parameters( void );
-// 
+// void		FileMp3Ogg_update_newbitrate( TYPE_FILE_IS p_TypeFileIs );
+void		FileMp3Ogg_update_newbitrate( TYPE_FILE_IS p_TypeFileIs, gint p_debit, gint p_mode_managed, gint p_downmix );
+//
 // ---------------------------------------------------------------------------
 // FILE_MP3OGG_CONV.C
 // ---------------------------------------------------------------------------
-// 
+//
 void		filemp3oggconv_apply_regul_mp3ogg_by_conv( void );
-// 
+//
 // ---------------------------------------------------------------------------
 // FILE_WAV.C
 // ---------------------------------------------------------------------------
-// 
+//
 void		FileWav_affiche_glist( void );
 void		FileWav_change_parameters( void );
 void		FileWav_set_flag_buttons( void );
 void		FileWav_from_popup( TYPE_SET_FROM_POPUP_FILE TypeSetFromPopup, DETAIL *detail, gint freq, gint voie, gint bits );
-// 
+//
 // ---------------------------------------------------------------------------
 // FILE_TAGS.C
 // ---------------------------------------------------------------------------
-// 
+//
 void		FileTags_affiche_glist( void );
 gboolean	FileWav_del_file_clicked( void );
 gboolean	FileTags_del_file_clicked( void );
 void		FileTags_appliquer_clicked( void );
 void		FileTags_set_flag_buttons( void );
-// 
+void 		FileTags_changed_all_tags (gint TYPE_TAG);
+//
 // ---------------------------------------------------------------------------
 // FILE_WAV_CONV.C
 // ---------------------------------------------------------------------------
-// 
+//
 void		filewavconv_apply( void );
-// 
+//
 // ---------------------------------------------------------------------------
 // FILE_ACTION.C
 // ---------------------------------------------------------------------------
-// 
+//
 typedef enum {
 	TYPE_REPLAYGAINCLEAR = 0,
 	TYPE_NORMALISE,
@@ -682,11 +694,11 @@
 
 void		fileaction_choice( void );
 void		fileaction_set_end( FILEACTION_TYPE FileActionType );
-// 
+//
 // ---------------------------------------------------------------------------
 // FILE_LC.C
 // ---------------------------------------------------------------------------
-// 
+//
 #include "conv.h"
 
 typedef struct {
@@ -701,22 +713,24 @@
 	gchar		*PtrStrBitrate;
 } PARAM_FILELC;
 
-gint		filelc_get_command_line_remove( void );
-gint		filelc_get_command_line_nice( void );
-void		filelc_get_command_line( PARAM_FILELC *param_filelc );
+//
+// Allocate Tab Args
+//
+gchar		**filelc_AllocTabArgs( void );
+gchar		**filelc_RemoveTab( gchar **p_PtrTabArgs );
+// gint		filelc_get_command_line_remove( void );
+// gint		filelc_get_command_line_nice( void );
+gchar		**filelc_get_command_line( PARAM_FILELC *param_filelc );
 void		filelc_get_command_line_extract( PARAM_FILELC *param_filelc );
 GList		*filelc_remove_glist( GList *New );
 void		filelc_get_command_line_extract_elem( gint Elem, gchar *Dev, gchar *Dest );
-// 
+//
 // ---------------------------------------------------------------------------
 // FILE_TRASH.C
 // ---------------------------------------------------------------------------
-// 
+//
 void		filetrash_action( void );
 gboolean	filetrash_ok( void );
-gboolean	filetrash_move_to_trash( gchar *Name );
-gchar		*filetrash_get_trash( void );
-void		filetrash_test_trash_is_ok( void );
 
 
 #endif

xcfa-4.2.8.tar.gz/src/file_action.c -> xcfa-5.0.2.tar.gz/src/file_action.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : file_action.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -59,28 +59,22 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
+#include <pthread.h>
 
 #ifdef ENABLE_STATIC_LIBRARY
 	#include "../lib/lib.h"
 #endif
 
-#include <pthread.h>
 #include "global.h"
 #include "file.h"
 #include "replaygain.h"
 #include "win_scan.h"
 #include "normalise.h"
-#include "popup_systray.h"
 #include "notify_send.h"
 
 
@@ -182,14 +176,13 @@
 	 FALSE == FileAction.bool_ReplaygainApply &&
 	 FALSE == FileAction.bool_trash) {
 		
-		PopupSystray_set_BoolMainAction (FALSE);
 		WindScan_close ();
-		gtk_timeout_remove (FileAction.handler_timeout);
+		g_source_remove (FileAction.handler_timeout);
 		
 		if (FALSE == conv.bool_stop) {
-			NotifySend_msg (_("XCFA: Traitement fichiers"), _("Ok"), conv.bool_stop);
+			NotifySend_msg (_("XCFA: Processing files"), _("Ok"), conv.bool_stop);
 		} else {
-			NotifySend_msg (_("XCFA: Traitement fichiers"), _("Arret par l'utilisateur"), conv.bool_stop);
+			NotifySend_msg (_("XCFA: Processing files"), _("Stop by user"), conv.bool_stop);
 		}
 	}
 	
@@ -236,9 +229,7 @@
 	FileAction.bool_ReplaygainApply = file_get_bool_ReplaygainApply ();
 	FileAction.bool_trash = filetrash_ok ();
 		
-	PopupSystray_set_BoolMainAction (TRUE);
-	
-	FileAction.handler_timeout = gtk_timeout_add (150, fileaction_timeout, 0);
+	FileAction.handler_timeout = g_timeout_add (150, fileaction_timeout, 0);
 }

xcfa-4.2.8.tar.gz/src/file_analyze.c -> xcfa-5.0.2.tar.gz/src/file_analyze.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : file_analyse.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -59,7 +54,6 @@
 #include "win_scan.h"
 #include "prg_init.h"
 #include "win_info.h"
-#include "popup_systray.h"
 #include "file.h"
 
 
@@ -100,21 +94,111 @@
 
 
 
-
-
-// 
+// SUPPRESSION DU CONTENU DE entetefile SI BoolRemove==TRUE ET DU GLIST
 // 
-gboolean fileanalyze_exist (DETAIL *detail, gchar *NewExt)
+void fileanalyze_remove_entetefile_detail( void )
 {
-	gchar *Name = NULL;
-	gboolean bool_exist = FALSE;
+	GList		*list = NULL;
+	DETAIL		*detail = NULL;
 	
-	if (NULL == (Name = file_get_pathname_dest (detail, NewExt))) return (FALSE);
+	if( NULL != ( list = g_list_first( entetefile ))) {
+		while (list) {
+			if( NULL != (detail = (DETAIL *)list->data) ) {
+			
+				if( TRUE == detail->BoolRemove ) {
+				
+					if( NULL != detail->namefile ) {
+						g_free( detail->namefile );
+						detail->namefile = NULL;
+					}
+					if( NULL != detail->NameDest ) {
+						g_free( detail->NameDest );
+						detail->NameDest = NULL;
+					}
+					if( NULL != detail->NameFileCopyFromNormalizate ) {
+						g_free( detail->NameFileCopyFromNormalizate );
+						detail->NameFileCopyFromNormalizate = NULL;
+					}
+				
+					if (detail->type_infosong_file_is == FILE_IS_FLAC) {
+						INFO_FLAC *info = (INFO_FLAC *)detail->info;
+						detail->info = (INFO_FLAC *)tagsflac_remove_info (info);
+					}
+					else if (detail->type_infosong_file_is == FILE_IS_WAV) {
+						INFO_WAV *info = (INFO_WAV *)detail->info;
+						// LevelDbfs = info->LevelDbfs;
+						detail->info = (INFO_WAV *)tagswav_remove_info (info);
+					}
+					else if (detail->type_infosong_file_is == FILE_IS_MP3) {
+						INFO_MP3 *info = (INFO_MP3 *)detail->info;
+						// LevelDbfs = info->LevelDbfs;
+						detail->info = (INFO_MP3 *)tagsmp3_remove_info (info);
+					}
+					else if (detail->type_infosong_file_is == FILE_IS_OGG) {
+						INFO_OGG *info = (INFO_OGG *)detail->info;
+						// LevelDbfs = info->LevelDbfs;
+						detail->info = (INFO_OGG *)tagsogg_remove_info (info);
+					}
+					else if (detail->type_infosong_file_is == FILE_IS_M4A) {
+						INFO_M4A *info = (INFO_M4A *)detail->info;
+						detail->info = (INFO_M4A *)tagsm4a_remove_info (info);
+					}
+					else if (detail->type_infosong_file_is == FILE_IS_VID_M4A) {
+						INFO_M4A *info = (INFO_M4A *)detail->info;
+						detail->info = (INFO_M4A *)tagsm4a_remove_info (info);
+					}
+					else if (detail->type_infosong_file_is == FILE_IS_AAC) {
+						INFO_AAC *info = (INFO_AAC *)detail->info;
+						detail->info = (INFO_AAC *)tagsaac_remove_info (info);
+					}
+					else if (detail->type_infosong_file_is == FILE_IS_SHN) {
+						INFO_SHN *info = (INFO_SHN *)detail->info;
+						detail->info = (INFO_SHN *)tagsshn_remove_info (info);
+					}
+					else if (detail->type_infosong_file_is == FILE_IS_WMA) {
+						INFO_WMA *info = (INFO_WMA *)detail->info;
+						detail->info = (INFO_WMA *)tagswma_remove_info (info);
+					}
+					else if (detail->type_infosong_file_is == FILE_IS_RM) {
+						INFO_RM *info = (INFO_RM *)detail->info;
+						detail->info = (INFO_RM *)tagsrm_remove_info (info);
+					}
+					else if (detail->type_infosong_file_is == FILE_IS_DTS) {
+						INFO_DTS *info = (INFO_DTS *)detail->info;
+						detail->info = (INFO_DTS *)tagsdts_remove_info (info);
+					}
+					else if (detail->type_infosong_file_is == FILE_IS_AIFF) {
+						INFO_AIFF *info = (INFO_AIFF *)detail->info;
+						detail->info = (INFO_AIFF *)tagsaiff_remove_info (info);
+					}
+					else if (detail->type_infosong_file_is == FILE_IS_MPC) {
+						INFO_MPC *info = (INFO_MPC *)detail->info;
+						detail->info = (INFO_MPC *)tagsmpc_remove_info (info);
+					}
+					else if (detail->type_infosong_file_is == FILE_IS_APE) {
+						INFO_APE *info = (INFO_APE *)detail->info;
+						detail->info = (INFO_APE *)tagsape_remove_info (info);
+					}
+					else if (detail->type_infosong_file_is == FILE_IS_WAVPACK) {
+						INFO_WAVPACK *info = (INFO_WAVPACK *)detail->info;
+						detail->info = (INFO_WAVPACK *)tagswavpack_remove_info (info);
+					}
+					else if (detail->type_infosong_file_is == FILE_IS_AC3) {
+						INFO_AC3 *info = (INFO_AC3 *)detail->info;
+						detail->info = (INFO_AC3 *)tagsac3_remove_info (info);
+					}
+			
+					g_free( detail );
+					detail = NULL;
+				}
+			}
+			list->data = NULL;
+			list = g_list_next (list);
+		}
 
-	bool_exist = libutils_access_mode (Name);
-	g_free (Name);
-	Name = NULL;
-	return (bool_exist);
+		g_list_free( entetefile );
+	}
+	entetefile = NULL;
 }
 // SUPPRESSION DU CONTENU DE entetefile ET DU GLIST
 // 
@@ -124,97 +208,120 @@
 	DETAIL *detail = NULL;
 	gint	 NbList = 0;
 	
-	list = g_list_first (entetefile);
-	while (list) {
-		if (NULL != (detail = (DETAIL *)list->data)) {
+	if( NULL != ( list = g_list_first( entetefile ))) {
+		while (list) {
+			if (NULL != (detail = (DETAIL *)list->data)) {
 			
-			if( NULL != detail->namefile ) {
-				g_free( detail->namefile );
-				detail->namefile = NULL;
-			}
-			if( NULL != detail->NameDest ) {
-				g_free( detail->NameDest );
-				detail->NameDest = NULL;
-			}
+				// fileanalyze_remove_entetefile_detail( &detail );
+			
+				if( NULL != detail->namefile ) {
+					g_free( detail->namefile );
+					detail->namefile = NULL;
+				}
+				if( NULL != detail->NameDest ) {
+					g_free( detail->NameDest );
+					detail->NameDest = NULL;
+				}
+				if( NULL != detail->NameFileCopyFromNormalizate ) {
+					g_free( detail->NameFileCopyFromNormalizate );
+					detail->NameFileCopyFromNormalizate = NULL;
+				}
 				
-			if (detail->type_infosong_file_is == FILE_IS_FLAC) {
-				INFO_FLAC *info = (INFO_FLAC *)detail->info;
-				detail->info = (INFO_FLAC *)tagsflac_remove_info (info);
-			}
-			else if (detail->type_infosong_file_is == FILE_IS_WAV) {
-				INFO_WAV *info = (INFO_WAV *)detail->info;
-				// LevelDbfs = info->LevelDbfs;
-				detail->info = (INFO_WAV *)tagswav_remove_info (info);
-			}
-			else if (detail->type_infosong_file_is == FILE_IS_MP3) {
-				INFO_MP3 *info = (INFO_MP3 *)detail->info;
-				// LevelDbfs = info->LevelDbfs;
-				detail->info = (INFO_MP3 *)tagsmp3_remove_info (info);
-			}
-			else if (detail->type_infosong_file_is == FILE_IS_OGG) {
-				INFO_OGG *info = (INFO_OGG *)detail->info;
-				// LevelDbfs = info->LevelDbfs;
-				detail->info = (INFO_OGG *)tagsogg_remove_info (info);
-			}
-			else if (detail->type_infosong_file_is == FILE_IS_M4A) {
-				INFO_M4A *info = (INFO_M4A *)detail->info;
-				detail->info = (INFO_M4A *)tagsm4a_remove_info (info);
-			}
-			else if (detail->type_infosong_file_is == FILE_IS_VID_M4A) {
-				INFO_M4A *info = (INFO_M4A *)detail->info;
-				detail->info = (INFO_M4A *)tagsm4a_remove_info (info);
-			}
-			else if (detail->type_infosong_file_is == FILE_IS_AAC) {
-				INFO_AAC *info = (INFO_AAC *)detail->info;
-				detail->info = (INFO_AAC *)tagsaac_remove_info (info);
-			}
-			else if (detail->type_infosong_file_is == FILE_IS_SHN) {
-				INFO_SHN *info = (INFO_SHN *)detail->info;
-				detail->info = (INFO_SHN *)tagsshn_remove_info (info);
-			}
-			else if (detail->type_infosong_file_is == FILE_IS_WMA) {
-				INFO_WMA *info = (INFO_WMA *)detail->info;
-				detail->info = (INFO_WMA *)tagswma_remove_info (info);
-			}
-			else if (detail->type_infosong_file_is == FILE_IS_RM) {
-				INFO_RM *info = (INFO_RM *)detail->info;
-				detail->info = (INFO_RM *)tagsrm_remove_info (info);
-			}
-			else if (detail->type_infosong_file_is == FILE_IS_DTS) {
-				INFO_DTS *info = (INFO_DTS *)detail->info;
-				detail->info = (INFO_DTS *)tagsdts_remove_info (info);
-			}
-			else if (detail->type_infosong_file_is == FILE_IS_AIFF) {
-				INFO_AIFF *info = (INFO_AIFF *)detail->info;
-				detail->info = (INFO_AIFF *)tagsaiff_remove_info (info);
-			}
-			else if (detail->type_infosong_file_is == FILE_IS_MPC) {
-				INFO_MPC *info = (INFO_MPC *)detail->info;
-				detail->info = (INFO_MPC *)tagsmpc_remove_info (info);
-			}
-			else if (detail->type_infosong_file_is == FILE_IS_APE) {
-				INFO_APE *info = (INFO_APE *)detail->info;
-				detail->info = (INFO_APE *)tagsape_remove_info (info);
-			}
-			else if (detail->type_infosong_file_is == FILE_IS_WAVPACK) {
-				INFO_WAVPACK *info = (INFO_WAVPACK *)detail->info;
-				detail->info = (INFO_WAVPACK *)tagswavpack_remove_info (info);
-			}
-			else if (detail->type_infosong_file_is == FILE_IS_AC3) {
-				INFO_AC3 *info = (INFO_AC3 *)detail->info;
-				detail->info = (INFO_AC3 *)tagsac3_remove_info (info);
-			}
+				if (detail->type_infosong_file_is == FILE_IS_FLAC) {
+					INFO_FLAC *info = (INFO_FLAC *)detail->info;
+					detail->info = (INFO_FLAC *)tagsflac_remove_info (info);
+				}
+				else if (detail->type_infosong_file_is == FILE_IS_WAV) {
+					INFO_WAV *info = (INFO_WAV *)detail->info;
+					// LevelDbfs = info->LevelDbfs;
+					detail->info = (INFO_WAV *)tagswav_remove_info (info);
+				}
+				else if (detail->type_infosong_file_is == FILE_IS_MP3) {
+					INFO_MP3 *info = (INFO_MP3 *)detail->info;
+					// LevelDbfs = info->LevelDbfs;
+					detail->info = (INFO_MP3 *)tagsmp3_remove_info (info);
+				}
+				else if (detail->type_infosong_file_is == FILE_IS_OGG) {
+					INFO_OGG *info = (INFO_OGG *)detail->info;
+					// LevelDbfs = info->LevelDbfs;
+					detail->info = (INFO_OGG *)tagsogg_remove_info (info);
+				}
+				else if (detail->type_infosong_file_is == FILE_IS_M4A) {
+					INFO_M4A *info = (INFO_M4A *)detail->info;
+					detail->info = (INFO_M4A *)tagsm4a_remove_info (info);
+				}
+				else if (detail->type_infosong_file_is == FILE_IS_VID_M4A) {
+					INFO_M4A *info = (INFO_M4A *)detail->info;
+					detail->info = (INFO_M4A *)tagsm4a_remove_info (info);
+				}
+				else if (detail->type_infosong_file_is == FILE_IS_AAC) {
+					INFO_AAC *info = (INFO_AAC *)detail->info;
+					detail->info = (INFO_AAC *)tagsaac_remove_info (info);
+				}
+				else if (detail->type_infosong_file_is == FILE_IS_SHN) {
+					INFO_SHN *info = (INFO_SHN *)detail->info;
+					detail->info = (INFO_SHN *)tagsshn_remove_info (info);
+				}
+				else if (detail->type_infosong_file_is == FILE_IS_WMA) {
+					INFO_WMA *info = (INFO_WMA *)detail->info;
+					detail->info = (INFO_WMA *)tagswma_remove_info (info);
+				}
+				else if (detail->type_infosong_file_is == FILE_IS_RM) {
+					INFO_RM *info = (INFO_RM *)detail->info;
+					detail->info = (INFO_RM *)tagsrm_remove_info (info);
+				}
+				else if (detail->type_infosong_file_is == FILE_IS_DTS) {
+					INFO_DTS *info = (INFO_DTS *)detail->info;
+					detail->info = (INFO_DTS *)tagsdts_remove_info (info);
+				}
+				else if (detail->type_infosong_file_is == FILE_IS_AIFF) {
+					INFO_AIFF *info = (INFO_AIFF *)detail->info;
+					detail->info = (INFO_AIFF *)tagsaiff_remove_info (info);
+				}
+				else if (detail->type_infosong_file_is == FILE_IS_MPC) {
+					INFO_MPC *info = (INFO_MPC *)detail->info;
+					detail->info = (INFO_MPC *)tagsmpc_remove_info (info);
+				}
+				else if (detail->type_infosong_file_is == FILE_IS_APE) {
+					INFO_APE *info = (INFO_APE *)detail->info;
+					detail->info = (INFO_APE *)tagsape_remove_info (info);
+				}
+				else if (detail->type_infosong_file_is == FILE_IS_WAVPACK) {
+					INFO_WAVPACK *info = (INFO_WAVPACK *)detail->info;
+					detail->info = (INFO_WAVPACK *)tagswavpack_remove_info (info);
+				}
+				else if (detail->type_infosong_file_is == FILE_IS_AC3) {
+					INFO_AC3 *info = (INFO_AC3 *)detail->info;
+					detail->info = (INFO_AC3 *)tagsac3_remove_info (info);
+				}
 			
-			detail = list->data = NULL;
+				detail = list->data = NULL;
 			
-			NbList ++;
+				NbList ++;
+			}
+			list = g_list_next (list);
 		}
-		list = g_list_next (list);
+		g_list_free( entetefile );
+		entetefile = NULL;
 	}
-	entetefile = libutils_remove_glist (entetefile);
+	
 	if( TRUE == OptionsCommandLine.BoolVerboseMode )
 		g_print ("\tRemove: %d\n", NbList);
 }
+// 
+// 
+gboolean fileanalyze_exist (DETAIL *detail, gchar *NewExt)
+{
+	gchar *Name = NULL;
+	gboolean bool_exist = FALSE;
+	
+	if (NULL == (Name = file_get_pathname_dest (detail, NewExt))) return (FALSE);
+
+	bool_exist = libutils_access_mode (Name);
+	g_free (Name);
+	Name = NULL;
+	return (bool_exist);
+}
 // RECHERCHE RECURSIVE DES FICHIERS
 // INDIQUE LE NOMBRE TOTAL DANS: VarAnalyze.RecTotalFile
 // 
@@ -225,7 +332,6 @@
 	DIR *dp;
 	struct dirent *entry;
 	struct stat statbuf;
-	gint	Dummy;
 	
 	// PRINT_FUNC_LF();
 	
@@ -240,7 +346,7 @@
 		return;
 	}
 		
-	Dummy = chdir (Directory);
+	chdir (Directory);
 	while ((entry = readdir (dp)) != NULL) {
 		
 		if (WindScan_close_request () == TRUE) break;
@@ -283,7 +389,7 @@
 			}
 		}
 	}
-	Dummy = chdir ("..");
+	chdir ("..");
 	closedir (dp);
 }
 // 
@@ -465,7 +571,6 @@
 	GList		*List = NULL;
 	DETAIL		*detail = NULL;
 	VAR_LIST_FILES	*VarListFiles = NULL;
-	gint		 Cpt;
 	
 	List = g_list_first (VarAnalyze.ListFiles);
 	while (List) {
@@ -516,12 +621,14 @@
 				detail->Etat_ReplayGain = RPG_ATTENTE;
 			}
 			
-			detail->TypeMp3Ogg.BoolChanged = FALSE;
-			detail->TypeMp3Ogg.type = -1;
-			for (Cpt = 0; Cpt < 4; Cpt ++) {
-				detail->TypeMp3Ogg.debit [ Cpt ] = -1;
-				detail->TypeMp3Ogg.mode [ Cpt ] = -1;
-			}
+			// MP3: DEBIT MODE
+			detail->Mp3_Debit = -1;
+			detail->Mp3_Mode = -1;
+			// OGG: DEBIT MANAGED DOWNMIX
+			detail->Ogg_Debit = -1;
+			detail->Ogg_Managed = -1;
+			detail->Ogg_Downmix = -1;
+			detail->BoolChanged = FALSE;
 			
 			if (VarListFiles->TypeFileIs == FILE_IS_FLAC) detail->info = tagsflac_get_info (detail);
 			else if (VarListFiles->TypeFileIs == FILE_IS_WAV) detail->info = tagswav_get_info (detail->namefile);
@@ -612,17 +719,18 @@
 	}
 	else if (FALSE == VarAnalyze.BoolInThread) {
 		WindScan_close ();
-		PopupSystray_set_BoolMainAction (FALSE);
-		gtk_timeout_remove (VarAnalyze.HandlerTimeoutDo);
+		g_source_remove (VarAnalyze.HandlerTimeoutDo);
 		file_affiche_glist ();
 		FileWav_affiche_glist ();
 		FileMp3Ogg_affiche_glist ();
 		FileTags_affiche_glist ();
 		
 		if (TRUE == VarAnalyze.BoolNoFindCheckMp3) {
-			wininfo_create (
+			wind_info_init (
+				WindMain,
 				_("Package checkmp3 (mp3check) NOT FOUND !"),
-				_("Veuillez installer checkmp3 ou mp3check pour\nla prise en compte des fichiers mp3"),
+				_("Please install or checkmp3 mp3check for\nconsideration of mp3 files"),
+				
 			 	"");
 		}
 	}
@@ -640,7 +748,12 @@
 	
 	if (NULL == p_list) return;
 	
-	WindScan_open ("Files scan", WINDSCAN_PULSE);
+	// WindScan_open ("Files scan", WINDSCAN_PULSE);
+	wind_scan_init(
+		WindMain,
+		"Files scan",
+		WINDSCAN_PULSE
+		);
 	WindScan_set_label ("Scan directory, verify and load ...");
 	
 	// TYPE DE FICHIER EN RECHERCHE
@@ -662,10 +775,8 @@
 	VarAnalyze.BoolSetPercent = FALSE;
 	VarAnalyze.BoolNoFindCheckMp3 = FALSE;
 	
-	PopupSystray_set_BoolMainAction (TRUE);
-	
 	pthread_create (&nmr_tid_1, NULL ,(void *)fileanalyze_thread, (void *)NULL);
-	VarAnalyze.HandlerTimeoutDo = gtk_timeout_add (100, fileanalyze_timeout, 0);
+	VarAnalyze.HandlerTimeoutDo = g_timeout_add (100, fileanalyze_timeout, 0);
 }

xcfa-4.2.8.tar.gz/src/file_conv.c -> xcfa-5.0.2.tar.gz/src/file_conv.c Changed

@@ -1,25 +1,25 @@
 /*
 * file : file_conv.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
 *
 * This file is part of XCFA.
- * 
+ *
 * XCFA is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * at your option) any later version.
- * 
+ *
 * XCFA is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with XCFA. If not, see <http://www.gnu.org/licenses/>.
 */
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <glib/gprintf.h>
 #include <glib.h>
@@ -45,7 +40,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
- 
+
 
 #ifdef ENABLE_STATIC_LIBRARY
 	#include "../lib/lib.h"
@@ -60,27 +55,38 @@
 #include "notify_send.h"
 #include "tags.h"
 #include "win_scan.h"
+#include "win_info.h"
 #include "file.h"
 
 
 
 typedef struct {
-	gboolean	Bool;
-	
+	gboolean	BoolResultMplayerIsOk;
+	gboolean	BoolResultSoxIsOk;
+	gboolean	bool_thread_conv_one;
+	gboolean	bool_thread_conv_two;
+	gboolean	bool_thread_conv_three;
 } VAR_FILE_CONV;
 
 VAR_FILE_CONV VarFileConv = {
+			FALSE,
+			FALSE,
+			FALSE,
+			FALSE,
 			FALSE
 			};
 
+pthread_mutex_t		mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_cond_t		synchro = PTHREAD_COND_INITIALIZER;
 
 
-// 
-// 
+
+//
+//
 void fileconv_infos (DETAIL *detail)
 {
 	if( FALSE == OptionsCommandLine.BoolVerboseMode ) return;
-	
+
 	g_print ("\nCONVERSION(S) DEPUIS L'ONGLET 'FICHIERS'\n");
 	if (detail->type_infosong_file_is == FILE_IS_WMA) {
 		g_print ("\tFrom FILE_IS_WMA\n");
@@ -132,723 +138,196 @@
 	if (detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST)	g_print ("\t\tTo Aac%s\n", detail->EtatSelection_Aac >= ETAT_SELECT_EXPERT ? "............WithLineExpert" :"");
 	if (detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST)	g_print ("\t\tTo Mpc%s\n", detail->EtatSelection_Mpc >= ETAT_SELECT_EXPERT ? "............WithLineExpert" :"");
 	if (detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST)	g_print ("\t\tTo Ape%s\n", detail->EtatSelection_Ape >= ETAT_SELECT_EXPERT ? "............WithLineExpert" :"");
-	if (detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST)	g_print ("\t\tTo WavPack%s\n", detail->EtatSelection_WavPack >= ETAT_SELECT_EXPERT ? "........WithLineExpert" :"");	
+	if (detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST)	g_print ("\t\tTo WavPack%s\n", detail->EtatSelection_WavPack >= ETAT_SELECT_EXPERT ? "........WithLineExpert" :"");
 	g_print ("\n");
 }
-// 
-// 
-void fileconv_copy_src_to_dest (DETAIL *detail, CONV_FIC *PConv)
+//
+//
+void fileconv_copy_src_to_dest( TYPE_FILE_IS p_TypeFileIs, DETAIL *detail, CONV_FIC *PConv )
 {
-	if (TRUE == conv.bool_stop) return;
+	if( TRUE == conv.bool_stop) return;
 
-	if (detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST && libutils_test_file_exist (PConv->tmp_flac)) {
-		conv_copy_src_to_dest (PConv->tmp_flac, PConv->dest_flac);
+	if( p_TypeFileIs == FILE_IS_WAV && detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST && libutils_test_file_exist (PConv->tmp_wav)) {
+		conv_copy_src_to_dest( PConv->tmp_wav, PConv->dest_wav);
+		detail->EtatSelection_Wav = ETAT_ATTENTE_EXIST;
+		conv.Bool_MAJ_select = TRUE;
+	}
+	else if( p_TypeFileIs == FILE_IS_FLAC && detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST && libutils_test_file_exist(PConv->tmp_flac) ) {
+		conv_copy_src_to_dest( PConv->tmp_flac, PConv->dest_flac);
 		detail->EtatSelection_Flac = ETAT_ATTENTE_EXIST;
 		conv.Bool_MAJ_select = TRUE;
 	}
-	if (detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST && libutils_test_file_exist (PConv->tmp_ape)) {
-		conv_copy_src_to_dest (PConv->tmp_ape, PConv->dest_ape);
+	else if( p_TypeFileIs == FILE_IS_APE && detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST && libutils_test_file_exist (PConv->tmp_ape)) {
+		conv_copy_src_to_dest( PConv->tmp_ape, PConv->dest_ape);
 		detail->EtatSelection_Ape = ETAT_ATTENTE_EXIST;
 		conv.Bool_MAJ_select = TRUE;
 	}
-	if (detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST && libutils_test_file_exist (PConv->tmp_mp3)) {
-		conv_copy_src_to_dest (PConv->tmp_mp3, PConv->dest_mp3);
-		detail->EtatSelection_Mp3 = ETAT_ATTENTE_EXIST;
+	else if( p_TypeFileIs == FILE_IS_WAVPACK && detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST && libutils_test_file_exist (PConv->tmp_wavpack)) {
+		conv_copy_src_to_dest( PConv->tmp_wavpack, PConv->dest_wavpack);
+
+		if (*optionsWavpack_get_wavpack_correction_file () != '\0') {
+			conv_copy_src_to_dest( PConv->tmp_wavpack_md5, PConv->dest_wavpack_md5);
+		}
+		detail->EtatSelection_WavPack = ETAT_ATTENTE_EXIST;
 		conv.Bool_MAJ_select = TRUE;
 	}
-	if (detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST && libutils_test_file_exist (PConv->tmp_ogg)) {
-		conv_copy_src_to_dest (PConv->tmp_ogg, PConv->dest_ogg);
+	else if( p_TypeFileIs == FILE_IS_OGG && detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST && libutils_test_file_exist (PConv->tmp_ogg)) {
+		conv_copy_src_to_dest( PConv->tmp_ogg, PConv->dest_ogg);
 		detail->EtatSelection_Ogg = ETAT_ATTENTE_EXIST;
 		conv.Bool_MAJ_select = TRUE;
 	}
-	if (detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST && libutils_test_file_exist (PConv->tmp_wav)) {
-		conv_copy_src_to_dest (PConv->tmp_wav, PConv->dest_wav);
-		detail->EtatSelection_Wav = ETAT_ATTENTE_EXIST;
-		conv.Bool_MAJ_select = TRUE;
-	}
-	if (detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST && libutils_test_file_exist (PConv->tmp_m4a)) {
-		conv_copy_src_to_dest (PConv->tmp_m4a, PConv->dest_m4a);
+	else if( p_TypeFileIs == FILE_IS_M4A && detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST && libutils_test_file_exist (PConv->tmp_m4a)) {
+		conv_copy_src_to_dest( PConv->tmp_m4a, PConv->dest_m4a);
 		detail->EtatSelection_M4a = ETAT_ATTENTE_EXIST;
 		conv.Bool_MAJ_select = TRUE;
 	}
-	if (detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST && libutils_test_file_exist (PConv->tmp_mpc)) {
-		conv_copy_src_to_dest (PConv->tmp_mpc, PConv->dest_mpc);
-		detail->EtatSelection_Mpc = ETAT_ATTENTE_EXIST;
+	else if( p_TypeFileIs == FILE_IS_AAC && detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST && libutils_test_file_exist (PConv->tmp_aac)) {
+		conv_copy_src_to_dest( PConv->tmp_aac, PConv->dest_aac);
+		detail->EtatSelection_Aac = ETAT_ATTENTE_EXIST;
 		conv.Bool_MAJ_select = TRUE;
 	}
-	if (detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST && libutils_test_file_exist (PConv->tmp_aac)) {
-		conv_copy_src_to_dest (PConv->tmp_aac, PConv->dest_aac);
-		detail->EtatSelection_Aac = ETAT_ATTENTE_EXIST;
+	else if( p_TypeFileIs == FILE_IS_MPC && detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST && libutils_test_file_exist (PConv->tmp_mpc)) {
+		conv_copy_src_to_dest( PConv->tmp_mpc, PConv->dest_mpc);
+		detail->EtatSelection_Mpc = ETAT_ATTENTE_EXIST;
 		conv.Bool_MAJ_select = TRUE;
 	}
-	if (detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST && libutils_test_file_exist (PConv->tmp_wavpack)) {
-		conv_copy_src_to_dest (PConv->tmp_wavpack, PConv->dest_wavpack);
-		
-		if (*optionsWavpack_get_wavpack_correction_file () != '\0') {
-			conv_copy_src_to_dest (PConv->tmp_wavpack_md5, PConv->dest_wavpack_md5);
-		}
-		detail->EtatSelection_WavPack = ETAT_ATTENTE_EXIST;
+	else if( p_TypeFileIs == FILE_IS_MP3 && detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST && libutils_test_file_exist (PConv->tmp_mp3)) {
+		conv_copy_src_to_dest( PConv->tmp_mp3, PConv->dest_mp3);
+		detail->EtatSelection_Mp3 = ETAT_ATTENTE_EXIST;
 		conv.Bool_MAJ_select = TRUE;
 	}
-	if (detail->EtatTrash == FILE_TRASH_OK) detail->EtatTrash = FILE_TRASH_VERIF_OK;
+	if( detail->EtatTrash == FILE_TRASH_OK ) detail->EtatTrash = FILE_TRASH_VERIF_OK;
 }
-// 
-// 
-void fileconv_change_quantification_with_sox (DETAIL *detail, CONV_FIC *PConv, gchar *Quantification)
+//
+// PConv->tmp_wav TO PConv->tmp_sox
+//
+gboolean fileconv_change_quantification_with_sox( CONV_FIC *PConv, gint p_Hertz, gint p_Channels, gint p_Bits )
 {
-	INFO_WAV	*info = (INFO_WAV *)detail->info;
+	gchar	StrHertz[ 10 ];
+	gchar	StrChannels[ 10 ];
+	gchar	StrBits[ 10 ];
+	gchar	**PtrTabArgs = NULL;
+
+	g_sprintf( &StrHertz[0], "%d", (gint)p_Hertz );
+	g_sprintf( &StrChannels[0], "%d", (gint)p_Channels );
+	g_sprintf( &StrBits[0], "%d", (gint)p_Bits );
+
+pthread_mutex_lock( &mutex );
+	PtrTabArgs = conv_with_sox_get_param( PConv->tmp_wav, PConv->tmp_sox, StrHertz, StrChannels, StrBits );
+pthread_mutex_unlock( &mutex );
+	conv_to_convert( PtrTabArgs, FALSE, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
+	PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 
-	conv_with_sox_get_param (PConv->tmp_wav, PConv->tmp_sox, info->hertz, info->voie, Quantification);
-	conv_to_convert (FALSE, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
-	filelc_get_command_line_remove ();
+	return( libutils_test_file_exist( PConv->tmp_sox ));
 }
-// 
-// 
-static void fileconv_thread (void *arg)
+//
+//
+// http://www.bien-programmer.fr/pthreads.htm
+//
+//
+static void fileconv_thread_one (void *arg)
 {
 	GList		*ListGlobal = NULL;
 	DETAIL		*detail = NULL;
 	CONV_FIC	*PConv = NULL;
 	PARAM_FILELC	param_filelc;
 	gint		pos;
-	gboolean	BoolResultMplayerIsOk = FALSE;
-	
-	conv.bool_thread_conv = TRUE;
-	PRINT("DEBUT THREAD FILECONV");
+	TAGS		*InfosTags = NULL;
+	gint		Channels;
+	gint		Hertz;
+	gint		Bits;
+	gint		NewBits;
+
+	VarFileConv.bool_thread_conv_one = TRUE;
+
+	PRINT("DEBUT THREAD FILECONV ONE");
 	ListGlobal = g_list_first (entetefile);
 	while (FALSE == conv.bool_stop && ListGlobal) {
 		if (NULL != (detail = (DETAIL *)ListGlobal->data) && NULL != (PConv = (CONV_FIC *)detail->PConv)) {
-		
-			/*
-			SOURCE WAV
-			DEST FLAC : WAV -> FLAC flac
-			DEST MP3 : WAV -> MP3 lame
-			DEST OGG : WAV -> OGG oggenc
-			DEST M4A : WAV -> M4A faac
-			DEST AAC	: WAV -> M4A aacplusenc
-			DEST MPC : WAV -> MPC mppenc
-			DEST APE : WAV -> APE mac
-			DEST WAVPACK : WAV -> WAVPACK wavpack
-			*/
-			if (FALSE == conv.bool_stop && FILE_IS_WAV == detail->type_infosong_file_is &&
-				(
-				detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST
-				)) {
 
-				INFO_WAV	*info = (INFO_WAV *)detail->info;
-				gint		 Channels;
-				gint		 Hertz;
-				gint		 Bits;
-				gchar		 StrBits [ 10 ];
-
-				fileconv_infos (detail);
-				
-				// COPIE DANS LE DOSSIER TEMPORAIRE
-				// SI <> NULL ALORS 'detail->NameFileCopyFromNormalizate' SE TROUVE DEJA DANS LE DOSSIER TEMPORAIRE
-				if (NULL == detail->NameFileCopyFromNormalizate) {
-					conv_copy_src_to_dest (detail->namefile, PConv->tmp_wav);
-				}
-						
-				// CONVERSION FLAC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST) {
-					
-					tagswav_file_GetBitrate (PConv->tmp_wav, &Channels, &Hertz, &Bits);
-					
-					// REAJUSTE LA QUANTIFICATION
-					// (Bits != 24 && Bits != 16 && Bits != 8)
-					if (TRUE == PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_FLAC ]) {
-						
-						g_sprintf (&StrBits[0], "%d", (gint)Bits);
-
-						if (Bits > 24)				strcpy (StrBits, "24");
-						else if (Bits > 16 && Bits < 24)	strcpy (StrBits, (Bits - 16) < 3 ? "24" : "16");
-						else if (Bits > 8 && Bits < 16)	strcpy (StrBits, (Bits - 8) < 3 ? "16" : "8");
-						else if (Bits < 8)			strcpy (StrBits, "8");
-						
-						fileconv_change_quantification_with_sox (detail, PConv, StrBits);
-					}
-					
-					param_filelc.type_conv = FLAC_WAV_TO_FLAC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Flac >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = (TRUE == PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_FLAC ]) ? PConv->tmp_sox : PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_flac;
-					param_filelc.tags = NULL;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.PtrStrBitrate = NULL;
-						
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FLAC_WAV_TO_FLAC, "FLAC_WAV_TO_FLAC");
-					filelc_get_command_line_remove ();
-				}
-				
-				// CONVERSION APE
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST) {
-					
-					tagswav_file_GetBitrate (PConv->tmp_wav, &Channels, &Hertz, &Bits);
-					
-					// REAJUSTE LA QUANTIFICATION
-					// (Bits != 16 && Bits != 8)
-					if (TRUE == PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_APE ]) {
-						
-						g_sprintf (&StrBits[0], "%d", (gint)Bits);
-						if (Bits > 16)			strcpy (StrBits, "16");
-						else if (Bits > 8 && Bits < 16)	strcpy (StrBits, (Bits - 8) < 3 ? "16" : "8");
-						else if (Bits < 8)		strcpy (StrBits, "8");
-						
-						fileconv_change_quantification_with_sox (detail, PConv, StrBits);
-					}
-
-					param_filelc.type_conv = MAC_WAV_TO_APE;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Ape >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = (TRUE == PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_APE ]) ? PConv->tmp_sox : PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_ape;
-					param_filelc.tags = NULL;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.PtrStrBitrate = NULL;
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, MAC_WAV_TO_APE, "MAC_WAV_TO_APE");
-					filelc_get_command_line_remove ();
-				}
-				
-				// CONVERSION WAVPACK
-				if (FALSE == conv.bool_stop && detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST) {
-					
-					PConv->BoolEtatConv [ ETAT_BOOL_WAVPACK ] = TRUE;
-						
-					param_filelc.type_conv = WAVPACK_WAV_TO_WAVPACK;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_WavPack >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_wavpack;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.PtrStrBitrate = NULL;
-						
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, WAVPACK_WAV_TO_WAVPACK, "WAVPACK_WAV_TO_WAVPACK");
-					filelc_get_command_line_remove ();
-				}
-				
-				// CONVERSION OGG
-				// BUG TROUVE PAR XAVIER
-				// =====================
-				// Si je veux normaliser et convertir un wav 48 kHz en ogg, xcfa me crée un ogg en 44.1 kHz... Pas normal, hein ?
-				// 
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST) {
-					
-					tagswav_file_GetBitrate (PConv->tmp_wav, &Channels, &Hertz, &Bits);
-					
-					// REAJUSTE LA QUANTIFICATION
-					// (Bits != 24 && Bits != 16 && Bits != 8);
-					if (TRUE == PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_OGG ]) {
-						
-						g_sprintf (&StrBits[0], "%d", (gint)Bits);
-
-						if (Bits > 24)				{ strcpy (StrBits, "24"); Bits = 24; }
-						else if (Bits > 16 && Bits < 24)	strcpy (StrBits, (Bits - 16) < 3 ? "24" : "16");
-						else if (Bits > 8 && Bits < 16)		strcpy (StrBits, (Bits - 8) < 3 ? "16" : "8");
-						else if (Bits < 8)			strcpy (StrBits, "8");
-						
-						fileconv_change_quantification_with_sox (detail, PConv, StrBits);
-					}
-					
-					// SET WITH FLOAT FORMAT IF == 24
-					if (Bits == 24) {
-						// SOX
-						conv_with_sox_float_get_param (
-									(TRUE == PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_OGG ]) ? PConv->tmp_sox : PConv->tmp_wav,
-									PConv->tmp_sox_24);
-						
-						conv_to_convert (FALSE, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
-						filelc_get_command_line_remove ();
+			// ------------------------------------------------------------------------
+			//
+			// FROM:
+			//	FLAC | APE | WAVPACK | OGG | M4A | FILE_IS_VID_M4A | MPC | MP3 | WMA | SHORTEN | RM | DTS | AIF | AC3
+			// TO:
+			//	WAV
+			//
+			// ------------------------------------------------------------------------
 
-						conv_copy_src_to_dest (PConv->tmp_sox_24, PConv->tmp_sox);
-					}
+			if( FALSE == conv.bool_stop ) {
 
-					param_filelc.type_conv = OGGENC_WAV_TO_OGG;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Ogg >= ETAT_SELECT_EXPERT;
-					
-					if (TRUE == PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_OGG ] || Bits == 24) {
-						param_filelc.filesrc = PConv->tmp_sox;
-					}
-					else {
-						param_filelc.filesrc = PConv->tmp_wav;
-					}
-					
-					param_filelc.filedest = PConv->tmp_ogg;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = options_get_params (OGGENC_WAV_TO_OGG, NULL);
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, OGGENC_WAV_TO_OGG, "OGGENC_WAV_TO_OGG");
-					filelc_get_command_line_remove ();
-				}				
-				
-				// CONVERSION M4A
-				if (FALSE == conv.bool_stop && detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST) {
-					
-					tagswav_file_GetBitrate (PConv->tmp_wav, &Channels, &Hertz, &Bits);
-					
-					// REAJUSTE LA QUANTIFICATION
-					// (Bits != 64 && Bits != 32 && Bits != 24 && Bits != 16 && Bits != 8)
-					if (TRUE == PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_M4A ]) {
-						
-						g_sprintf (&StrBits[0], "%d", (gint)Bits);
-
-						if (Bits > 64)				strcpy (StrBits, "64");
-						else if (Bits > 32 && Bits < 64)	{ strcpy (StrBits, "32"); Bits = 32; }
-						else if (Bits > 24 && Bits < 32)	{ strcpy (StrBits, "24"); Bits = 24; }
-						else if (Bits > 16 && Bits < 24)	strcpy (StrBits, (Bits - 16) < 3 ? "24" : "16");
-						else if (Bits > 8 && Bits < 16)		strcpy (StrBits, (Bits - 8) < 3 ? "16" : "8");
-						else if (Bits < 8)			strcpy (StrBits, "8");
-						
-						fileconv_change_quantification_with_sox (detail, PConv, StrBits);
-						// SORTIE FICHIER EN tmp_sox
-					}
-					else {
-						conv_copy_src_to_dest (PConv->tmp_wav, PConv->tmp_sox);
-					}
-					
-					// SET WITH FLOAT FORMAT IF Bits == 24 || 32
-					if (Bits == 32 || Bits == 24) {
-
-						conv_with_sox_float_get_param (
-									PConv->tmp_sox, 
-									PConv->tmp_sox_24);
-						conv_to_convert (FALSE, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
-						filelc_get_command_line_remove ();
-
-						conv_copy_src_to_dest (PConv->tmp_sox_24, PConv->tmp_sox);
-						// SORTIE FICHIER EN tmp_sox
-					}
-
-					param_filelc.type_conv = FAAC_WAV_TO_M4A;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_M4a >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_sox;
-					param_filelc.filedest = PConv->tmp_m4a;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-						
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FAAC_WAV_TO_M4A, "FAAC_WAV_TO_M4A");
-					filelc_get_command_line_remove ();
-				}
-				
-				// CONVERSION AAC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST) {
-					
-					tagswav_file_GetBitrate (PConv->tmp_wav, &Channels, &Hertz, &Bits);
-
-					// REAJUSTE LA QUANTIFICATION
-					// (Bits != 64 && Bits != 32 && Bits != 24 && Bits != 16 && Bits != 8)
-					if (TRUE == PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_AAC ]) {
-						
-						g_sprintf (&StrBits[0], "%d", (gint)Bits);
-
-						if (Bits > 64)				strcpy (StrBits, "64");
-						else if (Bits > 32 && Bits < 64)	strcpy (StrBits, "32");
-						else if (Bits > 24 && Bits < 32)	{ strcpy (StrBits, "24"); Bits = 24; }
-						else if (Bits > 16 && Bits < 24)	strcpy (StrBits, (Bits - 16) < 3 ? "24" : "16");
-						else if (Bits > 8 && Bits < 16)		strcpy (StrBits, (Bits - 8) < 3 ? "16" : "8");
-						else if (Bits < 8)			strcpy (StrBits, "8");
-						
-						fileconv_change_quantification_with_sox (detail, PConv, StrBits);
-						// SORTIE FICHIER EN tmp_sox
-					}
-					else {
-						conv_copy_src_to_dest (PConv->tmp_wav, PConv->tmp_sox);
-						// SORTIE FICHIER EN tmp_sox
-					}
-					
-					// SET WITH FLOAT FORMAT IF Bits == 24
-					if (Bits == 24) {
-						// SOX FLOAT
-						conv_with_sox_float_get_param (PConv->tmp_sox, PConv->tmp_sox_24);
-						conv_to_convert (FALSE, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
-						filelc_get_command_line_remove ();
-
-						conv_copy_src_to_dest (PConv->tmp_sox_24, PConv->tmp_sox);
-						// SORTIE FICHIER EN tmp_sox
-					}
-					
-					if (Hertz < 44100) {
-						pos = filelc_get_command_line_nice ();
-						conv.ArgConv [ pos++ ] = g_strdup ("mplayer");
-						conv.ArgConv [ pos++ ] = g_strdup ("-nojoystick");
-						conv.ArgConv [ pos++ ] = g_strdup ("-nolirc");
-						conv.ArgConv [ pos++ ] = g_strdup (PConv->tmp_sox);
-						conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-						conv.ArgConv [ pos++ ] = g_strdup ("pcm");
-						conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-						conv.ArgConv [ pos++ ] = g_strdup_printf ("pcm:file=%s",PConv->tmp_sox_24);
-						conv.ArgConv [ pos++ ] = g_strdup ("-srate");
-						conv.ArgConv [ pos++ ] = g_strdup ("44100");
-						conv.ArgConv [ pos++ ] = NULL;
-						
-						conv_to_convert (param_filelc.With_CommandLineUser, MPLAYER_WAV_TO_WAV, "MPLAYER_WAV_TO_WAV");
-						filelc_get_command_line_remove ();
-
-						conv_copy_src_to_dest (PConv->tmp_sox_24, PConv->tmp_sox);
-						// SORTIE FICHIER EN tmp_sox
-					}
-					
-					param_filelc.type_conv = AACPLUSENC_WAV_TO_AAC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Aac >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_sox;
-					param_filelc.filedest = PConv->tmp_aac;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.PtrStrBitrate = NULL;
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, AACPLUSENC_WAV_TO_AAC, "AACPLUSENC_WAV_TO_AAC");
-					filelc_get_command_line_remove ();
-				}
-				
-				// CONVERSION MPC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST) {
-					
-					tagswav_file_GetBitrate (PConv->tmp_wav, &Channels, &Hertz, &Bits);
-					
-					// REAJUSTE LA QUANTIFICATION
-					// (Bits != 64 && Bits != 32 && Bits != 24 && Bits != 16 && Bits != 8)
-					if (TRUE == PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_MPC ]) {
-						
-						g_sprintf (&StrBits[0], "%d", (gint)Bits);
-
-						if (Bits > 64)				strcpy (StrBits, "64");
-						else if (Bits > 32 && Bits < 64)	{ strcpy (StrBits, "32"); Bits = 32; }
-						else if (Bits > 24 && Bits < 32)	{ strcpy (StrBits, "24"); Bits = 24; }
-						else if (Bits > 16 && Bits < 24)	strcpy (StrBits, (Bits - 16) < 3 ? "24" : "16");
-						else if (Bits > 8 && Bits < 16)		strcpy (StrBits, (Bits - 8) < 3 ? "16" : "8");
-						else if (Bits < 8)			strcpy (StrBits, "8");
-						
-						fileconv_change_quantification_with_sox (detail, PConv, StrBits);
-						// SORTIE FICHIER EN tmp_sox
-					}
-					else {
-						conv_copy_src_to_dest (PConv->tmp_wav, PConv->tmp_sox);
-						// SORTIE FICHIER EN tmp_sox
-					}
-					
-					// SET WITH FLOAT FORMAT IF Bits == 24 || 32
-					if (Bits == 32 || Bits == 24) {
-						// SOX
-						conv_with_sox_float_get_param (PConv->tmp_sox, PConv->tmp_sox_24);
-						conv_to_convert (FALSE, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
-						filelc_get_command_line_remove ();
-
-						conv_copy_src_to_dest (PConv->tmp_sox_24, PConv->tmp_sox);
-						// SORTIE FICHIER EN tmp_sox
-					}
-					
-					if (Hertz < 44100) {
-						pos = filelc_get_command_line_nice ();
-						conv.ArgConv [ pos++ ] = g_strdup ("mplayer");
-						conv.ArgConv [ pos++ ] = g_strdup ("-nojoystick");
-						conv.ArgConv [ pos++ ] = g_strdup ("-nolirc");
-						conv.ArgConv [ pos++ ] = g_strdup (PConv->tmp_sox);
-						conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-						conv.ArgConv [ pos++ ] = g_strdup ("pcm");
-						conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-						conv.ArgConv [ pos++ ] = g_strdup_printf ("pcm:file=%s",PConv->tmp_sox_24);
-						conv.ArgConv [ pos++ ] = g_strdup ("-srate");
-						conv.ArgConv [ pos++ ] = g_strdup ("44100");
-						conv.ArgConv [ pos++ ] = NULL;
-						
-						conv_to_convert (param_filelc.With_CommandLineUser, MPLAYER_WAV_TO_WAV, "MPLAYER_WAV_TO_WAV");
-						filelc_get_command_line_remove ();
+				fileconv_infos (detail);
 
-						conv_copy_src_to_dest (PConv->tmp_sox_24, PConv->tmp_sox);
-						// SORTIE FICHIER EN tmp_sox
-					}
-					
-					param_filelc.type_conv = MPPENC_WAV_TO_MPC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Mpc >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_sox;
-					param_filelc.filedest = PConv->tmp_mpc;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.PtrStrBitrate = NULL;
-						
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, MPPENC_WAV_TO_MPC, "MPPENC_WAV_TO_MPC");
-					filelc_get_command_line_remove ();
-				}
-				
-				// CONVERSION MP3
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) {
-					
-					tagswav_file_GetBitrate (PConv->tmp_wav, &Channels, &Hertz, &Bits);
-					
-					// REAJUSTE LA QUANTIFICATION
-					// detail->BoolEtatConv [ ETAT_FROM_WAV_TO_MP3 ] = 
-					// (detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) &&
-					// ((Hertz == 48000 && Bits == 32) || (Bits != 8 || Bits != 16 || Bits != 24 || Bits != 32));
-					if (Hertz == 48000 && Bits == 32) {
-						conv_with_sox_float_get_param (PConv->tmp_wav, PConv->tmp_sox);
-						conv_to_convert (FALSE, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
-						filelc_get_command_line_remove ();
-						
-						PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_MP3 ] = TRUE;
-						
-					} else if (Bits != 8 || Bits != 16 || Bits != 24 || Bits != 32) {
-						
-						// CORRECTION
-						// http://forum.ubuntu-fr.org/viewtopic.php?pid=3271586#p3271586
-						// joelab07
-						
-						g_sprintf (&StrBits[0], "%d", (gint)Bits);
-
-						if (Bits < 8)			strcpy (StrBits, "8");
-						if (Bits > 16 && Bits < 24)	strcpy (StrBits, (Bits - 16) < 3 ? "16" : "24");
-						if (Bits > 24 && Bits < 32)	strcpy (StrBits, (Bits - 24) < 3 ? "24" : "32");
-
-						fileconv_change_quantification_with_sox (detail, PConv, StrBits);
-						// SORTIE FICHIER EN tmp_sox
-						
-						PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_MP3 ] = TRUE;
-						
-					}
+				conv.Bool_MAJ_select = FALSE;
 
-					param_filelc.type_conv = LAME_WAV_TO_MP3;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Mp3 >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = (TRUE == PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_MP3 ]) ? PConv->tmp_sox : PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_mp3;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = options_get_params (LAME_WAV_TO_MP3, NULL);
-						
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, LAME_WAV_TO_MP3, "LAME_WAV_TO_MP3");
-					filelc_get_command_line_remove ();
-				}				
+				// COPIE DANS LE DOSSIER TEMPORAIRE
+				if( NULL == detail->NameFileCopyFromNormalizate ) {
+					conv_copy_src_to_dest( detail->namefile, PConv->tmp_wav );
+				}
 
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_copy_src_to_dest (detail, PConv);
-			}
-			
-			/*
-			SOURCE FLAC
-			DEST OGG : FLAC -> OGG oggenc
-			DEST WAV : FLAC -> WAV flac
-			DEST MP3 : WAV -> MP3 lame
-			DEST M4A : WAV -> M4A faac
-			DEST MPC : WAV -> MPC mppenc
-			DEST APE : WAV -> APE mac
-			DEST WAVPACK : WAV -> WAVPACK wavpack
-			*/
-			if (FALSE == conv.bool_stop && FILE_IS_FLAC == detail->type_infosong_file_is &&
-				(
-				detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST
-				)) {
+				switch( detail->type_infosong_file_is ) {
+				case FILE_IS_NONE :
+				// case FILE_IS_VID_M4A :
+				case FILE_IS_WAVPACK_MD5 :
+				case FILE_TO_NORMALISE :
+				case FILE_TO_NORMALISE_COLLECTIF :
+				case FILE_TO_REPLAYGAIN :
+				case FILE_IS_AAC :
+				break;
+
+				case FILE_IS_WAV :
+				{
+					INFO_WAV *info = (INFO_WAV *)detail->info;
+					InfosTags = info->tags;
+					gchar	**PtrTabArgs = NULL;
+
+					if( TRUE == info->BoolBwf ) {
+						PtrTabArgs = conv_with_sox_float_get_param(
+								PConv->tmp_wav,
+								PConv->tmp_sox
+								);
+						conv_to_convert( PtrTabArgs, FALSE, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
+						PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+						conv_copy_src_to_dest( PConv->tmp_sox, PConv->tmp_wav );
+					}
+					conv.Bool_MAJ_select = TRUE;
+					break;
+				}
+				case FILE_IS_FLAC :
+				{
+					INFO_FLAC *info = (INFO_FLAC *)detail->info;
+					InfosTags = info->tags;
+					gchar	**PtrTabArgs = NULL;
 
-				INFO_FLAC *info = (INFO_FLAC *)detail->info;
+					// COPIE DANS LE DOSSIER TEMPORAIRE
+					conv_copy_src_to_dest( detail->namefile, PConv->tmp_flac);
 
-				fileconv_infos (detail);
-				
-				// COPIE DANS LE DOSSIER TEMPORAIRE
-				conv_copy_src_to_dest (detail->namefile, PConv->tmp_flac);
-				
-				if (FALSE == conv.bool_stop) {
 					param_filelc.type_conv = FLAC_FLAC_TO_WAV;
 					param_filelc.With_CommandLineUser = detail->EtatSelection_Flac >= ETAT_SELECT_EXPERT;
 					param_filelc.filesrc = PConv->tmp_flac;
 					param_filelc.filedest = PConv->tmp_wav;
-					param_filelc.tags = info->tags;
+					param_filelc.tags = InfosTags;
 					param_filelc.cdrom = NULL;
 					param_filelc.num_track = NULL;
 					param_filelc.BoolSetBitrate = FALSE;
 					param_filelc.PtrStrBitrate = NULL;
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FLAC_FLAC_TO_WAV, "FLAC_FLAC_TO_WAV");
-					filelc_get_command_line_remove ();
-				}
-				
-				// CONVERSION APE
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = MAC_WAV_TO_APE;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Ape >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_ape;
-					param_filelc.tags = NULL;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;
-						
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, MAC_WAV_TO_APE, "MAC_WAV_TO_APE");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION MPC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = MPPENC_WAV_TO_MPC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Mpc >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_mpc;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;
-						
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, MPPENC_WAV_TO_MPC, "MPPENC_WAV_TO_MPC");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION MP3
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = LAME_WAV_TO_MP3;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Mp3 >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_mp3;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = options_get_params (LAME_WAV_TO_MP3, NULL);
-						
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, LAME_WAV_TO_MP3, "LAME_WAV_TO_MP3");
-					filelc_get_command_line_remove ();
-				}
+			pthread_mutex_lock( &mutex );
+					PtrTabArgs = filelc_get_command_line (&param_filelc);
+			pthread_mutex_unlock( &mutex );
+					conv_to_convert( PtrTabArgs, param_filelc.With_CommandLineUser, FLAC_FLAC_TO_WAV, "FLAC_FLAC_TO_WAV");
+					PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+					conv.Bool_MAJ_select = TRUE;
+					break;
+				}
+				case FILE_IS_APE :
+				{
+					INFO_APE *info = (INFO_APE *)detail->info;
+					InfosTags = info->tags;
+					gchar	**PtrTabArgs = NULL;
 
-				// CONVERSION OGG
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = OGGENC_WAV_TO_OGG;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Ogg >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_ogg;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = options_get_params (OGGENC_WAV_TO_OGG, NULL);
-				
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, OGGENC_WAV_TO_OGG, "OGGENC_WAV_TO_OGG");
-					filelc_get_command_line_remove ();
-				}
+					// COPIE DANS LE DOSSIER TEMPORAIRE
+					conv_copy_src_to_dest( detail->namefile, PConv->tmp_ape);
 
-				// CONVERSION M4A
-				if (FALSE == conv.bool_stop && detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = FAAC_WAV_TO_M4A;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_M4a >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_m4a;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FAAC_WAV_TO_M4A, "FAAC_WAV_TO_M4A");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION AAC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = AACPLUSENC_WAV_TO_AAC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Aac >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_aac;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;
-						
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, AACPLUSENC_WAV_TO_AAC, "AACPLUSENC_WAV_TO_AAC");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION WAVPACK
-				if (FALSE == conv.bool_stop && detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST) {
-					PConv->BoolEtatConv [ ETAT_BOOL_WAVPACK ] = TRUE;
-						
-					param_filelc.type_conv = WAVPACK_WAV_TO_WAVPACK;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_WavPack >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_wavpack;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, WAVPACK_WAV_TO_WAVPACK, "WAVPACK_WAV_TO_WAVPACK");
-					filelc_get_command_line_remove ();
-
-					// if (*optionsWavpack_get_wavpack_signature_md5 () != '\0') {
-					// 	// conv.bool_set_log_wavpack = TRUE;
-					// }
-				}
-
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_copy_src_to_dest (detail, PConv);
-			}
-			/*
-			SOURCE APE
-			DEST WAV : APE -> WAV mac
-			DEST MP3 : WAV -> MP3 lame file.wav file.mp3
-			DEST OGG : WAV -> OGG oggenc file.wav file.ogg
-			DEST FLAC : WAV -> FLAC flac -f file.wav -o file.flac
-			DEST M4A : WAV -> M4A faac
-			DEST MPC : WAV -> MPC mppenc
-			DEST WAVPACK : WAV -> WAVPACK wavpack
-			*/
-			if (FALSE == conv.bool_stop && FILE_IS_APE == detail->type_infosong_file_is &&
-				(
-				detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST
-				)) {
-
-				INFO_APE *info = (INFO_APE *)detail->info;
-
-				fileconv_infos (detail);
-				
-				// COPIE DANS LE DOSSIER TEMPORAIRE
-				conv_copy_src_to_dest (detail->namefile, PConv->tmp_ape);
-
-				// CONVERSION WAV
-				if (FALSE == conv.bool_stop) {
 					param_filelc.type_conv = MAC_APE_TO_WAV;
 					param_filelc.With_CommandLineUser = detail->EtatSelection_Ape >= ETAT_SELECT_EXPERT;
 					param_filelc.filesrc = PConv->tmp_ape;
@@ -858,2321 +337,708 @@
 					param_filelc.num_track = NULL;
 					param_filelc.BoolSetBitrate = FALSE;
 					param_filelc.PtrStrBitrate = NULL;
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, MAC_APE_TO_WAV, "MAC_APE_TO_WAV");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION MP3
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = LAME_WAV_TO_MP3;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Mp3 >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_mp3;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = options_get_params (LAME_WAV_TO_MP3, NULL);
-					param_filelc.BoolSetBitrate = FALSE;
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, LAME_WAV_TO_MP3, "LAME_WAV_TO_MP3");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION OGG
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = OGGENC_WAV_TO_OGG;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Ogg >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_ogg;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = options_get_params (OGGENC_WAV_TO_OGG, NULL);
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, OGGENC_WAV_TO_OGG, "OGGENC_WAV_TO_OGG");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION FLAC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = FLAC_WAV_TO_FLAC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Flac >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_flac;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FLAC_WAV_TO_FLAC, "FLAC_WAV_TO_FLAC");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION M4A
-				if (FALSE == conv.bool_stop && detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = FAAC_WAV_TO_M4A;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_M4a >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_m4a;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FAAC_WAV_TO_M4A, "FAAC_WAV_TO_M4A");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION AAC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = AACPLUSENC_WAV_TO_AAC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Aac >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_aac;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, AACPLUSENC_WAV_TO_AAC, "AACPLUSENC_WAV_TO_AAC");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION MPC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = MPPENC_WAV_TO_MPC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Mpc >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_mpc;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, MPPENC_WAV_TO_MPC, "MPPENC_WAV_TO_MPC");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION WAVPACK
-				if (FALSE == conv.bool_stop && detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST) {
-					PConv->BoolEtatConv [ ETAT_BOOL_WAVPACK ] = TRUE;
-						
-					param_filelc.type_conv = WAVPACK_WAV_TO_WAVPACK;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_WavPack >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_wavpack;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, WAVPACK_WAV_TO_WAVPACK, "WAVPACK_WAV_TO_WAVPACK");
-					filelc_get_command_line_remove ();
-
-					// if (*optionsWavpack_get_wavpack_signature_md5 () != '\0') {
-					// 	// conv.bool_set_log_wavpack = TRUE;
-					// }
-				}
-				
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_copy_src_to_dest (detail, PConv);
-			}
-			/*
-			SOURCE WAVPACK
-			DEST WAV : WAVPACK -> WAV wvunpack
-			DEST MP3 : WAV -> MP3 lame file.wav file.mp3
-			DEST OGG : WAV -> OGG oggenc file.wav file.ogg
-			DEST FLAC : WAV -> FLAC flac -f file.wav -o file.flac
-			DEST M4A : WAV -> M4A faac
-			DEST MPC : WAV -> MPC mppenc
-			DEST APE : WAV -> APE mac
-			*/
-			if (FALSE == conv.bool_stop && FILE_IS_WAVPACK == detail->type_infosong_file_is &&
-				(
-				detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST
-				)) {
-
-				INFO_WAVPACK *info = (INFO_WAVPACK *)detail->info;
-
-				fileconv_infos (detail);
-				
-				// COPIE DANS LE DOSSIER TEMPORAIRE
-				conv_copy_src_to_dest (detail->namefile, PConv->tmp_wavpack);
-				
-				// COPIE DANS LE DOSSIER TEMPORAIRE
-				conv_copy_src_to_dest (PConv->dest_wavpack_md5, PConv->tmp_wavpack_md5);
-				
-				// UNPACK : WAVPACK -> WAV
-				if (FALSE == conv.bool_stop) {
-					PConv->BoolEtatConv [ ETAT_BOOL_WAVPACK ] = TRUE;
-					
-					pos = filelc_get_command_line_nice ();
-					conv.ArgConv [ pos++ ] = g_strdup ("wvunpack");
-					conv.ArgConv [ pos++ ] = g_strdup ("-y");
+			pthread_mutex_lock( &mutex );
+					PtrTabArgs = filelc_get_command_line (&param_filelc);
+			pthread_mutex_unlock( &mutex );
+					conv_to_convert( PtrTabArgs, param_filelc.With_CommandLineUser, MAC_APE_TO_WAV, "MAC_APE_TO_WAV");
+					PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+					conv.Bool_MAJ_select = TRUE;
+					break;
+				}
+				case FILE_IS_WAVPACK :
+				{
+					INFO_WAVPACK *info = (INFO_WAVPACK *)detail->info;
+					InfosTags = info->tags;
+					gchar	**PtrTabArgs = NULL;
+
+					// COPIE DANS LE DOSSIER TEMPORAIRE
+					conv_copy_src_to_dest( detail->namefile, PConv->tmp_wavpack);
+
+					// COPIE DANS LE DOSSIER TEMPORAIRE
+					conv_copy_src_to_dest( PConv->dest_wavpack_md5, PConv->tmp_wavpack_md5);
+
+					PtrTabArgs = filelc_AllocTabArgs();
+
+					pos = 3;
+					PtrTabArgs[ pos++ ] = g_strdup ("wvunpack");
+					PtrTabArgs[ pos++ ] = g_strdup ("-y");
 					if (*optionsWavpack_get_wavpack_signature_md5 () != '\0') {
-						conv.ArgConv [ pos++ ] = g_strdup (optionsWavpack_get_wavpack_signature_md5 ());
+						PtrTabArgs[ pos++ ] = g_strdup (optionsWavpack_get_wavpack_signature_md5 ());
+					}
+					PtrTabArgs [ pos++ ] = g_strdup (PConv->tmp_wavpack);
+					PtrTabArgs [ pos++ ] = g_strdup (PConv->tmp_wav);
+					PtrTabArgs [ pos++ ] = NULL;
+					conv_to_convert( PtrTabArgs, FALSE, WVUNPACK_WAVPACK_TO_WAV, "WVUNPACK_WAVPACK_TO_WAV");
+					PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+					conv.Bool_MAJ_select = TRUE;
+					break;
+				}
+				case FILE_IS_OGG :
+				case FILE_IS_MP3 :
+				{
+					gchar	**PtrTabArgs = NULL;
+
+					PtrTabArgs = filelc_AllocTabArgs();
+
+					if( FILE_IS_OGG == detail->type_infosong_file_is ) {
+						INFO_OGG *info = (INFO_OGG *)detail->info;
+						InfosTags = info->tags;
+					} else if( FILE_IS_MP3 == detail->type_infosong_file_is ) {
+						INFO_MP3 *info = (INFO_MP3 *)detail->info;
+						InfosTags = info->tags;
+					}
+
+					// COPIE DANS LE DOSSIER TEMPORAIRE
+					if (FALSE == conv.bool_stop && NULL == detail->NameFileCopyFromNormalizate) {
+
+						if( FILE_IS_OGG == detail->type_infosong_file_is ) {
+							conv_copy_src_to_dest( detail->namefile, PConv->tmp_ogg);
+						} else if( FILE_IS_MP3 == detail->type_infosong_file_is ) {
+							conv_copy_src_to_dest( detail->namefile, PConv->tmp_mp3);
+						}
 					}
-					conv.ArgConv [ pos++ ] = g_strdup (PConv->tmp_wavpack);
-					conv.ArgConv [ pos++ ] = g_strdup (PConv->tmp_wav);
-					conv.ArgConv [ pos++ ] = NULL;
-					
-					conv_to_convert (FALSE, WVUNPACK_WAVPACK_TO_WAV, "WVUNPACK_WAVPACK_TO_WAV");
-					filelc_get_command_line_remove ();
-					
-					// if (*optionsWavpack_get_wavpack_signature_md5 () != '\0') {
-					// 	// conv.bool_set_log_wvunpack = TRUE;
-					// }
-				}
-
-				// CONVERSION MP3
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = LAME_WAV_TO_MP3;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Mp3 >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_mp3;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = options_get_params (LAME_WAV_TO_MP3, NULL);
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, LAME_WAV_TO_MP3, "LAME_WAV_TO_MP3");
-					filelc_get_command_line_remove ();
-				}
-				
-				// CONVERSION OGG
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = OGGENC_WAV_TO_OGG;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Ogg >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_ogg;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = options_get_params (OGGENC_WAV_TO_OGG, NULL);						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, OGGENC_WAV_TO_OGG, "OGGENC_WAV_TO_OGG");
-					filelc_get_command_line_remove ();
-				}
-				
-				// CONVERSION FLAC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = FLAC_WAV_TO_FLAC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Flac >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_flac;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FLAC_WAV_TO_FLAC, "FLAC_WAV_TO_FLAC");
-					filelc_get_command_line_remove ();
-				}
-				
-				// CONVERSION M4A
-				if (FALSE == conv.bool_stop && detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = FAAC_WAV_TO_M4A;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_M4a >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_m4a;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FAAC_WAV_TO_M4A, "FAAC_WAV_TO_M4A");
-					filelc_get_command_line_remove ();
-				}
 
-				// CONVERSION AAC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = AACPLUSENC_WAV_TO_AAC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Aac >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_aac;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, AACPLUSENC_WAV_TO_AAC, "AACPLUSENC_WAV_TO_AAC");
-					filelc_get_command_line_remove ();
-				}
+					pos = 3;
+					PtrTabArgs[ pos++ ] = g_strdup ("mplayer");
+					PtrTabArgs[ pos++ ] = g_strdup ("-nojoystick");
+					PtrTabArgs[ pos++ ] = g_strdup ("-nolirc");
+					PtrTabArgs[ pos++ ] = g_strdup ("-ao");
+					PtrTabArgs[ pos++ ] = g_strdup ("pcm");
+					if( FILE_IS_OGG == detail->type_infosong_file_is ) {
+						PtrTabArgs[ pos++ ] = g_strdup (PConv->tmp_ogg);
+					} else if( FILE_IS_MP3 == detail->type_infosong_file_is ) {
+						PtrTabArgs[ pos++ ] = g_strdup (PConv->tmp_mp3);
+					}
+					PtrTabArgs[ pos++ ] = g_strdup ("-ao");
+					PtrTabArgs[ pos++ ] = g_strdup_printf ("pcm:file=%s", PConv->tmp_wav);
+					PtrTabArgs[ pos++ ] = NULL;
+					if( FILE_IS_OGG == detail->type_infosong_file_is ) {
+						conv_to_convert( PtrTabArgs, FALSE, MPLAYER_OGG_TO_WAV, "MPLAYER_OGG_TO_WAV");
+					}
+					else {
+						conv_to_convert( PtrTabArgs, FALSE, MPLAYER_MP3_TO_WAV, "MPLAYER_MP3_TO_WAV");
 
-				// CONVERSION MPC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = MPPENC_WAV_TO_MPC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Mpc >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_mpc;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, MPPENC_WAV_TO_MPC, "MPPENC_WAV_TO_MPC");
-					filelc_get_command_line_remove ();
-				}
-				
-				// CONVERSION APE
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = MAC_WAV_TO_APE;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Ape >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_ape;
-					param_filelc.tags = NULL;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, MAC_WAV_TO_APE, "MAC_WAV_TO_APE");
-					filelc_get_command_line_remove ();
-				}
-				
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_copy_src_to_dest (detail, PConv);
-			}
-			/*
-			SOURCE OGG
-			DEST WAV : OGG -> WAV ogg123
-			DEST FLAC : WAV -> FLAC flac
-			DEST MP3 : WAV -> MP3 lame
-			DEST M4A : WAV -> M4A faac
-			DEST MPC : WAV -> MPC mppenc
-			DEST APE : WAV -> APE mac
-			DEST WAVPACK : WAV -> WAVPACK wavpack
-			*/
-			if (FALSE == conv.bool_stop && FILE_IS_OGG == detail->type_infosong_file_is &&
-				(
-				detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST
-				)) {
+						// Mon, 06 Jan 2014 08:33:58 +0100
+						// Isaak Babaev
+						// Must be 16 bits
+						tagswav_file_GetBitrate( PConv->tmp_wav, &Channels, &Hertz, &Bits );
+						if( Bits != 16 ) {
+							Bits = 16;
+							fileconv_change_quantification_with_sox( PConv, Hertz, Channels, Bits );
+							conv_copy_src_to_dest( PConv->tmp_sox, PConv->tmp_wav );
+						}
+					}
+					PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+					conv.Bool_MAJ_select = TRUE;
+					break;
+				}
+				case FILE_IS_MPC :
+				{
+					gchar	**PtrTabArgs = NULL;
+					gchar	*Ptr = NULL;
+					gint	BoolApplyConvMPC = 0;
+					INFO_MPC *info = (INFO_MPC *)detail->info;
+					InfosTags = info->tags;
+
+					conv_copy_src_to_dest( detail->namefile, PConv->tmp_mpc );
+
+					PtrTabArgs = filelc_AllocTabArgs();
+					pos = 3;
+					PtrTabArgs [ pos++ ] = g_strdup ("mplayer");
+					PtrTabArgs [ pos++ ] = g_strdup ("-nojoystick");
+					PtrTabArgs [ pos++ ] = g_strdup ("-nolirc");
+					PtrTabArgs [ pos++ ] = g_strdup (PConv->tmp_mpc);
+					PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+					PtrTabArgs [ pos++ ] = g_strdup ("pcm");
+					PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+					PtrTabArgs [ pos++ ] = g_strdup_printf ("pcm:file=%s", PConv->tmp_wav);
+					PtrTabArgs [ pos++ ] = g_strdup ("-af");
+					PtrTabArgs [ pos++ ] = g_strdup ("channels=2");
+					PtrTabArgs [ pos++ ] = g_strdup ("-srate");
+					PtrTabArgs [ pos++ ] = g_strdup ("44100");
+					PtrTabArgs [ pos++ ] = NULL;
+					VarFileConv.BoolResultMplayerIsOk = conv_to_convert( PtrTabArgs, FALSE, MPLAYER_MPC_TO_WAV, "MPLAYER_MPC_TO_WAV");
+					PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+
+					if( FALSE == libutils_test_file_exist( PConv->tmp_wav )) {
+						PtrTabArgs = filelc_AllocTabArgs();
+						pos = 3;
+						Ptr = PtrTabArgs [ pos++ ] = g_strdup( prginit_get_name( NMR_musepack_tools_mppdec ));
+						if( strstr( Ptr, "mpc123" ) != NULL ) BoolApplyConvMPC = 1;
+						if( strstr( Ptr, "mppdec" ) != NULL ) BoolApplyConvMPC = 1;
+						if( strstr( Ptr, "mpcdec" ) != NULL ) BoolApplyConvMPC = 2;
+
+						// mpc123 | mppdec
+						if( 1 == BoolApplyConvMPC ) {
+							PtrTabArgs [ pos++ ] = g_strdup ("--wav");
+						}
+						if( HostConf.BoolCpuIs64Bits == TRUE ) {
+							if( 1 == BoolApplyConvMPC ) {
+								PtrTabArgs [ pos++ ] = g_strdup (PConv->tmp_wav);
+								PtrTabArgs [ pos++ ] = g_strdup (PConv->tmp_mpc);
+							}
+							else if( 2 == BoolApplyConvMPC ) {
+								PtrTabArgs [ pos++ ] = g_strdup (PConv->tmp_mpc);
+								PtrTabArgs [ pos++ ] = g_strdup (PConv->tmp_wav);
+							}
+						}
+						else {
+							PtrTabArgs [ pos++ ] = g_strdup (PConv->tmp_mpc);
+							PtrTabArgs [ pos++ ] = g_strdup (PConv->tmp_wav);
+						}
+						PtrTabArgs[ pos++ ] = NULL;
+						conv_to_convert( PtrTabArgs, FALSE, MPPDEC_MPC_TO_WAV, "MPPDEC_MPC_TO_WAV" );
+						PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+						conv.Bool_MAJ_select = TRUE;
+					}
+					conv.Bool_MAJ_select = TRUE;
+					break;
+				}
+				case FILE_IS_AC3 :
+				{
+					gchar	**PtrTabArgs = NULL;
+					INFO_AC3*info = (INFO_AC3 *)detail->info;
+					InfosTags = info->tags;
 
-				INFO_OGG *info = (INFO_OGG *)detail->info;
+					conv_copy_src_to_dest( detail->namefile, PConv->tmp_ac3 );
+					//
+					// TODO DEBIAN/ liba52-0.7.4-dev
+					//
+					// a52dec ./audio.ac3 -o wav > audio.wav
+					//
+					PtrTabArgs = filelc_AllocTabArgs();
+					pos = 3;
+					PtrTabArgs [ pos++ ] = g_strdup ("a52dec");
+					PtrTabArgs [ pos++ ] = g_strdup (PConv->tmp_ac3);
+					PtrTabArgs [ pos++ ] = g_strdup ("-o");
+					PtrTabArgs [ pos++ ] = g_strdup ("wav");
+					PtrTabArgs [ pos++ ] = g_strdup (">");
+					PtrTabArgs [ pos++ ] = g_strdup (PConv->tmp_wav);
+					PtrTabArgs [ pos++ ] = NULL;
+					conv_to_convert( PtrTabArgs, FALSE, A52DEC_AC3_TO_WAV, "A52DEC_AC3_TO_WAV" );
+					PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+
+					tagswav_file_GetBitrate( PConv->tmp_wav, &Channels, &Hertz, &Bits );
+					fileconv_change_quantification_with_sox( PConv, Hertz, Channels, Bits );
+					conv_copy_src_to_dest( PConv->tmp_sox, PConv->tmp_wav );
+					conv.Bool_MAJ_select = TRUE;
+					break;
+				}
+
+				case FILE_IS_VID_M4A :
+				case FILE_IS_M4A :
+				{
+					INFO_M4A *info = (INFO_M4A *)detail->info;
+					InfosTags = info->tags;
+					gchar	**PtrTabArgs = NULL;
 
-				fileconv_infos (detail);
-				
-				// COPIE DANS LE DOSSIER TEMPORAIRE
-				// SI <> NULL ALORS 'detail->NameFileCopyFromNormalizate' se trouve deja dans le dossier temporaire
-				if (FALSE == conv.bool_stop && NULL == detail->NameFileCopyFromNormalizate) {
-					
-					conv_copy_src_to_dest (detail->namefile, PConv->tmp_ogg);
-				}
+					// COPIE DANS LE DOSSIER TEMPORAIRE
+					conv_copy_src_to_dest( detail->namefile, PConv->tmp_m4a);
 
 					// CONVERSION WAV
-
-					pos = filelc_get_command_line_nice ();
-					conv.ArgConv [ pos++ ] = g_strdup ("mplayer");
-					conv.ArgConv [ pos++ ] = g_strdup ("-nojoystick");
-					conv.ArgConv [ pos++ ] = g_strdup ("-nolirc");
-					conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-					conv.ArgConv [ pos++ ] = g_strdup ("pcm");
-					conv.ArgConv [ pos++ ] = g_strdup (PConv->tmp_ogg);
-					conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-					conv.ArgConv [ pos++ ] = g_strdup_printf ("pcm:file=%s", PConv->tmp_wav);
-					conv.ArgConv [ pos++ ] = NULL;
-				
-					conv_to_convert (param_filelc.With_CommandLineUser, MPLAYER_OGG_TO_WAV, "MPLAYER_OGG_TO_WAV");
-					filelc_get_command_line_remove ();
-
-				// CONVERSION APE
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = MAC_WAV_TO_APE;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Ape >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_ape;
-					param_filelc.tags = NULL;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, MAC_WAV_TO_APE, "MAC_WAV_TO_APE");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION MPC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = MPPENC_WAV_TO_MPC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Mpc >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_mpc;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, MPPENC_WAV_TO_MPC, "MPPENC_WAV_TO_MPC");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION FLAC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = FLAC_WAV_TO_FLAC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Flac >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_flac;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FLAC_WAV_TO_FLAC, "FLAC_WAV_TO_FLAC");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION MP3
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = LAME_WAV_TO_MP3;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Mp3 >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_mp3;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = options_get_params (LAME_WAV_TO_MP3, NULL);
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, LAME_WAV_TO_MP3, "LAME_WAV_TO_MP3");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION M4A
-				if (FALSE == conv.bool_stop && detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = FAAC_WAV_TO_M4A;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_M4a >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_m4a;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FAAC_WAV_TO_M4A, "FAAC_WAV_TO_M4A");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION AAC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = AACPLUSENC_WAV_TO_AAC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Aac >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_aac;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, AACPLUSENC_WAV_TO_AAC, "AACPLUSENC_WAV_TO_AAC");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION WAVPACK
-				if (FALSE == conv.bool_stop && detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST) {
-					PConv->BoolEtatConv [ ETAT_BOOL_WAVPACK ] = TRUE;
-						
-					param_filelc.type_conv = WAVPACK_WAV_TO_WAVPACK;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_WavPack >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_wavpack;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, WAVPACK_WAV_TO_WAVPACK, "WAVPACK_WAV_TO_WAVPACK");
-					filelc_get_command_line_remove ();
-				}
-
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_copy_src_to_dest (detail, PConv);
-			}
-
-			/*
-			SOURCE M4A
-			SOURCE VID_M4A
-			DEST WAV : M4A -> WAV mplayer
-			DEST MPC : WAV -> MPC mppenc
-			DEST MP3 : WAV -> MP3 lame
-			DEST FLAC : WAV -> FLAC flac
-			DEST OGG : WAV -> OGG oggenc
-			DEST APE : WAV -> APE mac
-			DEST WAVPACK : WAV -> WAVPACK wavpack
-			*/
-			if (FALSE == conv.bool_stop && ( FILE_IS_M4A == detail->type_infosong_file_is || FILE_IS_VID_M4A == detail->type_infosong_file_is ) &&
-				(
-				detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST
-				)) {
-
-				INFO_M4A *info = (INFO_M4A *)detail->info;
-
-				fileconv_infos (detail);
-				
-				// COPIE DANS LE DOSSIER TEMPORAIRE
-				conv_copy_src_to_dest (detail->namefile, PConv->tmp_m4a);
-				
-				// CONVERSION WAV
-				if (FALSE == conv.bool_stop) {
-					pos = filelc_get_command_line_nice ();
-					conv.ArgConv [ pos++ ] = g_strdup ("mplayer");
-					conv.ArgConv [ pos++ ] = g_strdup ("-nojoystick");
-					conv.ArgConv [ pos++ ] = g_strdup ("-nolirc");
+					PtrTabArgs = filelc_AllocTabArgs();
+					pos = 3;
+					PtrTabArgs [ pos++ ] = g_strdup ("mplayer");
+					PtrTabArgs [ pos++ ] = g_strdup ("-nojoystick");
+					PtrTabArgs [ pos++ ] = g_strdup ("-nolirc");
 					if( FILE_IS_VID_M4A == detail->type_infosong_file_is ) {
 						// mplayer -nojoystick -nolirc -novideo -vo null ./WCC_RADIO_EP042.m4a -ao pcm -ao pcm:file=dest_novdeo_1.wav -srate 44100
-						conv.ArgConv [ pos++ ] = g_strdup ("-novideo");
-						conv.ArgConv [ pos++ ] = g_strdup ("-vo");
-						conv.ArgConv [ pos++ ] = g_strdup ("null");
-					}
-					conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-					conv.ArgConv [ pos++ ] = g_strdup ("pcm");
-					conv.ArgConv [ pos++ ] = g_strdup (PConv->tmp_m4a);
-					conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-					conv.ArgConv [ pos++ ] = g_strdup_printf ("pcm:file=%s", PConv->tmp_wav);
+						PtrTabArgs [ pos++ ] = g_strdup ("-novideo");
+						PtrTabArgs [ pos++ ] = g_strdup ("-vo");
+						PtrTabArgs [ pos++ ] = g_strdup ("null");
+					}
+					PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+					PtrTabArgs [ pos++ ] = g_strdup ("pcm");
+					PtrTabArgs [ pos++ ] = g_strdup (PConv->tmp_m4a);
+					PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+					PtrTabArgs [ pos++ ] = g_strdup_printf ("pcm:file=%s", PConv->tmp_wav);
 					if( FILE_IS_VID_M4A == detail->type_infosong_file_is ) {
 						// mplayer -nojoystick -nolirc -novideo -vo null ./WCC_RADIO_EP042.m4a -ao pcm -ao pcm:file=dest_novdeo_1.wav -srate 44100
-						conv.ArgConv [ pos++ ] = g_strdup ("-srate");
-						conv.ArgConv [ pos++ ] = g_strdup ("44100");
+						PtrTabArgs [ pos++ ] = g_strdup ("-srate");
+						PtrTabArgs [ pos++ ] = g_strdup ("44100");
 					}
-					conv.ArgConv [ pos++ ] = NULL;
-
-					BoolResultMplayerIsOk = conv_to_convert (param_filelc.With_CommandLineUser, MPLAYER_M4A_TO_WAV, "MPLAYER_M4A_TO_WAV");
-					filelc_get_command_line_remove ();
-					
-					if (FALSE == BoolResultMplayerIsOk) {
-						PRINT("PROBLEME DE CONVERSION AVEC MPLAYER:---------> RETOUR");
-						break;
+					PtrTabArgs [ pos++ ] = NULL;
+					VarFileConv.BoolResultMplayerIsOk = conv_to_convert( PtrTabArgs, FALSE, MPLAYER_M4A_TO_WAV, "MPLAYER_M4A_TO_WAV");
+					PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+					conv.Bool_MAJ_select = TRUE;
+					break;
+				}
+				case FILE_IS_WMA :
+				case FILE_IS_RM :
+				case FILE_IS_DTS :
+				case FILE_IS_AIFF :
+				{
+					gchar	**PtrTabArgs = NULL;
+
+					if( FILE_IS_WMA == detail->type_infosong_file_is ) {
+						INFO_WMA *info = (INFO_WMA *)detail->info;
+						InfosTags = info->tags;
+						conv_copy_src_to_dest( detail->namefile, PConv->tmp_wma );
+					} else if( FILE_IS_RM == detail->type_infosong_file_is ) {
+						INFO_RM *info = (INFO_RM *)detail->info;
+						InfosTags = info->tags;
+						conv_copy_src_to_dest( detail->namefile, PConv->tmp_rm );
+					} else if( FILE_IS_DTS == detail->type_infosong_file_is ) {
+						INFO_DTS *info = (INFO_DTS *)detail->info;
+						InfosTags = info->tags;
+						conv_copy_src_to_dest( detail->namefile, PConv->tmp_dts );
+					} else if( FILE_IS_AIFF == detail->type_infosong_file_is ) {
+						INFO_AIFF *info = (INFO_AIFF *)detail->info;
+						InfosTags = info->tags;
+						conv_copy_src_to_dest( detail->namefile, PConv->tmp_aiff );
 					}
-					
-					/*
-					conv_inc_encode_completed ();
-					conv.type_conv = SOX_WAV_TO_WAV;
-					listmplayer = conv_with_sox_get_param (PConv->tmp_sox, PConv->tmp_wav, "44100", "2", "16");
-					conv.ArgConv = conv_alloc_arg (listmplayer);
-					conv_exec (FALSE, SOX_WAV_TO_WAV, listmplayer, "SOX_WAV_TO_WAV");
-					listmplayer = filelc_remove_glist (listmplayer);
-					g_free (conv.ArgConv);
-					conv.ArgConv = NULL;
-					*/
-				}
-
-				// CONVERSION APE
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = MAC_WAV_TO_APE;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Ape >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_ape;
-					param_filelc.tags = NULL;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, MAC_WAV_TO_APE, "MAC_WAV_TO_APE");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION MPC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = MPPENC_WAV_TO_MPC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Mpc >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_mpc;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, MPPENC_WAV_TO_MPC, "MPPENC_WAV_TO_MPC");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION FLAC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = FLAC_WAV_TO_FLAC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Flac >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_flac;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FLAC_WAV_TO_FLAC, "FLAC_WAV_TO_FLAC");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION MP3
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = LAME_WAV_TO_MP3;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Mp3 >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_mp3;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = options_get_params (LAME_WAV_TO_MP3, NULL);
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, LAME_WAV_TO_MP3, "LAME_WAV_TO_MP3");
-					filelc_get_command_line_remove ();
-				}
 
-				// CONVERSION OGG
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = OGGENC_WAV_TO_OGG;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Ogg >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_ogg;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = options_get_params (OGGENC_WAV_TO_OGG, NULL);
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, OGGENC_WAV_TO_OGG, "OGGENC_WAV_TO_OGG");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION AAC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = AACPLUSENC_WAV_TO_AAC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Aac >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_aac;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, AACPLUSENC_WAV_TO_AAC, "AACPLUSENC_WAV_TO_AAC");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION WAVPACK
-				if (FALSE == conv.bool_stop && detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST) {
-					PConv->BoolEtatConv [ ETAT_BOOL_WAVPACK ] = TRUE;
-						
-					param_filelc.type_conv = WAVPACK_WAV_TO_WAVPACK;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_WavPack >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_wavpack;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, WAVPACK_WAV_TO_WAVPACK, "WAVPACK_WAV_TO_WAVPACK");
-					filelc_get_command_line_remove ();
-
-					// if (*optionsWavpack_get_wavpack_signature_md5 () != '\0') {
-					// 	// conv.bool_set_log_wavpack = TRUE;
-					// }
-				}
-
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_copy_src_to_dest (detail, PConv);
-			}
-			/*
-			SOURCE MP3
-			DEST WAV : MP3 -> WAV mplayer
-			DEST FLAC : WAV -> FLAC flac
-			DEST OGG : WAV -> OGG oggenc
-			DEST M4A : WAV -> M4A faac
-			DEST MPC : WAV -> MPC mppenc
-			DEST APE : WAV -> APE mac
-			DEST WAVPACK : WAV -> WAVPACK wavpack
-			*/
-			if (FALSE == conv.bool_stop && FILE_IS_MP3 == detail->type_infosong_file_is &&
-				(
-				detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST
-				)) {
-
-				INFO_MP3 *info = (INFO_MP3 *)detail->info;
-				gint		 Channels;
-				gint		 Hertz;
-				gint		 Bits;
-
-				fileconv_infos (detail);
-				
-				// COPIE SOURCE WAV DANS LE DOSSIER TEMPORAIRE
-				// SI <> NULL ALORS 'detail->NameFileCopyFromNormalizate' se trouve deja dans le dossier temporaire
-				if (NULL == detail->NameFileCopyFromNormalizate) {
-					conv_copy_src_to_dest (detail->namefile, PConv->tmp_mp3);
-				}
-
-				if (FALSE == conv.bool_stop) {
-					
-					// Changement du bitrate
-					if (NULL == detail->NameFileCopyFromNormalizate) {
-						
-						// PRINT("CHANGEMENT: voie + hertz + bits");
-						
-						pos = filelc_get_command_line_nice ();
-						conv.ArgConv [ pos++ ] = g_strdup ("mplayer");
-						conv.ArgConv [ pos++ ] = g_strdup ("-nojoystick");
-						conv.ArgConv [ pos++ ] = g_strdup ("-nolirc");
-						conv.ArgConv [ pos++ ] = g_strdup (PConv->tmp_mp3);
-						conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-						conv.ArgConv [ pos++ ] = g_strdup ("pcm");
-						conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-						conv.ArgConv [ pos++ ] = g_strdup_printf ("pcm:file=%s",PConv->tmp_wav);
-						conv.ArgConv [ pos++ ] = NULL;
-						
-						BoolResultMplayerIsOk = conv_to_convert (param_filelc.With_CommandLineUser, MPLAYER_MP3_TO_WAV, "MPLAYER_MP3_TO_WAV");
-						filelc_get_command_line_remove ();
-										
-						if (FALSE == BoolResultMplayerIsOk) {
-							PRINT("PROBLEME DE CONVERSION AVEC MPLAYER:---------> RETOUR");
-							break;
-						}
-						
-						// 8000
-						// 22000
-						// 32000
-						// 44056
-						// 44100
-						// 48000
-						// 88200
-						// 96000
-					}
-					
-					tagswav_file_GetBitrate (PConv->tmp_wav, &Channels, &Hertz, &Bits);
-					// g_print("Channels = %d Hertz = %d Bits = %d\n", Channels, Hertz, Bits);
-						
-					if (Hertz < 44100 && (detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST || detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST)) {
-						
-						conv.total_convert ++;
-						
-						pos = filelc_get_command_line_nice ();
-						conv.ArgConv [ pos++ ] = g_strdup ("mplayer");
-						conv.ArgConv [ pos++ ] = g_strdup ("-nojoystick");
-						conv.ArgConv [ pos++ ] = g_strdup ("-nolirc");
-						conv.ArgConv [ pos++ ] = g_strdup (PConv->tmp_wav);
-						conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-						conv.ArgConv [ pos++ ] = g_strdup ("pcm");
-						conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-						conv.ArgConv [ pos++ ] = g_strdup_printf ("pcm:file=%s",PConv->tmp_sox);
-						conv.ArgConv [ pos++ ] = g_strdup ("-srate");
-						conv.ArgConv [ pos++ ] = g_strdup ("44100");
-						conv.ArgConv [ pos++ ] = NULL;
-						
-						BoolResultMplayerIsOk = conv_to_convert (param_filelc.With_CommandLineUser, MPLAYER_WAV_TO_WAV, "MPLAYER_WAV_TO_WAV");
-						filelc_get_command_line_remove ();
-					}
-
-				}
-
-				// CONVERSION MPC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = MPPENC_WAV_TO_MPC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Mpc >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = (Hertz < 44100) ? PConv->tmp_sox : PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_mpc;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, MPPENC_WAV_TO_MPC, "MPPENC_WAV_TO_MPC");
-					filelc_get_command_line_remove ();
-				}
-				
-				// CONVERSION AAC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = AACPLUSENC_WAV_TO_AAC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Aac >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = (Hertz < 44100) ? PConv->tmp_sox : PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_aac;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, AACPLUSENC_WAV_TO_AAC, "AACPLUSENC_WAV_TO_AAC");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION APE
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = MAC_WAV_TO_APE;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Ape >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_ape;
-					param_filelc.tags = NULL;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, MAC_WAV_TO_APE, "MAC_WAV_TO_APE");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION FLAC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = FLAC_WAV_TO_FLAC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Flac >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_flac;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FLAC_WAV_TO_FLAC, "FLAC_WAV_TO_FLAC");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION OGG
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = OGGENC_WAV_TO_OGG;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Ogg >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_ogg;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = options_get_params (OGGENC_WAV_TO_OGG, NULL);
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, OGGENC_WAV_TO_OGG, "OGGENC_WAV_TO_OGG");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION M4A
-				if (FALSE == conv.bool_stop && detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = FAAC_WAV_TO_M4A;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_M4a >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_m4a;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FAAC_WAV_TO_M4A, "FAAC_WAV_TO_M4A");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION WAVPACK
-				if (FALSE == conv.bool_stop && detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST) {
-					PConv->BoolEtatConv [ ETAT_BOOL_WAVPACK ] = TRUE;
-						
-					param_filelc.type_conv = WAVPACK_WAV_TO_WAVPACK;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_WavPack >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_wavpack;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, WAVPACK_WAV_TO_WAVPACK, "WAVPACK_WAV_TO_WAVPACK");
-					filelc_get_command_line_remove ();
-
-					// if (*optionsWavpack_get_wavpack_signature_md5 () != '\0') {
-					// 	// conv.bool_set_log_wavpack = TRUE;
-					// }
-				}
-
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_copy_src_to_dest (detail, PConv);
-			}
-			/*
-			SOURCE MPC
-			DEST WAV : MPC -> WAV mppdec
-			DEST MP3 : WAV -> MP3 lame file.wav file.mp3
-			DEST OGG : WAV -> OGG oggenc file.wav file.ogg
-			DEST FLAC : WAV -> FLAC flac -f file.wav -o file.flac
-			DEST M4A : WAV -> M4A faac
-			DEST APE : WAV -> APE mac
-			DEST WAVPACK : WAV -> WAVPACK wavpack
-			*/
-			if (FALSE == conv.bool_stop && FILE_IS_MPC == detail->type_infosong_file_is &&
-				(
-				detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST
-				)) {
-
-				INFO_MPC *info = (INFO_MPC *)detail->info;
-				gint	 BoolApplyConvMPC = 0;
-				
-				fileconv_infos (detail);
-				
-				// COPIE DANS LE DOSSIER TEMPORAIRE
-				conv_copy_src_to_dest (detail->namefile, PConv->tmp_mpc);
-				
-				// CONVERSION WAV
-				if (FALSE == conv.bool_stop) {
-					gchar *ptr = NULL;
-					
-					pos = filelc_get_command_line_nice ();
-					conv.ArgConv [ pos++ ] = g_strdup (prginit_get_name (NMR_musepack_tools_mppdec));
-					// MPC123 et MPPDEC et MPPDEC: MPC -> WAV
-					BoolApplyConvMPC = 0;
-					ptr = prginit_get_name (NMR_musepack_tools_mppdec);
-					if (strstr (ptr, "mpc123") != NULL) BoolApplyConvMPC = 1;
-					if (strstr (ptr, "mppdec") != NULL) BoolApplyConvMPC = 1;
-					if (strstr (ptr, "mpcdec") != NULL) BoolApplyConvMPC = 2;
-					
-					// mpc123 | mppdec
-					if (1 == BoolApplyConvMPC) {
-						conv.ArgConv [ pos++ ] = g_strdup ("--wav");
-					}
-					
-					if (HostConf.BoolCpuIs64Bits == TRUE) {
-						if (1 == BoolApplyConvMPC) {
-							conv.ArgConv [ pos++ ] = g_strdup (PConv->tmp_wav);
-							conv.ArgConv [ pos++ ] = g_strdup (PConv->tmp_mpc);
-						}
-						else if (2 == BoolApplyConvMPC) {
-							conv.ArgConv [ pos++ ] = g_strdup (PConv->tmp_mpc);
-							conv.ArgConv [ pos++ ] = g_strdup (PConv->tmp_wav);
-						}
-					}
-					else {
-						conv.ArgConv [ pos++ ] = g_strdup (PConv->tmp_mpc);
-						conv.ArgConv [ pos++ ] = g_strdup (PConv->tmp_wav);
-					}
-					param_filelc.PtrStrBitrate = NULL;	
-					conv_to_convert (param_filelc.With_CommandLineUser, MPPDEC_MPC_TO_WAV, "MPPDEC_MPC_TO_WAV");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION APE
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = MAC_WAV_TO_APE;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Ape >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_ape;
-					param_filelc.tags = NULL;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, MAC_WAV_TO_APE, "MAC_WAV_TO_APE");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION FLAC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = FLAC_WAV_TO_FLAC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Flac >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_flac;
-					param_filelc.tags = NULL;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FLAC_WAV_TO_FLAC, "FLAC_WAV_TO_FLAC");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION MP3
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = LAME_WAV_TO_MP3;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Mp3 >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_mp3;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = options_get_params (LAME_WAV_TO_MP3, NULL);
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, LAME_WAV_TO_MP3, "LAME_WAV_TO_MP3");
-					filelc_get_command_line_remove ();
-				}
+					// CONVERSION WAV
+					PtrTabArgs = filelc_AllocTabArgs();
+					pos = 3;
+					PtrTabArgs [ pos++ ] = g_strdup ("mplayer");
+					PtrTabArgs [ pos++ ] = g_strdup ("-nojoystick");
+					PtrTabArgs [ pos++ ] = g_strdup ("-nolirc");
+					if( FILE_IS_WMA == detail->type_infosong_file_is ) {
+						PtrTabArgs [ pos++ ] = g_strdup (PConv->tmp_wma);
+					} else if( FILE_IS_RM == detail->type_infosong_file_is ) {
+						PtrTabArgs [ pos++ ] = g_strdup (PConv->tmp_rm);
+					} else if( FILE_IS_DTS == detail->type_infosong_file_is ) {
+						PtrTabArgs [ pos++ ] = g_strdup (PConv->tmp_dts);
+					} else if( FILE_IS_AIFF == detail->type_infosong_file_is ) {
+						PtrTabArgs [ pos++ ] = g_strdup (PConv->tmp_aiff );
+					}
+					PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+					PtrTabArgs [ pos++ ] = g_strdup ("pcm");
+					PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+					PtrTabArgs [ pos++ ] = g_strdup_printf ("pcm:file=%s", PConv->tmp_wav);
+					PtrTabArgs [ pos++ ] = g_strdup ("-af");
+					PtrTabArgs [ pos++ ] = g_strdup ("channels=2");
+					PtrTabArgs [ pos++ ] = g_strdup ("-srate");
+					PtrTabArgs [ pos++ ] = g_strdup ("44100");
+					PtrTabArgs [ pos++ ] = NULL;
+					VarFileConv.BoolResultMplayerIsOk = conv_to_convert( PtrTabArgs, FALSE, MPLAYER_WMA_TO_WAV, "MPLAYER_WMA_TO_WAV");
+					PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+					conv.Bool_MAJ_select = TRUE;
+					break;
+				}
+				case FILE_IS_SHN :
+				{
+					INFO_SHN *info = (INFO_SHN *)detail->info;
+					InfosTags = info->tags;
+					gchar	**PtrTabArgs = NULL;
 
-				// CONVERSION OGG
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = OGGENC_WAV_TO_OGG;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Ogg >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_ogg;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = options_get_params (OGGENC_WAV_TO_OGG, NULL);
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, OGGENC_WAV_TO_OGG, "OGGENC_WAV_TO_OGG");
-					filelc_get_command_line_remove ();
-				}
+					// COPIE DANS LE DOSSIER TEMPORAIRE
+					conv_copy_src_to_dest( detail->namefile, PConv->tmp_shn);
 
-				// CONVERSION M4A
-				if (FALSE == conv.bool_stop && detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = FAAC_WAV_TO_M4A;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_M4a >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_m4a;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FAAC_WAV_TO_M4A, "FAAC_WAV_TO_M4A");
-					filelc_get_command_line_remove ();
+					// CONVERSION WAV
+					PtrTabArgs = filelc_AllocTabArgs();
+					pos = 3;
+					PtrTabArgs [ pos++ ] = g_strdup ("shorten");
+					PtrTabArgs [ pos++ ] = g_strdup ("-x");
+					PtrTabArgs [ pos++ ] = g_strdup ("-b");
+					PtrTabArgs [ pos++ ] = g_strdup ("256");
+					PtrTabArgs [ pos++ ] = g_strdup ("-c");
+					PtrTabArgs [ pos++ ] = g_strdup ("2");
+					PtrTabArgs [ pos++ ] = g_strdup (PConv->tmp_shn);
+					PtrTabArgs [ pos++ ] = g_strdup (PConv->tmp_wav);
+					PtrTabArgs [ pos++ ] = NULL;
+					conv_to_convert( PtrTabArgs, FALSE, SHORTEN_SHN_TO_WAV, "SHORTEN_SHN_TO_WAV");
+					PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+					conv.Bool_MAJ_select = TRUE;
+					break;
 				}
 
-				// CONVERSION AAC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = AACPLUSENC_WAV_TO_AAC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Aac >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_aac;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, AACPLUSENC_WAV_TO_AAC, "AACPLUSENC_WAV_TO_AAC");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION WAVPACK
-				if (FALSE == conv.bool_stop && detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST) {
-					PConv->BoolEtatConv [ ETAT_BOOL_WAVPACK ] = TRUE;
-						
-					param_filelc.type_conv = WAVPACK_WAV_TO_WAVPACK;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_WavPack >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_wavpack;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, WAVPACK_WAV_TO_WAVPACK, "WAVPACK_WAV_TO_WAVPACK");
-					filelc_get_command_line_remove ();
-
-					// if (*optionsWavpack_get_wavpack_signature_md5 () != '\0') {
-					// 	// conv.bool_set_log_wavpack = TRUE;
-					// }
-				}
+				} // swicth
 
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_copy_src_to_dest (detail, PConv);
+				if( TRUE == conv.Bool_MAJ_select ) fileconv_copy_src_to_dest( FILE_IS_WAV, detail, PConv );
 			}
-			/*
-			SOURCE RM
-			DEST WAV : RM -> WAV mplayer ./01.rm -ao pcm -ao pcm:file=01.wav
-			DEST MP3 : WAV -> MP3 lame file.wav file.mp3
-			DEST OGG : WAV -> OGG oggenc file.wav file.ogg
-			DEST FLAC : WAV -> FLAC flac -f file.wav -o file.flac
-			DEST M4A : WAV -> M4A faac
-			DEST MPC : WAV -> MPC mppenc
-			DEST APE : WAV -> APE mac
-			DEST WAVPACK : WAV -> WAVPACK wavpack
-			*/
-			if (FALSE == conv.bool_stop && FILE_IS_RM == detail->type_infosong_file_is &&
-				(
-				detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST
-				)) {
-
-				INFO_RM *info = (INFO_RM *)detail->info;
-
-				fileconv_infos (detail);
-				
-				// COPIE DANS LE DOSSIER TEMPORAIRE
-				conv_copy_src_to_dest (detail->namefile, PConv->tmp_rm);
-				
-				// CONVERSION WAV */
-				if (FALSE == conv.bool_stop) {
-					pos = filelc_get_command_line_nice ();
-					conv.ArgConv [ pos++ ] = g_strdup ("mplayer");
-					conv.ArgConv [ pos++ ] = g_strdup ("-nojoystick");
-					conv.ArgConv [ pos++ ] = g_strdup ("-nolirc");
-					conv.ArgConv [ pos++ ] = g_strdup (PConv->tmp_rm);
-					conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-					conv.ArgConv [ pos++ ] = g_strdup ("pcm");
-					conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-					conv.ArgConv [ pos++ ] = g_strdup_printf ("pcm:file=%s", PConv->tmp_wav);
-					conv.ArgConv [ pos++ ] = g_strdup ("-af");
-					conv.ArgConv [ pos++ ] = g_strdup ("channels=2");
-					conv.ArgConv [ pos++ ] = g_strdup ("-srate");
-					conv.ArgConv [ pos++ ] = g_strdup ("44100");
-					conv.ArgConv [ pos++ ] = NULL;
-							
-					BoolResultMplayerIsOk = conv_to_convert (param_filelc.With_CommandLineUser, MPLAYER_RM_TO_WAV, "MPLAYER_RM_TO_WAV");
-					filelc_get_command_line_remove ();
-
-					if (FALSE == BoolResultMplayerIsOk) {
-						PRINT("PROBLEME DE CONVERSION AVEC MPLAYER:---------> RETOUR");
-						break;
-					}
-				}
 
-				// CONVERSION APE
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = MAC_WAV_TO_APE;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Ape >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_ape;
-					param_filelc.tags = NULL;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, MAC_WAV_TO_APE, "MAC_WAV_TO_APE");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION MPC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = MPPENC_WAV_TO_MPC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Mpc >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_mpc;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, MPPENC_WAV_TO_MPC, "MPPENC_WAV_TO_MPC");
-					filelc_get_command_line_remove ();
-				}
+			tagswav_file_GetBitrate( PConv->tmp_wav, &Channels, &Hertz, &Bits );
+			NewBits = Bits;
 
-				// CONVERSION MP3
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = LAME_WAV_TO_MP3;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Mp3 >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_mp3;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = options_get_params (LAME_WAV_TO_MP3, NULL);
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, LAME_WAV_TO_MP3, "LAME_WAV_TO_MP3");
-					filelc_get_command_line_remove ();
-				}
+			// ------------------------------------------------------------------------
+			//
+			// FROM:
+			//	WAV
+			// TO:
+			//	FLAC | APE | WAVPACK | OGG | M4A | FILE_IS_VID_M4A | AAC | MPC | MP3
+			//
+			// ------------------------------------------------------------------------
 
-				// CONVERSION OGG
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = OGGENC_WAV_TO_OGG;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Ogg >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_ogg;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = options_get_params (OGGENC_WAV_TO_OGG, NULL);
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, OGGENC_WAV_TO_OGG, "OGGENC_WAV_TO_OGG");
-					filelc_get_command_line_remove ();
-				}
+			if( FALSE == conv.bool_stop && detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ) {
 
-				// CONVERSION FLAC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = FLAC_WAV_TO_FLAC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Flac >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_flac;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FLAC_WAV_TO_FLAC, "FLAC_WAV_TO_FLAC");
-					filelc_get_command_line_remove ();
-				}
+				gchar	**PtrTabArgs = NULL;
 
-				// CONVERSION M4A
-				if (FALSE == conv.bool_stop && detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = FAAC_WAV_TO_M4A;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_M4a >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_m4a;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FAAC_WAV_TO_M4A, "FAAC_WAV_TO_M4A");
-					filelc_get_command_line_remove ();
-				}
+				// REAJUSTE LA QUANTIFICATION
+				if( Bits == 32 ) {
 
-				// CONVERSION AAC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = AACPLUSENC_WAV_TO_AAC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Aac >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_aac;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, AACPLUSENC_WAV_TO_AAC, "AACPLUSENC_WAV_TO_AAC");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION WAVPACK
-				if (FALSE == conv.bool_stop && detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST) {
-					PConv->BoolEtatConv [ ETAT_BOOL_WAVPACK ] = TRUE;
-						
-					param_filelc.type_conv = WAVPACK_WAV_TO_WAVPACK;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_WavPack >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_wavpack;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, WAVPACK_WAV_TO_WAVPACK, "WAVPACK_WAV_TO_WAVPACK");
-					filelc_get_command_line_remove ();
-
-					// if (*optionsWavpack_get_wavpack_signature_md5 () != '\0') {
-					// 	// conv.bool_set_log_wavpack = TRUE;
-					// }
+					VarFileConv.BoolResultSoxIsOk = fileconv_change_quantification_with_sox( PConv, Hertz, Channels, 24 );
 				}
 
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_copy_src_to_dest (detail, PConv);
+				param_filelc.type_conv = FLAC_WAV_TO_FLAC;
+				param_filelc.With_CommandLineUser = detail->EtatSelection_Flac >= ETAT_SELECT_EXPERT;
+				param_filelc.filesrc = ( Bits == 32 ) ? PConv->tmp_sox : PConv->tmp_wav;
+				param_filelc.filedest = PConv->tmp_flac;
+				param_filelc.tags = NULL;
+				param_filelc.cdrom = NULL;
+				param_filelc.num_track = NULL;
+				param_filelc.PtrStrBitrate = NULL;
+			pthread_mutex_lock( &mutex );
+				PtrTabArgs = filelc_get_command_line (&param_filelc);
+			pthread_mutex_unlock( &mutex );
+				conv_to_convert( PtrTabArgs, param_filelc.With_CommandLineUser, FLAC_WAV_TO_FLAC, "FLAC_WAV_TO_FLAC");
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+				conv.Bool_MAJ_select = TRUE;
+				fileconv_copy_src_to_dest( FILE_IS_FLAC, detail, PConv );
 			}
-			/*
-			SOURCE DTS
-			DEST WAV : DTS -> WAV mplayer ./01.dts -ao pcm -ao pcm:file=01.wav
-			DEST MP3 : WAV -> MP3 lame file.wav file.mp3
-			DEST OGG : WAV -> OGG oggenc file.wav file.ogg
-			DEST FLAC : WAV -> FLAC flac -f file.wav -o file.flac
-			DEST M4A : WAV -> M4A faac
-			DEST MPC : WAV -> MPC mppenc
-			DEST APE : WAV -> APE mac
-			DEST WAVPACK : WAV -> WAVPACK wavpack
-			*/
-			if (FALSE == conv.bool_stop && FILE_IS_DTS == detail->type_infosong_file_is &&
-				(
-				detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST
-				)) {
-
-				INFO_DTS *info = (INFO_DTS *)detail->info;
-
-				fileconv_infos (detail);
-				
-				// COPIE DANS LE DOSSIER TEMPORAIRE
-				conv_copy_src_to_dest (detail->namefile, PConv->tmp_dts);
-				
-				// CONVERSION WAV
-				if (FALSE == conv.bool_stop) {
-					pos = filelc_get_command_line_nice ();
-					conv.ArgConv [ pos++ ] = g_strdup ("mplayer");
-					conv.ArgConv [ pos++ ] = g_strdup ("-nojoystick");
-					conv.ArgConv [ pos++ ] = g_strdup ("-nolirc");
-					conv.ArgConv [ pos++ ] = g_strdup (PConv->tmp_dts);
-					conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-					conv.ArgConv [ pos++ ] = g_strdup ("pcm");
-					conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-					conv.ArgConv [ pos++ ] = g_strdup_printf ("pcm:file=%s", PConv->tmp_wav);
-					conv.ArgConv [ pos++ ] = g_strdup ("-af");
-					conv.ArgConv [ pos++ ] = g_strdup ("channels=2");
-					conv.ArgConv [ pos++ ] = g_strdup ("-srate");
-					conv.ArgConv [ pos++ ] = g_strdup ("44100");
-					conv.ArgConv [ pos++ ] = NULL;
-		
-					BoolResultMplayerIsOk = conv_to_convert (param_filelc.With_CommandLineUser, MPLAYER_DTS_TO_WAV, "MPLAYER_DTS_TO_WAV");
-					filelc_get_command_line_remove ();
-
-					if (FALSE == BoolResultMplayerIsOk) {
-						PRINT("PROBLEME DE CONVERSION AVEC MPLAYER:---------> RETOUR");
-						break;
-					}
-				}
-
-				// CONVERSION APE
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = MAC_WAV_TO_APE;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Ape >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_ape;
-					param_filelc.tags = NULL;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, MAC_WAV_TO_APE, "MAC_WAV_TO_APE");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION MPC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = MPPENC_WAV_TO_MPC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Mpc >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_mpc;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, MPPENC_WAV_TO_MPC, "MPPENC_WAV_TO_MPC");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION MP3
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = LAME_WAV_TO_MP3;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Mp3 >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_mp3;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = options_get_params (LAME_WAV_TO_MP3, NULL);
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, LAME_WAV_TO_MP3, "LAME_WAV_TO_MP3");
-					filelc_get_command_line_remove ();
-				}
 
-				// CONVERSION OGG
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = OGGENC_WAV_TO_OGG;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Ogg >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_ogg;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = options_get_params (OGGENC_WAV_TO_OGG, NULL);
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, OGGENC_WAV_TO_OGG, "OGGENC_WAV_TO_OGG");
-					filelc_get_command_line_remove ();
-				}
+			if( FALSE == conv.bool_stop && detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST ) {
 
-				// CONVERSION FLAC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = FLAC_WAV_TO_FLAC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Flac >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_flac;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FLAC_WAV_TO_FLAC, "FLAC_WAV_TO_FLAC");
-					filelc_get_command_line_remove ();
-				}
+				gchar	**PtrTabArgs = NULL;
 
-				// CONVERSION M4A
-				if (FALSE == conv.bool_stop && detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = FAAC_WAV_TO_M4A;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_M4a >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_m4a;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FAAC_WAV_TO_M4A, "FAAC_WAV_TO_M4A");
-					filelc_get_command_line_remove ();
-				}
+				// REAJUSTE LA QUANTIFICATION
+				if( Bits >= 24 ) {
 
-				// CONVERSION AAC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = AACPLUSENC_WAV_TO_AAC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Aac >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_aac;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, AACPLUSENC_WAV_TO_AAC, "AACPLUSENC_WAV_TO_AAC");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION WAVPACK
-				if (FALSE == conv.bool_stop && detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST) {
-					PConv->BoolEtatConv [ ETAT_BOOL_WAVPACK ] = TRUE;
-						
-					param_filelc.type_conv = WAVPACK_WAV_TO_WAVPACK;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_WavPack >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_wavpack;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, WAVPACK_WAV_TO_WAVPACK, "WAVPACK_WAV_TO_WAVPACK");
-					filelc_get_command_line_remove ();
-
-					// if (*optionsWavpack_get_wavpack_signature_md5 () != '\0') {
-					// 	// conv.bool_set_log_wavpack = TRUE;
-					// }
+					VarFileConv.BoolResultSoxIsOk = fileconv_change_quantification_with_sox( PConv, Hertz, Channels, 16 );
 				}
 
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_copy_src_to_dest (detail, PConv);
+				param_filelc.type_conv = MAC_WAV_TO_APE;
+				param_filelc.With_CommandLineUser = detail->EtatSelection_Ape >= ETAT_SELECT_EXPERT;
+				param_filelc.filesrc = ( Bits >= 24 ) ? PConv->tmp_sox : PConv->tmp_wav;
+				param_filelc.filedest = PConv->tmp_ape;
+				param_filelc.tags = NULL;
+				param_filelc.cdrom = NULL;
+				param_filelc.num_track = NULL;
+				param_filelc.PtrStrBitrate = NULL;
+			pthread_mutex_lock( &mutex );
+				PtrTabArgs = filelc_get_command_line (&param_filelc);
+			pthread_mutex_unlock( &mutex );
+				conv_to_convert( PtrTabArgs, param_filelc.With_CommandLineUser, MAC_WAV_TO_APE, "MAC_WAV_TO_APE");
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+				conv.Bool_MAJ_select = TRUE;
+				fileconv_copy_src_to_dest( FILE_IS_APE, detail, PConv );
 			}
-			/*
-			SOURCE AIFF
-			DEST WAV : AIF -> WAV mplayer ./01.aif -ao pcm -ao pcm:file=01.wav
-			DEST MP3 : WAV -> MP3 lame file.wav file.mp3
-			DEST OGG : WAV -> OGG oggenc file.wav file.ogg
-			DEST FLAC : WAV -> FLAC flac -f file.wav -o file.flac
-			DEST M4A : WAV -> M4A faac
-			DEST MPC : WAV -> MPC mppenc
-			DEST APE : WAV -> APE mac
-			DEST WAVPACK : WAV -> WAVPACK wavpack
-			*/
-			if (FALSE == conv.bool_stop && FILE_IS_AIFF == detail->type_infosong_file_is &&
-				(
-				detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST
-				)) {
-
-				INFO_AIFF *info = (INFO_AIFF *)detail->info;
-
-				fileconv_infos (detail);
-				
-				// COPIE DANS LE DOSSIER TEMPORAIRE
-				conv_copy_src_to_dest (detail->namefile, PConv->tmp_aiff);
-
-				// CONVERSION WAV
-				if (FALSE == conv.bool_stop) {
-					pos = filelc_get_command_line_nice ();
-					conv.ArgConv [ pos++ ] = g_strdup ("mplayer");
-					conv.ArgConv [ pos++ ] = g_strdup ("-nojoystick");
-					conv.ArgConv [ pos++ ] = g_strdup ("-nolirc");
-					conv.ArgConv [ pos++ ] = g_strdup (PConv->tmp_aiff);
-					conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-					conv.ArgConv [ pos++ ] = g_strdup ("pcm");
-					conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-					conv.ArgConv [ pos++ ] = g_strdup_printf ("pcm:file=%s", PConv->tmp_wav);
-					conv.ArgConv [ pos++ ] = g_strdup ("-af");
-					conv.ArgConv [ pos++ ] = g_strdup ("channels=2");
-					conv.ArgConv [ pos++ ] = g_strdup ("-srate");
-					conv.ArgConv [ pos++ ] = g_strdup ("44100");
-					conv.ArgConv [ pos++ ] = NULL;
-		
-					BoolResultMplayerIsOk = conv_to_convert (param_filelc.With_CommandLineUser, MPLAYER_AIFF_TO_WAV, "MPLAYER_AIFF_TO_WAV");
-					filelc_get_command_line_remove ();
-
-					if (FALSE == BoolResultMplayerIsOk) {
-						PRINT("PROBLEME DE CONVERSION AVEC MPLAYER:---------> RETOUR");
-						break;
-					}
-				}
-
-				// CONVERSION APE
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = MAC_WAV_TO_APE;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Ape >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_ape;
-					param_filelc.tags = NULL;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, MAC_WAV_TO_APE, "MAC_WAV_TO_APE");
-					filelc_get_command_line_remove ();
-				}
 
-				// CONVERSION MPC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = MPPENC_WAV_TO_MPC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Mpc >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_mpc;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, MPPENC_WAV_TO_MPC, "MPPENC_WAV_TO_MPC");
-					filelc_get_command_line_remove ();
-				}
+			if( FALSE == conv.bool_stop && detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST ) {
 
-				// CONVERSION MP3
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = LAME_WAV_TO_MP3;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Mp3 >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_mp3;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = options_get_params (LAME_WAV_TO_MP3, NULL);
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, LAME_WAV_TO_MP3, "LAME_WAV_TO_MP3");
-					filelc_get_command_line_remove ();
-				}
+				gchar	**PtrTabArgs = NULL;
 
-				// CONVERSION OGG
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = OGGENC_WAV_TO_OGG;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Ogg >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_ogg;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = options_get_params (OGGENC_WAV_TO_OGG, NULL);
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, OGGENC_WAV_TO_OGG, "OGGENC_WAV_TO_OGG");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION FLAC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = FLAC_WAV_TO_FLAC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Flac >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_flac;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FLAC_WAV_TO_FLAC, "FLAC_WAV_TO_FLAC");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION M4A
-				if (FALSE == conv.bool_stop && detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = FAAC_WAV_TO_M4A;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_M4a >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_m4a;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FAAC_WAV_TO_M4A, "FAAC_WAV_TO_M4A");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION AAC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = AACPLUSENC_WAV_TO_AAC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Aac >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_aac;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, AACPLUSENC_WAV_TO_AAC, "AACPLUSENC_WAV_TO_AAC");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION WAVPACK
-				if (FALSE == conv.bool_stop && detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST) {
-					PConv->BoolEtatConv [ ETAT_BOOL_WAVPACK ] = TRUE;
-						
-					param_filelc.type_conv = WAVPACK_WAV_TO_WAVPACK;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_WavPack >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_wavpack;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, WAVPACK_WAV_TO_WAVPACK, "WAVPACK_WAV_TO_WAVPACK");
-					filelc_get_command_line_remove ();
-
-					// if (*optionsWavpack_get_wavpack_signature_md5 () != '\0') {
-					// 	// conv.bool_set_log_wavpack = TRUE;
-					// }
-				}
-
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_copy_src_to_dest (detail, PConv);
+				param_filelc.type_conv = WAVPACK_WAV_TO_WAVPACK;
+				param_filelc.With_CommandLineUser = detail->EtatSelection_WavPack >= ETAT_SELECT_EXPERT;
+				param_filelc.filesrc = PConv->tmp_wav;
+				param_filelc.filedest = PConv->tmp_wavpack;
+				param_filelc.tags = InfosTags;
+				param_filelc.cdrom = NULL;
+				param_filelc.num_track = NULL;
+				param_filelc.PtrStrBitrate = NULL;
+			pthread_mutex_lock( &mutex );
+				PtrTabArgs = filelc_get_command_line (&param_filelc);
+			pthread_mutex_unlock( &mutex );
+				conv_to_convert( PtrTabArgs, param_filelc.With_CommandLineUser, WAVPACK_WAV_TO_WAVPACK, "WAVPACK_WAV_TO_WAVPACK");
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+				conv.Bool_MAJ_select = TRUE;
+				fileconv_copy_src_to_dest( FILE_IS_WAVPACK, detail, PConv );
 			}
-			/*
-			SOURCE WMA
-			DEST WAV : WMA -> WAV mplayer ./01.wma -ao pcm -ao pcm:file=01.wav
-			DEST MP3 : WAV -> MP3 lame file.wav file.mp3
-			DEST OGG : WAV -> OGG oggenc file.wav file.ogg
-			DEST FLAC : WAV -> FLAC flac -f file.wav -o file.flac
-			DEST M4A : WAV -> M4A faac
-			DEST MPC : WAV -> MPC mppenc
-			DEST APE : WAV -> APE mac
-			DEST WAVPACK : WAV -> WAVPACK wavpack
-			*/
-			if (FALSE == conv.bool_stop && FILE_IS_WMA == detail->type_infosong_file_is &&
-				(
-				detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST
-				)) {
 
-				INFO_WMA *info = (INFO_WMA *)detail->info;
+			if( FALSE == conv.bool_stop && detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ) {
 
-				fileconv_infos (detail);
-				
-				// COPIE DANS LE DOSSIER TEMPORAIRE
-				conv_copy_src_to_dest (detail->namefile, PConv->tmp_wma);
+				gchar	**PtrTabArgs = NULL;
 
-				// CONVERSION WAV
-				if (FALSE == conv.bool_stop) {
-					pos = filelc_get_command_line_nice ();
-					conv.ArgConv [ pos++ ] = g_strdup ("mplayer");
-					conv.ArgConv [ pos++ ] = g_strdup ("-nojoystick");
-					conv.ArgConv [ pos++ ] = g_strdup ("-nolirc");
-					conv.ArgConv [ pos++ ] = g_strdup (PConv->tmp_wma);
-					conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-					conv.ArgConv [ pos++ ] = g_strdup ("pcm");
-					conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-					conv.ArgConv [ pos++ ] = g_strdup_printf ("pcm:file=%s", PConv->tmp_wav);
-					conv.ArgConv [ pos++ ] = g_strdup ("-af");
-					conv.ArgConv [ pos++ ] = g_strdup ("channels=2");
-					conv.ArgConv [ pos++ ] = g_strdup ("-srate");
-					conv.ArgConv [ pos++ ] = g_strdup ("44100");
-					conv.ArgConv [ pos++ ] = NULL;
-		
-					BoolResultMplayerIsOk = conv_to_convert (param_filelc.With_CommandLineUser, MPLAYER_WMA_TO_WAV, "MPLAYER_WMA_TO_WAV");
-					filelc_get_command_line_remove ();
-
-					if (FALSE == BoolResultMplayerIsOk) {
-						PRINT("PROBLEME DE CONVERSION AVEC MPLAYER:---------> RETOUR");
-						break;
-					}
-				}
+				// REAJUSTE LA QUANTIFICATION
+				if (TRUE == PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_OGG ]) {
 
-				// CONVERSION APE
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = MAC_WAV_TO_APE;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Ape >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_ape;
-					param_filelc.tags = NULL;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, MAC_WAV_TO_APE, "MAC_WAV_TO_APE");
-					filelc_get_command_line_remove ();
-				}
+					if (Bits > 24)				NewBits = 24;
+					else if (Bits > 16 && Bits < 24)	NewBits = (Bits - 16) < 3 ? 24 : 16;
+					else if (Bits > 8 && Bits < 16)		NewBits = (Bits - 8) < 3 ? 16 : 8;
+					else if (Bits < 8)			NewBits = 8;
 
-				// CONVERSION MPC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = MPPENC_WAV_TO_MPC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Mpc >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_mpc;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, MPPENC_WAV_TO_MPC, "MPPENC_WAV_TO_MPC");
-					filelc_get_command_line_remove ();
-				}
+					Bits = NewBits;
 
-				// CONVERSION MP3
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = LAME_WAV_TO_MP3;
-						param_filelc.With_CommandLineUser = detail->EtatSelection_Mp3 >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_mp3;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = options_get_params (LAME_WAV_TO_MP3, NULL);
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, LAME_WAV_TO_MP3, "LAME_WAV_TO_MP3");
-					filelc_get_command_line_remove ();
+					VarFileConv.BoolResultSoxIsOk = fileconv_change_quantification_with_sox( PConv, Hertz, Channels, NewBits );
 				}
 
-				// CONVERSION OGG
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = OGGENC_WAV_TO_OGG;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Ogg >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_ogg;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = options_get_params (OGGENC_WAV_TO_OGG, NULL);
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, OGGENC_WAV_TO_OGG, "OGGENC_WAV_TO_OGG");
-					filelc_get_command_line_remove ();
-				}
+				if (Bits == 24) {
 
-				// CONVERSION FLAC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = FLAC_WAV_TO_FLAC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Flac >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_flac;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FLAC_WAV_TO_FLAC, "FLAC_WAV_TO_FLAC");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION M4A
-				if (FALSE == conv.bool_stop && detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = FAAC_WAV_TO_M4A;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_M4a >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_m4a;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FAAC_WAV_TO_M4A, "FAAC_WAV_TO_M4A");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION AAC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = AACPLUSENC_WAV_TO_AAC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Aac >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_aac;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, AACPLUSENC_WAV_TO_AAC, "AACPLUSENC_WAV_TO_AAC");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION WAVPACK
-				if (FALSE == conv.bool_stop && detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST) {
-
-					PConv->BoolEtatConv [ ETAT_BOOL_WAVPACK ] = TRUE;
-						
-					param_filelc.type_conv = WAVPACK_WAV_TO_WAVPACK;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_WavPack >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_wavpack;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, WAVPACK_WAV_TO_WAVPACK, "WAVPACK_WAV_TO_WAVPACK");
-					filelc_get_command_line_remove ();
-
-					// if (*optionsWavpack_get_wavpack_signature_md5 () != '\0') {
-					// 	// conv.bool_set_log_wavpack = TRUE;
-					// }
-				}
-
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_copy_src_to_dest (detail, PConv);
-			}
-			/*
-			SOURCE SHORTEN
-			DEST WAV : SHN -> WAV shorten -x -b 256 -c 2 01.shn 01.wav
-			DEST FLAC : WAV -> FLAC flac
-			DEST MP3 : WAV -> MP3 lame
-			DEST OGG : WAV -> OGG oggenc
-			DEST M4A : WAV -> M4A faac
-			DEST MPC : WAV -> MPC mppenc
-			DEST APE : WAV -> APE mac
-			DEST WAVPACK : WAV -> WAVPACK wavpack
-			*/
-			if (FALSE == conv.bool_stop && FILE_IS_SHN == detail->type_infosong_file_is &&
-				(
-				detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST
-				)) {
-
-				INFO_SHN *info = (INFO_SHN *)detail->info;
-
-				fileconv_infos (detail);
-				
-				// COPIE DANS LE DOSSIER TEMPORAIRE
-				conv_copy_src_to_dest (detail->namefile, PConv->tmp_shn);
+					PtrTabArgs = conv_with_sox_float_get_param(
+								(TRUE == PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_OGG ]) ? PConv->tmp_sox : PConv->tmp_wav,
+								PConv->tmp_sox_24
+								);
 
-				// CONVERSION WAV
-				if (FALSE == conv.bool_stop) {
-					pos = filelc_get_command_line_nice ();
-					conv.ArgConv [ pos++ ] = g_strdup ("shorten");
-					conv.ArgConv [ pos++ ] = g_strdup ("-x");
-					conv.ArgConv [ pos++ ] = g_strdup ("-b");
-					conv.ArgConv [ pos++ ] = g_strdup ("256");
-					conv.ArgConv [ pos++ ] = g_strdup ("-c");
-					conv.ArgConv [ pos++ ] = g_strdup ("2");
-					conv.ArgConv [ pos++ ] = g_strdup (PConv->tmp_shn);
-					conv.ArgConv [ pos++ ] = g_strdup (PConv->tmp_wav);
-					conv.ArgConv [ pos++ ] = NULL;
-		
-					conv_to_convert (param_filelc.With_CommandLineUser, SHORTEN_SHN_TO_WAV, "SHORTEN_SHN_TO_WAV");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION APE
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = MAC_WAV_TO_APE;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Ape >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_ape;
-					param_filelc.tags = NULL;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, MAC_WAV_TO_APE, "MAC_WAV_TO_APE");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION MPC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = MPPENC_WAV_TO_MPC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Mpc >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_mpc;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, MPPENC_WAV_TO_MPC, "MPPENC_WAV_TO_MPC");
-					filelc_get_command_line_remove ();
-				}
+					conv_to_convert( PtrTabArgs, FALSE, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
+					PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 
-				// CONVERSION FLAC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = FLAC_WAV_TO_FLAC;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Flac >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_flac;
-					param_filelc.tags = NULL;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FLAC_WAV_TO_FLAC, "FLAC_WAV_TO_FLAC");
-					filelc_get_command_line_remove ();
+					conv_copy_src_to_dest( PConv->tmp_sox_24, PConv->tmp_sox);
 				}
 
-				// CONVERSION MP3
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = LAME_WAV_TO_MP3;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Mp3 >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_mp3;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = options_get_params (LAME_WAV_TO_MP3, NULL);
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, LAME_WAV_TO_MP3, "LAME_WAV_TO_MP3");
-					filelc_get_command_line_remove ();
-				}
+				param_filelc.type_conv = OGGENC_WAV_TO_OGG;
+				param_filelc.With_CommandLineUser = detail->EtatSelection_Ogg >= ETAT_SELECT_EXPERT;
 
-				// CONVERSION OGG
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = OGGENC_WAV_TO_OGG;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_Ogg >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_ogg;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = options_get_params (OGGENC_WAV_TO_OGG, NULL);
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, OGGENC_WAV_TO_OGG, "OGGENC_WAV_TO_OGG");
-					filelc_get_command_line_remove ();
+				if (TRUE == PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_OGG ] || Bits == 24) {
+					param_filelc.filesrc = PConv->tmp_sox;
 				}
-
-				// CONVERSION AAC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST) {
-					param_filelc.type_conv = FAAC_WAV_TO_M4A;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_M4a >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_m4a;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FAAC_WAV_TO_M4A, "FAAC_WAV_TO_M4A");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION WAVPACK
-				if (FALSE == conv.bool_stop && detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST) {
-					
-					PConv->BoolEtatConv [ ETAT_BOOL_WAVPACK ] = TRUE;
-						
-					param_filelc.type_conv = WAVPACK_WAV_TO_WAVPACK;
-					param_filelc.With_CommandLineUser = detail->EtatSelection_WavPack >= ETAT_SELECT_EXPERT;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_wavpack;
-					param_filelc.tags = info->tags;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, WAVPACK_WAV_TO_WAVPACK, "WAVPACK_WAV_TO_WAVPACK");
-					filelc_get_command_line_remove ();
-
-					// if (*optionsWavpack_get_wavpack_signature_md5 () != '\0') {
-					// 	// conv.bool_set_log_wavpack = TRUE;
-					// }
+				else {
+					param_filelc.filesrc = PConv->tmp_wav;
 				}
 
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_copy_src_to_dest (detail, PConv);
+				param_filelc.filedest = PConv->tmp_ogg;
+				param_filelc.tags = InfosTags;
+				param_filelc.cdrom = NULL;
+				param_filelc.num_track = NULL;
+				param_filelc.BoolSetBitrate = FALSE;
+				param_filelc.PtrStrBitrate = options_get_params (OGGENC_WAV_TO_OGG);
+			pthread_mutex_lock( &mutex );
+				PtrTabArgs = filelc_get_command_line (&param_filelc);
+			pthread_mutex_unlock( &mutex );
+				conv_to_convert( PtrTabArgs, param_filelc.With_CommandLineUser, OGGENC_WAV_TO_OGG, "OGGENC_WAV_TO_OGG");
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+				conv.Bool_MAJ_select = TRUE;
+				fileconv_copy_src_to_dest( FILE_IS_OGG, detail, PConv );
+			}
+			if( FALSE == conv.bool_stop && detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ) {
+
+				gchar	**PtrTabArgs = NULL;
+
+				// REAJUSTE LA QUANTIFICATION
+				if (TRUE == PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_M4A ]) {
+
+					if (Bits > 64)				NewBits = 64;
+					else if (Bits > 32 && Bits < 64)	NewBits = 32;
+					else if (Bits > 24 && Bits < 32)	NewBits = 24;
+					else if (Bits > 16 && Bits < 24)	NewBits = (Bits - 16) < 3 ? 24 : 16;
+					else if (Bits > 8 && Bits < 16)		NewBits = (Bits - 8) < 3 ? 16 : 8;
+					else if (Bits < 8)			NewBits = 8;
+
+					NewBits = Bits;
+
+					VarFileConv.BoolResultSoxIsOk = fileconv_change_quantification_with_sox( PConv, Hertz, Channels, NewBits );
+				}
+				else {
+					conv_copy_src_to_dest( PConv->tmp_wav, PConv->tmp_sox);
+				}
+
+				if (Bits == 32 || Bits == 24) {
+
+					PtrTabArgs = conv_with_sox_float_get_param(
+								PConv->tmp_sox,
+								PConv->tmp_sox_24
+								);
+					conv_to_convert( PtrTabArgs, FALSE, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
+					PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+
+					conv_copy_src_to_dest( PConv->tmp_sox_24, PConv->tmp_sox);
+				}
+
+				param_filelc.type_conv = FAAC_WAV_TO_M4A;
+				param_filelc.With_CommandLineUser = detail->EtatSelection_M4a >= ETAT_SELECT_EXPERT;
+				param_filelc.filesrc = PConv->tmp_sox;
+				param_filelc.filedest = PConv->tmp_m4a;
+				param_filelc.tags = InfosTags;
+				param_filelc.cdrom = NULL;
+				param_filelc.num_track = NULL;
+			pthread_mutex_lock( &mutex );
+				PtrTabArgs = filelc_get_command_line (&param_filelc);
+			pthread_mutex_unlock( &mutex );
+				conv_to_convert( PtrTabArgs, param_filelc.With_CommandLineUser, FAAC_WAV_TO_M4A, "FAAC_WAV_TO_M4A");
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+				conv.Bool_MAJ_select = TRUE;
+				fileconv_copy_src_to_dest( FILE_IS_M4A, detail, PConv );
+			}
+
+			if( FALSE == conv.bool_stop && detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST ) {
+
+				gchar	**PtrTabArgs = NULL;
+
+				// REAJUSTE LA QUANTIFICATION
+				if (TRUE == PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_AAC ]) {
+
+					if (Bits > 64)				NewBits = 64;
+					else if (Bits > 32 && Bits < 64)	NewBits = 32;
+					else if (Bits > 24 && Bits < 32)	NewBits = 24;
+					else if (Bits > 16 && Bits < 24)	NewBits = (Bits - 16) < 3 ? 24 : 16;
+					else if (Bits > 8 && Bits < 16)		NewBits = (Bits - 8) < 3 ? 16 : 8;
+					else if (Bits < 8)			NewBits = 8;
+
+					NewBits = Bits;
+
+					VarFileConv.BoolResultSoxIsOk = fileconv_change_quantification_with_sox( PConv, Hertz, Channels, NewBits );
+				}
+				else {
+					conv_copy_src_to_dest( PConv->tmp_wav, PConv->tmp_sox);
+				}
+
+				if (Bits == 24) {
+
+					PtrTabArgs = conv_with_sox_float_get_param(
+							PConv->tmp_sox,
+							PConv->tmp_sox_24
+							);
+					conv_to_convert( PtrTabArgs, FALSE, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
+					PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+
+					conv_copy_src_to_dest( PConv->tmp_sox_24, PConv->tmp_sox);
+				}
+
+				if (Hertz < 44100) {
+					PtrTabArgs = filelc_AllocTabArgs();
+					pos = 3;
+					PtrTabArgs [ pos++ ] = g_strdup ("mplayer");
+					PtrTabArgs [ pos++ ] = g_strdup ("-nojoystick");
+					PtrTabArgs [ pos++ ] = g_strdup ("-nolirc");
+					PtrTabArgs [ pos++ ] = g_strdup (PConv->tmp_sox);
+					PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+					PtrTabArgs [ pos++ ] = g_strdup ("pcm");
+					PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+					PtrTabArgs [ pos++ ] = g_strdup_printf ("pcm:file=%s",PConv->tmp_sox_24);
+					PtrTabArgs [ pos++ ] = g_strdup ("-srate");
+					PtrTabArgs [ pos++ ] = g_strdup ("44100");
+					PtrTabArgs [ pos++ ] = NULL;
+					VarFileConv.BoolResultMplayerIsOk = conv_to_convert( PtrTabArgs, FALSE, MPLAYER_WAV_TO_WAV, "MPLAYER_WAV_TO_WAV");
+					PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+					VarFileConv.BoolResultMplayerIsOk = libutils_test_file_exist( PConv->tmp_sox_24 );
+					conv_copy_src_to_dest( PConv->tmp_sox_24, PConv->tmp_sox);
+				}
+
+				param_filelc.type_conv = AACPLUSENC_WAV_TO_AAC;
+				param_filelc.With_CommandLineUser = detail->EtatSelection_Aac >= ETAT_SELECT_EXPERT;
+				param_filelc.filesrc = PConv->tmp_sox;
+				param_filelc.filedest = PConv->tmp_aac;
+				param_filelc.tags = NULL;
+				param_filelc.cdrom = NULL;
+				param_filelc.num_track = NULL;
+				param_filelc.PtrStrBitrate = NULL;
+			pthread_mutex_lock( &mutex );
+				PtrTabArgs = filelc_get_command_line (&param_filelc);
+			pthread_mutex_unlock( &mutex );
+				conv_to_convert( PtrTabArgs, param_filelc.With_CommandLineUser, AACPLUSENC_WAV_TO_AAC, "AACPLUSENC_WAV_TO_AAC");
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+				conv.Bool_MAJ_select = TRUE;
+				fileconv_copy_src_to_dest( FILE_IS_AAC, detail, PConv );
+			}
+
+			if( FALSE == conv.bool_stop && detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ) {
+
+				gchar	**PtrTabArgs = NULL;
+
+				// REAJUSTE LA QUANTIFICATION
+				if( Bits != 64 || Bits != 32 || Bits != 24 || Bits != 16 || Bits != 8 ) {
+
+					if (Bits > 64)				NewBits = 64;
+					else if (Bits > 32 && Bits < 64)	NewBits = 32;
+					else if (Bits > 24 && Bits < 32)	NewBits = 24;
+					else if (Bits > 16 && Bits < 24)	NewBits = (Bits - 16) < 3 ? 24 : 16;
+					else if (Bits > 8 && Bits < 16)		NewBits = (Bits - 8) < 3 ? 16 : 8;
+					else if (Bits < 8)			NewBits = 8;
+
+					NewBits = Bits;
+
+					VarFileConv.BoolResultSoxIsOk = fileconv_change_quantification_with_sox( PConv, Hertz, Channels, NewBits );
+				}
+				else {
+					conv_copy_src_to_dest( PConv->tmp_wav, PConv->tmp_sox);
+				}
+
+				// SET WITH FLOAT FORMAT IF Bits == 24 || 32
+				if (Bits == 32 || Bits == 24) {
+
+					PtrTabArgs = conv_with_sox_float_get_param(
+							PConv->tmp_sox,
+							PConv->tmp_sox_24
+							);
+					conv_to_convert( PtrTabArgs, FALSE, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
+					PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+
+					conv_copy_src_to_dest( PConv->tmp_sox_24, PConv->tmp_sox);
+				}
+
+				if (Hertz < 44100) {
+					PtrTabArgs = filelc_AllocTabArgs();
+					pos = 3;
+					PtrTabArgs [ pos++ ] = g_strdup ("mplayer");
+					PtrTabArgs [ pos++ ] = g_strdup ("-nojoystick");
+					PtrTabArgs [ pos++ ] = g_strdup ("-nolirc");
+					PtrTabArgs [ pos++ ] = g_strdup (PConv->tmp_sox);
+					PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+					PtrTabArgs [ pos++ ] = g_strdup ("pcm");
+					PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+					PtrTabArgs [ pos++ ] = g_strdup_printf ("pcm:file=%s", PConv->tmp_sox_24);
+					PtrTabArgs [ pos++ ] = g_strdup ("-srate");
+					PtrTabArgs [ pos++ ] = g_strdup ("44100");
+					PtrTabArgs [ pos++ ] = NULL;
+					VarFileConv.BoolResultMplayerIsOk = conv_to_convert( PtrTabArgs, FALSE, MPLAYER_WAV_TO_WAV, "MPLAYER_WAV_TO_WAV");
+					PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+					VarFileConv.BoolResultMplayerIsOk = libutils_test_file_exist( PConv->tmp_sox_24 );
+					conv_copy_src_to_dest( PConv->tmp_sox_24, PConv->tmp_sox);
+				}
+
+				param_filelc.type_conv = MPPENC_WAV_TO_MPC;
+				param_filelc.With_CommandLineUser = detail->EtatSelection_Mpc >= ETAT_SELECT_EXPERT;
+				param_filelc.filesrc = PConv->tmp_sox;
+				param_filelc.filedest = PConv->tmp_mpc;
+				param_filelc.tags = InfosTags;
+				param_filelc.cdrom = NULL;
+				param_filelc.num_track = NULL;
+				param_filelc.PtrStrBitrate = NULL;
+			pthread_mutex_lock( &mutex );
+				PtrTabArgs = filelc_get_command_line (&param_filelc);
+			pthread_mutex_unlock( &mutex );
+				conv_to_convert( PtrTabArgs, param_filelc.With_CommandLineUser, MPPENC_WAV_TO_MPC, "MPPENC_WAV_TO_MPC");
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+				conv.Bool_MAJ_select = TRUE;
+				fileconv_copy_src_to_dest( FILE_IS_MPC, detail, PConv );
+			}
+
+			if( FALSE == conv.bool_stop && detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ) {
+
+				gchar	**PtrTabArgs = NULL;
+
+				// REAJUSTE LA QUANTIFICATION
+				if( detail->type_infosong_file_is == FILE_IS_VID_M4A ||
+					detail->type_infosong_file_is == FILE_IS_M4A ) {
+
+					NewBits = 16;
+			// pthread_mutex_lock( &mutex );
+					VarFileConv.BoolResultSoxIsOk = fileconv_change_quantification_with_sox( PConv, 44100, 2, 16 );
+			// pthread_mutex_unlock( &mutex );
+				}
+				else if( Hertz == 48000 || Bits == 32 ) {
+					PtrTabArgs = conv_with_sox_float_get_param(
+							PConv->tmp_wav,
+							PConv->tmp_sox
+							);
+
+					conv_to_convert( PtrTabArgs, FALSE, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
+					PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+				} else {
+
+					// CORRECTION
+					// http://forum.ubuntu-fr.org/viewtopic.php?pid=3271586#p3271586
+					// joelab07
+
+					if (Bits < 8)			NewBits = 8;
+					if (Bits > 16 && Bits < 24)	NewBits = (Bits - 16) < 3 ? 16 : 24;
+					if (Bits > 24 && Bits < 32)	NewBits = (Bits - 24) < 3 ? 24 : 32;
+
+					NewBits = Bits;
+					VarFileConv.BoolResultSoxIsOk = fileconv_change_quantification_with_sox( PConv, Hertz, Channels, NewBits );
+				}
+
+				param_filelc.type_conv = LAME_WAV_TO_MP3;
+				param_filelc.With_CommandLineUser = detail->EtatSelection_Mp3 >= ETAT_SELECT_EXPERT;
+				param_filelc.filesrc = PConv->tmp_sox;
+				param_filelc.filedest = PConv->tmp_mp3;
+				param_filelc.tags = InfosTags;
+				param_filelc.cdrom = NULL;
+				param_filelc.num_track = NULL;
+				param_filelc.BoolSetBitrate = FALSE;
+				param_filelc.PtrStrBitrate = options_get_params (LAME_WAV_TO_MP3);
+			pthread_mutex_lock( &mutex );
+				PtrTabArgs = filelc_get_command_line (&param_filelc);
+			pthread_mutex_unlock( &mutex );
+				conv_to_convert( PtrTabArgs, param_filelc.With_CommandLineUser, LAME_WAV_TO_MP3, "LAME_WAV_TO_MP3");
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+				conv.Bool_MAJ_select = TRUE;
+				fileconv_copy_src_to_dest( FILE_IS_MP3, detail, PConv );
 			}
-			/*
-			SOURCE AC3
-			DEST WAV : AC3 -> WAV a52dec
-			DEST FLAC : WAV -> FLAC flac
-			DEST OGG : WAV -> OGG oggenc
-			DEST M4A : WAV -> M4A faac
-			DEST AAC	: WAV -> M4A aacplusenc
-			DEST MPC : WAV -> MPC mppenc
-			DEST APE : WAV -> APE mac
-			DEST WAVPACK : WAV -> WAVPACK wavpack
-			*/
-			if (FALSE == conv.bool_stop && FILE_IS_AC3 == detail->type_infosong_file_is &&
-				(
-				detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST
-				)) {
 
-				// INFO_AC3 *info = (INFO_AC3 *)detail->info;
-				gint		 Channels;
-				gint		 Hertz;
-				gint		 Bits;
-				gchar		*StrChannels = NULL;
-				gchar		*StrHertz = NULL;
-				gchar		*StrBits = NULL;
-
-				fileconv_infos (detail);
-				
-				// COPIE DANS LE DOSSIER TEMPORAIRE
-				conv_copy_src_to_dest (detail->namefile, PConv->tmp_ac3);
+			// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
+			// fileconv_copy_src_to_dest( detail, PConv );
 
-				// CONVERSION WAV
-				if (FALSE == conv.bool_stop) {
-					// 
-					// TODO DEBIAN/ liba52-0.7.4-dev
-					// 
-					// a52dec ./audio.ac3 -o wav > audio.wav
-					// 
-					pos = filelc_get_command_line_nice ();
-					conv.ArgConv [ pos++ ] = g_strdup ("a52dec");
-					conv.ArgConv [ pos++ ] = g_strdup (PConv->tmp_ac3);
-					conv.ArgConv [ pos++ ] = g_strdup ("-o");
-					conv.ArgConv [ pos++ ] = g_strdup ("wav");
-					conv.ArgConv [ pos++ ] = g_strdup (">");
-					conv.ArgConv [ pos++ ] = g_strdup (PConv->tmp_wav);
-					conv.ArgConv [ pos++ ] = NULL;
-					conv_to_convert (FALSE, A52DEC_AC3_TO_WAV, "A52DEC_AC3_TO_WAV");
-					filelc_get_command_line_remove ();
-					
-					tagswav_file_GetBitrate (PConv->tmp_wav, &Channels, &Hertz, &Bits);
-					StrChannels = g_strdup_printf ("%d", Channels);
-					StrHertz = g_strdup_printf ("%d", Hertz);
-					StrBits = g_strdup_printf ("%d", Bits);
-					conv_with_sox_get_param (PConv->tmp_wav, PConv->tmp_sox, StrHertz, StrChannels, StrBits);
-					conv_to_convert (FALSE, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
-					filelc_get_command_line_remove ();
-					
-					g_free (StrChannels);	StrChannels = NULL;
-					g_free (StrHertz);	StrHertz = NULL;
-					g_free (StrBits);	StrBits = NULL;
-					
-					conv_copy_src_to_dest (PConv->tmp_sox, PConv->tmp_wav);
-				}
-
-				// CONVERSION FLAC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST) {
-										
-					param_filelc.type_conv = FLAC_WAV_TO_FLAC;
-					param_filelc.With_CommandLineUser = FALSE;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_flac;
-					param_filelc.tags = NULL;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.PtrStrBitrate = NULL;
-						
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FLAC_WAV_TO_FLAC, "FLAC_WAV_TO_FLAC");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION APE
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST) {
-
-					param_filelc.type_conv = MAC_WAV_TO_APE;
-					param_filelc.With_CommandLineUser = FALSE;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_ape;
-					param_filelc.tags = NULL;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.PtrStrBitrate = NULL;
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, MAC_WAV_TO_APE, "MAC_WAV_TO_APE");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION WAVPACK
-				if (FALSE == conv.bool_stop && detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST) {
-
-					PConv->BoolEtatConv [ ETAT_BOOL_WAVPACK ] = TRUE;
-						
-					param_filelc.type_conv = WAVPACK_WAV_TO_WAVPACK;
-					param_filelc.With_CommandLineUser = FALSE;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_wavpack;
-					param_filelc.tags = NULL;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.PtrStrBitrate = NULL;
-						
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, WAVPACK_WAV_TO_WAVPACK, "WAVPACK_WAV_TO_WAVPACK");
-					filelc_get_command_line_remove ();
-										
-					// if (*optionsWavpack_get_wavpack_signature_md5 () != '\0') {
-					// 	// conv.bool_set_log_wavpack = TRUE;
-					// }
-				}
-
-				// CONVERSION OGG
-				// BUG TROUVE PAR XAVIER
-				// =====================
-				// Si je veux normaliser et convertir un wav 48 kHz en ogg, xcfa me crée un ogg en 44.1 kHz... Pas normal, hein ?
-				// 
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST) {
-
-					param_filelc.type_conv = OGGENC_WAV_TO_OGG;
-					param_filelc.With_CommandLineUser = FALSE;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_ogg;
-					param_filelc.tags = NULL;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = options_get_params (OGGENC_WAV_TO_OGG, NULL);
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, OGGENC_WAV_TO_OGG, "OGGENC_WAV_TO_OGG");
-					filelc_get_command_line_remove ();
-				}				
-
-				// CONVERSION M4A
-				if (FALSE == conv.bool_stop && detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST) {
-
-					param_filelc.type_conv = FAAC_WAV_TO_M4A;
-					param_filelc.With_CommandLineUser = FALSE;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_m4a;
-					param_filelc.tags = NULL;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;
-						
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FAAC_WAV_TO_M4A, "FAAC_WAV_TO_M4A");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION AAC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST) {
-					
-					param_filelc.type_conv = FAAC_WAV_TO_M4A;
-					param_filelc.With_CommandLineUser = FALSE;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_aac;
-					param_filelc.tags = NULL;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = NULL;						
-					
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, FAAC_WAV_TO_M4A, "FAAC_WAV_TO_M4A");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION MPC
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST) {
-					
-					param_filelc.type_conv = MPPENC_WAV_TO_MPC;
-					param_filelc.With_CommandLineUser = FALSE;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_mpc;
-					param_filelc.tags = NULL;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.PtrStrBitrate = NULL;
-						
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, MPPENC_WAV_TO_MPC, "MPPENC_WAV_TO_MPC");
-					filelc_get_command_line_remove ();
-				}
-
-				// CONVERSION MP3
-				if (FALSE == conv.bool_stop && detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) {
-					
-					param_filelc.type_conv = LAME_WAV_TO_MP3;
-					param_filelc.With_CommandLineUser = FALSE;
-					param_filelc.filesrc = PConv->tmp_wav;
-					param_filelc.filedest = PConv->tmp_mp3;
-					param_filelc.tags = NULL;
-					param_filelc.cdrom = NULL;
-					param_filelc.num_track = NULL;
-					param_filelc.BoolSetBitrate = FALSE;
-					param_filelc.PtrStrBitrate = options_get_params (LAME_WAV_TO_MP3, NULL);
-						
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (param_filelc.With_CommandLineUser, LAME_WAV_TO_MP3, "LAME_WAV_TO_MP3");
-					filelc_get_command_line_remove ();
-				}				
-				
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_copy_src_to_dest (detail, PConv);
-			}
-			
 			g_unlink (PConv->tmp_flac);
 			g_unlink (PConv->tmp_wav);
 			g_unlink (PConv->tmp_sox);
@@ -3191,19 +1057,22 @@
 			g_unlink (PConv->tmp_wavpack_md5);
 			g_unlink (PConv->tmp_ac3);
 		}
-		
+
 		if (TRUE == conv.bool_stop)
 			break;
-		else	ListGlobal = g_list_next(ListGlobal);
+		else
+			ListGlobal = g_list_next(ListGlobal);
 	}
-	
+
 	// close(conv.tube_conv [ 0 ]);
-	conv.bool_thread_conv = FALSE;
-	PRINT("FIN THREAD FILECONV");
+
+	VarFileConv.bool_thread_conv_one = FALSE;
+
+	PRINT("FIN THREAD FILECONV ONE");
 	pthread_exit(0);
 }
-// 
-// 
+//
+//
 static gint fileconv_timeout (gpointer data)
 {
 	if (TRUE == conv.BoolIsa52dec) {
@@ -3211,9 +1080,9 @@
 	}
 	if (TRUE == conv.BoolIsa52dec || TRUE == conv.BoolIsExtract || TRUE == conv.BoolIsConvert || TRUE == conv.BoolIsCopy || TRUE == conv.BoolIsNormalise || TRUE == conv.BoolIsReplaygain) {
 		gchar	Str [ 200 ];
-		
+
 		Str [ 0 ] = '\0';
-		
+
 		if (TRUE == conv.BoolIsExtract) {
 			strcat (Str, "Extraction ");
 		}
@@ -3229,16 +1098,13 @@
 		if (TRUE == conv.BoolIsReplaygain) {
 			strcat (Str, "Replaygain");
 		}
-		if (TRUE == conv.BoolIsa52dec) {
-			strcat (Str, "Conversion AC3");
-		}
-		
+
 		WindScan_set_label (Str);
 	}
 	if (TRUE == conv.bool_percent_conv) {
-		
+
 		gchar	*Str = NULL;
-		
+
 		// DEBUG
 		if( conv.total_percent > 1.0 ) conv.total_percent = 1.0;
 		Str = g_strdup_printf ("%d%%", (int)(conv.total_percent * 100));
@@ -3251,20 +1117,22 @@
 		conv.Bool_MAJ_select = FALSE;
 		file_pixbuf_update_glist ();
 	}
-	else if (FALSE == conv.bool_thread_conv) {
-		
+	else if( FALSE == VarFileConv.bool_thread_conv_one && FALSE == VarFileConv.bool_thread_conv_two && FALSE == VarFileConv.bool_thread_conv_three ) {
+
 		DETAIL		*detail = NULL;
 		CONV_FIC	*PConv = NULL;
 		GList		*list = NULL;
-		
+
+		pthread_mutex_destroy( &mutex );
+
 		// SUPPRESSION DE LA STRUCTURE DE CONVERSIONS
 		list = g_list_first (entetefile);
 		while (list) {
 			if (NULL != (detail = (DETAIL *)list->data)) {
 				if (NULL != (PConv = (CONV_FIC *)detail->PConv)) {
-					
+
 					g_free (detail->NameFileCopyFromNormalizate);		detail->NameFileCopyFromNormalizate = NULL;
-					
+
 					g_free (PConv->dest_flac);		PConv->dest_flac = NULL;
 					g_free (PConv->dest_wav);		PConv->dest_wav = NULL;
 					g_free (PConv->dest_mp3);		PConv->dest_mp3 = NULL;
@@ -3292,981 +1160,284 @@
 					g_free (PConv->tmp_sox);		PConv->tmp_sox = NULL;
 					g_free (PConv->tmp_sox_24);		PConv->tmp_sox_24 = NULL;
 					g_free (PConv->tmp_ac3);		PConv->tmp_ac3 = NULL;
-					
+
 					g_free (PConv);
 					PConv = detail->PConv = NULL;
 				}
 			}
 			list = g_list_next(list);
 		}
-		
+
 		// DELETTE TEMPORAY REP
 		if (NULL != conv.TmpRep) {
 			conv.TmpRep = libutils_remove_temporary_rep (conv.TmpRep);
 		}
-		
+
 		// EST FERMEE DEPUIS: fileaction_ ...
 		// WindScan_close ();
-		
+
 		PRINT("FIN TIMEOUT FILECONV");
-		gtk_timeout_remove (conv.handler_timeout_conv);
+		g_source_remove (conv.handler_timeout_conv);
 		file_pixbuf_update_glist ();
 		fileaction_set_end (TYPE_CONVERSION);
-	}
-	return (TRUE);
-}
-// 
-// 
-void fileconv_get_copy_src_to_dest (DETAIL *detail)
-{
-	if (detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ) {
-		conv.total_convert ++;
-	}
-	if (detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST ) {
-		conv.total_convert ++;
-	}
-	if (detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ) {
-		conv.total_convert ++;
-	}
-	if (detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ) {
-		conv.total_convert ++;
-	}
-	if (detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST ) {
-		conv.total_convert ++;
-	}
-	if (detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ) {
-		conv.total_convert ++;
-	}
-	if (detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ) {
-		conv.total_convert ++;
-	}
-	if (detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST ) {
-		conv.total_convert ++;
-	}
-	if (detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST ) {
-		conv.total_convert ++;	
-		if (*optionsWavpack_get_wavpack_correction_file () != '\0') {
-			conv.total_convert ++;
+
+		if( FALSE == VarFileConv.BoolResultMplayerIsOk ) {
+			wind_info_init (
+				WindMain,
+				_("Error since MPLAYER !"),
+				_("You can enable XCFA command line with: "),
+				 "\n",
+				_("$ xcfa -verbose"),
+				 "\n",
+				_("to see the type of error returned by mplayer."),
+			 	"");
+			VarFileConv.BoolResultMplayerIsOk = FALSE;
+		}
+		else if( FALSE == VarFileConv.BoolResultSoxIsOk ) {
+			wind_info_init (
+				WindMain,
+				_("Error since SOX !"),
+				_("You can enable XCFA command line with: "),
+				 "\n",
+				_("$ xcfa -verbose"),
+				 "\n",
+				_("to see the type of error returned by sox."),
+			 	"");
+			VarFileConv.BoolResultSoxIsOk = FALSE;
 		}
 	}
+	return (TRUE);
 }
-// 
-// 
+//
+//
 void fileconv_get_total_convert (void)
 {
 	GList		*ListGlobal = NULL;
 	DETAIL		*detail = NULL;
 	CONV_FIC	*PConv = NULL;
-	
+	gint		Channels;
+	gint		Hertz;
+	gint		Bits;
+
 	ListGlobal = g_list_first (entetefile);
 	while (ListGlobal) {
 		if (NULL != (detail = (DETAIL *)ListGlobal->data) && NULL != (PConv = (CONV_FIC *)detail->PConv)) {
-		
-			/*
-			SOURCE WAV
-			DEST FLAC : WAV -> FLAC flac
-			DEST MP3 : WAV -> MP3 lame
-			DEST OGG : WAV -> OGG oggenc
-			DEST M4A : WAV -> M4A faac
-			DEST AAC	: WAV -> M4A aacplusenc
-			DEST MPC : WAV -> MPC mppenc
-			DEST APE : WAV -> APE mac
-			DEST WAVPACK : WAV -> WAVPACK wavpack
-			*/
-			if (FILE_IS_WAV == detail->type_infosong_file_is &&
-				(
-				detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST
-				)) {
 
-				gint		 Channels;
-				gint		 Hertz;
-				gint		 Bits;
-				
-				tagswav_file_GetBitrate (detail->namefile, &Channels, &Hertz, &Bits);
-				
-				if (NULL == detail->NameFileCopyFromNormalizate) {
-					conv.total_convert ++;
-				}
-				// CONVERSION FLAC
-				if (detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST) {
-					if (TRUE == PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_FLAC ]) {
-						conv.total_convert ++;
-					}
-					conv.total_convert ++;
-				}
-				// CONVERSION APE
-				if (detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST) {
-					if (TRUE == PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_APE ]) {
-						conv.total_convert ++;
-					}
-					conv.total_convert ++;
-				}
-				// CONVERSION WAVPACK
-				if (detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				if (detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST) {
-					if (TRUE == PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_OGG ]) {
-						conv.total_convert ++;
-					}
-					if (Bits == 24) {
-						conv.total_convert ++;
-						conv.total_convert ++;
-						conv.total_convert ++;
-					}
-					conv.total_convert ++;
-				}				
-				// CONVERSION M4A
-				if (detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST) {
-					if (TRUE == PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_M4A ]) {
-						conv.total_convert ++;
-					}
-					if (Bits == 32 || Bits == 24) {
-						conv.total_convert ++;
-						conv.total_convert ++;
-						conv.total_convert ++;
-					}
-					conv.total_convert ++;
-				}
-				// CONVERSION AAC
-				if (detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST) {
-					if (TRUE == PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_AAC ]) {
-						conv.total_convert ++;
-					}
-					if (Bits == 24) {
-						conv.total_convert ++;
-						conv.total_convert ++;
-						conv.total_convert ++;
-					}
-					if (Hertz < 44100) {
-						conv.total_convert ++;
-						conv.total_convert ++;
-					}
+			// ------------------------------------------------------------------------
+			//
+			// FROM:
+			//	FLAC | APE | WAVPACK | OGG | M4A | MPC | MP3 | WMA | SHORTEN | RM | DTS | AIF | AC3
+			// TO:
+			//	WAV
+			//
+			// ------------------------------------------------------------------------
+
+			if (NULL == detail->NameFileCopyFromNormalizate) {
+				conv.total_convert ++;
+			}
+
+			switch( detail->type_infosong_file_is ) {
+			case FILE_IS_NONE :
+			// case FILE_IS_VID_M4A :
+			case FILE_IS_WAVPACK_MD5 :
+			case FILE_TO_NORMALISE :
+			case FILE_TO_NORMALISE_COLLECTIF :
+			case FILE_TO_REPLAYGAIN :
+			case FILE_IS_AAC :
+			break;
+
+			case FILE_IS_WAV :
+			{
+				INFO_WAV *info = (INFO_WAV *)detail->info;
+
+				if( TRUE == info->BoolBwf ) {
 					conv.total_convert ++;
-				}
-				// CONVERSION MPC
-				if (detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST) {
-					if (TRUE == PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_MPC ]) {
-						conv.total_convert ++;
-					}
-					else {
-						conv.total_convert ++;
-					}
-					// SET WITH FLOAT FORMAT IF Bits == 24 || 32
-					if (Bits == 32 || Bits == 24) {
-						conv.total_convert ++;
-						conv.total_convert ++;
-						conv.total_convert ++;
-					}
-					if (Hertz < 44100) {
-						conv.total_convert ++;
-						conv.total_convert ++;
-					}
 					conv.total_convert ++;
+
 				}
-				// CONVERSION MP3
-				if (detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) {
-					if (Hertz == 48000 && Bits == 32) {
-						conv.total_convert ++;
-						conv.total_convert ++;
-						
-					} else if (Bits != 8 || Bits != 16 || Bits != 24 || Bits != 32) {
-						conv.total_convert ++;
-					}
-					conv.total_convert ++;
-				}				
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_get_copy_src_to_dest (detail);
+				break;
 			}
-			/*
-			SOURCE FLAC
-			DEST OGG : FLAC -> OGG oggenc
-			DEST WAV : FLAC -> WAV flac
-			DEST MP3 : WAV -> MP3 lame
-			DEST M4A : WAV -> M4A faac
-			DEST MPC : WAV -> MPC mppenc
-			DEST APE : WAV -> APE mac
-			DEST WAVPACK : WAV -> WAVPACK wavpack
-			*/
-			if (FILE_IS_FLAC == detail->type_infosong_file_is &&
-				(
-				detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST
-				)) {
-				
-				conv.total_convert ++;				
+			case FILE_IS_FLAC :
+			{
 				conv.total_convert ++;
-				// CONVERSION APE
-				if (detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION MPC
-				if (detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION MP3
-				if (detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION OGG
-				if (detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION M4A
-				if (detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION AAC
-				if (detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION WAVPACK
-				if (detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_get_copy_src_to_dest (detail);
+				conv.total_convert ++;
+				break;
 			}
-			/*
-			SOURCE APE
-			DEST WAV : APE -> WAV mac
-			DEST MP3 : WAV -> MP3 lame file.wav file.mp3
-			DEST OGG : WAV -> OGG oggenc file.wav file.ogg
-			DEST FLAC : WAV -> FLAC flac -f file.wav -o file.flac
-			DEST M4A : WAV -> M4A faac
-			DEST MPC : WAV -> MPC mppenc
-			DEST WAVPACK : WAV -> WAVPACK wavpack
-			*/
-			if (FILE_IS_APE == detail->type_infosong_file_is &&
-				(
-				detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST
-				)) {
-
+			case FILE_IS_APE :
+			{
 				conv.total_convert ++;
 				conv.total_convert ++;
-
-				// CONVERSION MP3
-				if (detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION OGG
-				if (detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION FLAC
-				if (detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION M4A
-				if (detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION AAC
-				if (detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION MPC
-				if (detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION WAVPACK
-				if (detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_get_copy_src_to_dest (detail);
+				break;
 			}
-			/*
-			SOURCE WAVPACK
-			DEST WAV : WAVPACK -> WAV wvunpack
-			DEST MP3 : WAV -> MP3 lame file.wav file.mp3
-			DEST OGG : WAV -> OGG oggenc file.wav file.ogg
-			DEST FLAC : WAV -> FLAC flac -f file.wav -o file.flac
-			DEST M4A : WAV -> M4A faac
-			DEST MPC : WAV -> MPC mppenc
-			DEST APE : WAV -> APE mac
-			*/
-			if (FILE_IS_WAVPACK == detail->type_infosong_file_is &&
-				(
-				detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST
-				)) {
-
+			case FILE_IS_WAVPACK :
+			{
 				conv.total_convert ++;
 				conv.total_convert ++;
 				conv.total_convert ++;
-
-				// CONVERSION MP3
-				if (detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION OGG
-				if (detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION FLAC
-				if (detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION M4A
-				if (detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION AAC
-				if (detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION MPC
-				if (detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION APE
-				if (detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_get_copy_src_to_dest (detail);
+				break;
 			}
-			/*
-			SOURCE OGG
-			DEST WAV : OGG -> WAV ogg123
-			DEST FLAC : WAV -> FLAC flac
-			DEST MP3 : WAV -> MP3 lame
-			DEST M4A : WAV -> M4A faac
-			DEST MPC : WAV -> MPC mppenc
-			DEST APE : WAV -> APE mac
-			DEST WAVPACK : WAV -> WAVPACK wavpack
-			*/
-			if (FILE_IS_OGG == detail->type_infosong_file_is &&
-				(
-				detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST
-				)) {
-
-				if (NULL == detail->NameFileCopyFromNormalizate) {
+			case FILE_IS_OGG :
+			case FILE_IS_MPC :
+			case FILE_IS_MP3 :
+			case FILE_IS_AC3 :
+			{
+				if (FALSE == conv.bool_stop && NULL == detail->NameFileCopyFromNormalizate) {
 					conv.total_convert ++;
 				}
-				// CONVERSION WAV
 				conv.total_convert ++;
-				// CONVERSION APE
-				if (detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION MPC
-				if (detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION FLAC
-				if (detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION MP3
-				if (detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION M4A
-				if (detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION AAC
-				if (detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION WAVPACK
-				if (detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_get_copy_src_to_dest (detail);
+				break;
 			}
-			/*
-			SOURCE M4A
-			SOURCE VID_M4A
-			DEST WAV : M4A -> WAV mplayer
-			DEST MPC : WAV -> MPC mppenc
-			DEST MP3 : WAV -> MP3 lame
-			DEST FLAC : WAV -> FLAC flac
-			DEST OGG : WAV -> OGG oggenc
-			DEST APE : WAV -> APE mac
-			DEST WAVPACK : WAV -> WAVPACK wavpack
-			*/
-			if (( FILE_IS_M4A == detail->type_infosong_file_is || FILE_IS_VID_M4A == detail->type_infosong_file_is ) &&
-				(
-				detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST
-				)) {
-				
+			case FILE_IS_M4A :
+			case FILE_IS_VID_M4A :
+			{
 				conv.total_convert ++;
 				conv.total_convert ++;
-
-				// CONVERSION APE
-				if (detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION MPC
-				if (detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION FLAC
-				if (detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION MP3
-				if (detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION OGG
-				if (detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION AAC
-				if (detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION WAVPACK
-				if (detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_get_copy_src_to_dest (detail);
+				break;
 			}
-			/*
-			SOURCE MPC
-			DEST WAV : MPC -> WAV mppdec
-			DEST MP3 : WAV -> MP3 lame file.wav file.mp3
-			DEST OGG : WAV -> OGG oggenc file.wav file.ogg
-			DEST FLAC : WAV -> FLAC flac -f file.wav -o file.flac
-			DEST M4A : WAV -> M4A faac
-			DEST APE : WAV -> APE mac
-			DEST WAVPACK : WAV -> WAVPACK wavpack
-			*/
-			if (FILE_IS_MPC == detail->type_infosong_file_is &&
-				(
-				detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST
-				)) {
-
+			case FILE_IS_WMA :
+			case FILE_IS_RM :
+			case FILE_IS_DTS :
+			case FILE_IS_AIFF :
+			{
 				conv.total_convert ++;
-				// CONVERSION WAV
 				conv.total_convert ++;
-				// CONVERSION APE
-				if (detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION FLAC
-				if (detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION MP3
-				if (detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION OGG
-				if (detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION M4A
-				if (detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION AAC
-				if (detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION WAVPACK
-				if (detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_get_copy_src_to_dest (detail);
+				break;
+			}
+			case FILE_IS_SHN :
+			{
+				conv.total_convert ++;
+				conv.total_convert ++;
+				break;
 			}
-			/*
-			SOURCE MP3
-			DEST WAV : MP3 -> WAV mplayer
-			DEST FLAC : WAV -> FLAC flac
-			DEST OGG : WAV -> OGG oggenc
-			DEST M4A : WAV -> M4A faac
-			DEST MPC : WAV -> MPC mppenc
-			DEST APE : WAV -> APE mac
-			DEST WAVPACK : WAV -> WAVPACK wavpack
-			*/
-			if (FILE_IS_MP3 == detail->type_infosong_file_is &&
-				(
-				detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST
-				)) {
 
-				if (NULL == detail->NameFileCopyFromNormalizate) {
-					conv.total_convert ++;
-					conv.total_convert ++;
-				}
-				// CONVERSION MPC
-				if (detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION AAC
-				if (detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION APE
-				if (detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION FLAC
-				if (detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION OGG
-				if (detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION M4A
-				if (detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION WAVPACK
-				if (detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_get_copy_src_to_dest (detail);
+			conv.total_convert ++;
+
+			} // swicth
+
+			// ------------------------------------------------------------------------
+			//
+			// FROM:
+			//	WAV
+			// TO:
+			//	FLAC | APE | WAVPACK | OGG | M4A | AAC | MPC | MP3
+			//
+			// ------------------------------------------------------------------------
+
+			if( detail->type_infosong_file_is == FILE_IS_WAV ) {
+				tagswav_file_GetBitrate( detail->namefile, &Channels, &Hertz, &Bits );
+			}
+			else {
+				Channels = 2;
+				Hertz = 44100;
+				Bits = 32;
 			}
-			/*
-			SOURCE SHORTEN
-			DEST WAV : SHN -> WAV shorten -x -b 256 -c 2 01.shn 01.wav
-			DEST FLAC : WAV -> FLAC flac
-			DEST MP3 : WAV -> MP3 lame
-			DEST OGG : WAV -> OGG oggenc
-			DEST M4A : WAV -> M4A faac
-			DEST MPC : WAV -> MPC mppenc
-			DEST APE : WAV -> APE mac
-			DEST WAVPACK : WAV -> WAVPACK wavpack
-			*/
-			if (FILE_IS_SHN == detail->type_infosong_file_is &&
-				(
-				detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST
-				)) {
 
-				conv.total_convert ++;
-				conv.total_convert ++;
+			if( detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ) {
 
-				// CONVERSION APE
-				if (detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION MPC
-				if (detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION FLAC
-				if (detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION MP3
-				if (detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION OGG
-				if (detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION AAC
-				if (detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION WAVPACK
-				if (detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST) {
+				if( Bits == 32 ) {
 					conv.total_convert ++;
 				}
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_copy_src_to_dest (detail, PConv);
-			}
-			/*
-			SOURCE AC3
-			DEST WAV : AC3 -> WAV a52dec
-			DEST FLAC : WAV -> FLAC flac
-			DEST OGG : WAV -> OGG oggenc
-			DEST M4A : WAV -> M4A faac
-			DEST AAC	: WAV -> M4A aacplusenc
-			DEST MPC : WAV -> MPC mppenc
-			DEST APE : WAV -> APE mac
-			DEST WAVPACK : WAV -> WAVPACK wavpack
-			*/
-			if (FILE_IS_AC3 == detail->type_infosong_file_is &&
-				(
-				detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST
-				)) {
-
-				conv.total_convert ++;
-				// CONVERSION WAV
-				conv.total_convert ++;
 				conv.total_convert ++;
 				conv.total_convert ++;
-				// CONVERSION FLAC
-				if (detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION APE
-				if (detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION WAVPACK
-				if (detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION OGG
-				if (detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}				
-				// CONVERSION M4A
-				if (detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION AAC
-				if (detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION MPC
-				if (detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION MP3
-				if (detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}				
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_get_copy_src_to_dest (detail);
 			}
-			/*
-			SOURCE WMA
-			DEST WAV : WMA -> WAV mplayer ./01.wma -ao pcm -ao pcm:file=01.wav
-			DEST MP3 : WAV -> MP3 lame file.wav file.mp3
-			DEST OGG : WAV -> OGG oggenc file.wav file.ogg
-			DEST FLAC : WAV -> FLAC flac -f file.wav -o file.flac
-			DEST M4A : WAV -> M4A faac
-			DEST MPC : WAV -> MPC mppenc
-			DEST APE : WAV -> APE mac
-			DEST WAVPACK : WAV -> WAVPACK wavpack
-			*/
-			if (FILE_IS_WMA == detail->type_infosong_file_is &&
-				(
-				detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST
-				)) {
 
-				conv.total_convert ++;
-				conv.total_convert ++;
+			if( detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST ) {
 
-				// CONVERSION APE
-				if (detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION MPC
-				if (detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION MP3
-				if (detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION OGG
-				if (detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION FLAC
-				if (detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION M4A
-				if (detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST) {
+				if( Bits >= 24 ) {
 					conv.total_convert ++;
 				}
-				// CONVERSION AAC
-				if (detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION WAVPACK
-				if (detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_get_copy_src_to_dest (detail);
+				conv.total_convert ++;
+				conv.total_convert ++;
 			}
-			/*
-			SOURCE RM
-			DEST WAV : RM -> WAV mplayer ./01.rm -ao pcm -ao pcm:file=01.wav
-			DEST MP3 : WAV -> MP3 lame file.wav file.mp3
-			DEST OGG : WAV -> OGG oggenc file.wav file.ogg
-			DEST FLAC : WAV -> FLAC flac -f file.wav -o file.flac
-			DEST M4A : WAV -> M4A faac
-			DEST MPC : WAV -> MPC mppenc
-			DEST APE : WAV -> APE mac
-			DEST WAVPACK : WAV -> WAVPACK wavpack
-			*/
-			if (FILE_IS_RM == detail->type_infosong_file_is &&
-				(
-				detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST
-				)) {
+
+			if( detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST ) {
 
 				conv.total_convert ++;
 				conv.total_convert ++;
+			}
 
-				// CONVERSION APE
-				if (detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION MPC
-				if (detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION MP3
-				if (detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION OGG
-				if (detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST) {
+			if( detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ) {
+
+				if (TRUE == PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_OGG ]) {
 					conv.total_convert ++;
 				}
-				// CONVERSION FLAC
-				if (detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST) {
+				if (Bits == 24) {
 					conv.total_convert ++;
-				}
-				// CONVERSION M4A
-				if (detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST) {
 					conv.total_convert ++;
 				}
-				// CONVERSION AAC
-				if (detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST) {
+				conv.total_convert ++;
+				conv.total_convert ++;
+			}
+
+			if( detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ) {
+
+				conv.total_convert ++;
+				if (Bits == 32 || Bits == 24) {
 					conv.total_convert ++;
-				}
-				// CONVERSION WAVPACK
-				if (detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST) {
 					conv.total_convert ++;
 				}
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_get_copy_src_to_dest (detail);
-			}
-			/*
-			SOURCE DTS
-			DEST WAV : DTS -> WAV mplayer ./01.dts -ao pcm -ao pcm:file=01.wav
-			DEST MP3 : WAV -> MP3 lame file.wav file.mp3
-			DEST OGG : WAV -> OGG oggenc file.wav file.ogg
-			DEST FLAC : WAV -> FLAC flac -f file.wav -o file.flac
-			DEST M4A : WAV -> M4A faac
-			DEST MPC : WAV -> MPC mppenc
-			DEST APE : WAV -> APE mac
-			DEST WAVPACK : WAV -> WAVPACK wavpack
-			*/
-			if (FILE_IS_DTS == detail->type_infosong_file_is &&
-				(
-				detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST
-				)) {
-
 				conv.total_convert ++;
 				conv.total_convert ++;
+			}
+
+			if( detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST ) {
 
-				// CONVERSION APE
-				if (detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST) {
+				conv.total_convert ++;
+				if (Bits == 24) {
 					conv.total_convert ++;
-				}
-				// CONVERSION MPC
-				if (detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST) {
 					conv.total_convert ++;
 				}
-				// CONVERSION MP3
-				if (detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) {
+
+				if (Hertz < 44100) {
 					conv.total_convert ++;
-				}
-				// CONVERSION OGG
-				if (detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST) {
 					conv.total_convert ++;
 				}
-				// CONVERSION FLAC
-				if (detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST) {
+				conv.total_convert ++;
+				conv.total_convert ++;
+			}
+
+			if( detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ) {
+
+				conv.total_convert ++;
+				if (Bits == 32 || Bits == 24) {
 					conv.total_convert ++;
-				}
-				// CONVERSION M4A
-				if (detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST) {
 					conv.total_convert ++;
 				}
-				// CONVERSION AAC
-				if (detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST) {
+				if (Hertz < 44100) {
 					conv.total_convert ++;
-				}
-				// CONVERSION WAVPACK
-				if (detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST) {
 					conv.total_convert ++;
 				}
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_get_copy_src_to_dest (detail);
+				conv.total_convert ++;
+				conv.total_convert ++;
 			}
-			/*
-			SOURCE AIFF
-			DEST WAV : AIF -> WAV mplayer ./01.aif -ao pcm -ao pcm:file=01.wav
-			DEST MP3 : WAV -> MP3 lame file.wav file.mp3
-			DEST OGG : WAV -> OGG oggenc file.wav file.ogg
-			DEST FLAC : WAV -> FLAC flac -f file.wav -o file.flac
-			DEST M4A : WAV -> M4A faac
-			DEST MPC : WAV -> MPC mppenc
-			DEST APE : WAV -> APE mac
-			DEST WAVPACK : WAV -> WAVPACK wavpack
-			*/
-			if (FILE_IS_AIFF == detail->type_infosong_file_is &&
-				(
-				detail->EtatSelection_Wav > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST ||
-				detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST
-				)) {
+
+			if( detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST ) {
 
 				conv.total_convert ++;
 				conv.total_convert ++;
-
-				// CONVERSION APE
-				if (detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION MPC
-				if (detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION MP3
-				if (detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION OGG
-				if (detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION FLAC
-				if (detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION M4A
-				if (detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION AAC
-				if (detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// CONVERSION WAVPACK
-				if (detail->EtatSelection_WavPack > ETAT_ATTENTE_EXIST) {
-					conv.total_convert ++;
-				}
-				// COPIE DOSSIER TEMPORAIRE VERS DESTINATION
-				fileconv_get_copy_src_to_dest (detail);
+				conv.total_convert ++;
 			}
 		}
 		ListGlobal = g_list_next(ListGlobal);
 	}
 }
 // PREPARE LA LISTE POUR LES CONVERSIONS
-// 
+//
 void fileconv_set_flags_before_conversion_file (void)
 {
 	GList		*list = NULL;
 	DETAIL		*detail = NULL;
 	CONV_FIC	*PConv = NULL;
 	gint		CptEtat;
-	
+	gint		NUm = 1;
+
+	VarFileConv.BoolResultMplayerIsOk = TRUE;
+	VarFileConv.BoolResultSoxIsOk = TRUE;
+
 	list = g_list_first (entetefile);
 	while (list) {
 		if (NULL != (detail = (DETAIL *)list->data)) {
-		
+
 			// SI AUCUNE CONVERSION DANS CETTE LIGNE, CONTINUE
 			if (detail->EtatSelection_Wav <= ETAT_ATTENTE_EXIST &&
 				detail->EtatSelection_Flac <= ETAT_ATTENTE_EXIST &&
@@ -4277,24 +1448,24 @@
 				detail->EtatSelection_Aac <= ETAT_ATTENTE_EXIST &&
 				detail->EtatSelection_Mpc <= ETAT_ATTENTE_EXIST &&
 				detail->EtatSelection_Mp3 <= ETAT_ATTENTE_EXIST) {
-				
+
 				list = g_list_next(list);
 				continue;
 			}
 			// CREATION STRUCTURE
 			detail->PConv = (CONV_FIC *)g_malloc0 (sizeof (CONV_FIC));
 			PConv = detail->PConv;
-			
-			// INIT DOSSIER TEMPORAIRE
-			if (NULL == conv.TmpRep) {
+
+
+			// Create tmp rep
+			if( NULL == conv.TmpRep )
 				conv.TmpRep = libutils_create_temporary_rep (Config.PathnameTMP, PATH_TMP_XCFA_AUDIOFILE);
-			}
-						
+
 			// INIT ETAT
 			for (CptEtat = 0; CptEtat < ETAT_BOOL_TOTAL; CptEtat ++) {
 				PConv->BoolEtatConv [ CptEtat ] = FALSE;
 			}
-			
+
 			// PREPARATION DES PATHNAMES DE DESTINATION
 			PConv->dest_flac = file_get_pathname_dest (detail, "flac");
 			PConv->dest_wav = file_get_pathname_dest (detail, "wav");
@@ -4306,80 +1477,55 @@
 			PConv->dest_ape = file_get_pathname_dest (detail, "ape");
 			PConv->dest_wavpack = file_get_pathname_dest (detail, "wv");
 			PConv->dest_wavpack_md5 = file_get_pathname_dest (detail, "wvc");
-			
+
 			// PREPARATION DES PATHNAMES TEMPORAIRES
-			PConv->tmp_flac = g_strdup_printf ("%s/tmp.flac", conv.TmpRep);
+			PConv->tmp_flac = g_strdup_printf ("%s/tmp_%d.flac", conv.TmpRep, NUm );
 			if (NULL != detail->NameFileCopyFromNormalizate)
 				PConv->tmp_wav = g_strdup (detail->NameFileCopyFromNormalizate);
-			else	PConv->tmp_wav = g_strdup_printf ("%s/tmp.wav", conv.TmpRep);
-			PConv->tmp_sox = g_strdup_printf ("%s/tmp_sox.wav", conv.TmpRep);
-			PConv->tmp_sox_24 = g_strdup_printf ("%s/tmp_sox_24.wav", conv.TmpRep);
-			PConv->tmp_mp3 = g_strdup_printf ("%s/tmp.mp3", conv.TmpRep);
-			PConv->tmp_ogg = g_strdup_printf ("%s/tmp.ogg", conv.TmpRep);
-			PConv->tmp_m4a = g_strdup_printf ("%s/tmp.m4a", conv.TmpRep);
-			PConv->tmp_aac = g_strdup_printf ("%s/tmp.aac", conv.TmpRep);
-			PConv->tmp_shn = g_strdup_printf ("%s/tmp.shn", conv.TmpRep);
-			PConv->tmp_wma = g_strdup_printf ("%s/tmp.wma", conv.TmpRep);
-			PConv->tmp_rm = g_strdup_printf ("%s/tmp.rm", conv.TmpRep);
-			PConv->tmp_dts = g_strdup_printf ("%s/tmp.dts", conv.TmpRep);
-			PConv->tmp_aiff = g_strdup_printf ("%s/tmp.aiff", conv.TmpRep);
-			PConv->tmp_mpc = g_strdup_printf ("%s/tmp.mpc", conv.TmpRep);
-			PConv->tmp_ape = g_strdup_printf ("%s/tmp.ape", conv.TmpRep);
-			PConv->tmp_wavpack = g_strdup_printf ("%s/tmp.wv", conv.TmpRep);
-			PConv->tmp_wavpack_md5 = g_strdup_printf ("%s/tmp.wvc", conv.TmpRep);
-			PConv->tmp_ac3 = g_strdup_printf ("%s/tmp.ac3", conv.TmpRep);
-			
-			/*
-			SOURCE WAV
-			DEST FLAC : WAV -> FLAC flac
-			DEST MP3 : WAV -> MP3 lame
-			DEST OGG : WAV -> OGG oggenc
-			DEST M4A : WAV -> M4A faac
-			DEST AAC	: WAV -> M4A aacplusenc
-			DEST MPC : WAV -> MPC mppenc
-			DEST APE : WAV -> APE mac
-			DEST WAVPACK : WAV -> WAVPACK wavpack
-			*/
-			if (detail->type_infosong_file_is == FILE_IS_WAV) {
-				
+			else	PConv->tmp_wav = g_strdup_printf ("%s/tmp_%d.wav", conv.TmpRep, NUm );
+			PConv->tmp_sox = g_strdup_printf ("%s/tmp_sox_%d.wav", conv.TmpRep, NUm );
+			PConv->tmp_sox_24 = g_strdup_printf ("%s/tmp_sox_24_%d.wav", conv.TmpRep, NUm );
+			PConv->tmp_mp3 = g_strdup_printf ("%s/tmp_%d.mp3", conv.TmpRep, NUm );
+			PConv->tmp_ogg = g_strdup_printf ("%s/tmp_%d.ogg", conv.TmpRep, NUm );
+			PConv->tmp_m4a = g_strdup_printf ("%s/tmp_%d.m4a", conv.TmpRep, NUm );
+			PConv->tmp_aac = g_strdup_printf ("%s/tmp_%d.aac", conv.TmpRep, NUm );
+			PConv->tmp_shn = g_strdup_printf ("%s/tmp_%d.shn", conv.TmpRep, NUm );
+			PConv->tmp_wma = g_strdup_printf ("%s/tmp_%d.wma", conv.TmpRep, NUm );
+			PConv->tmp_rm = g_strdup_printf ("%s/tmp_%d.rm", conv.TmpRep, NUm );
+			PConv->tmp_dts = g_strdup_printf ("%s/tmp_%d.dts", conv.TmpRep, NUm );
+			PConv->tmp_aiff = g_strdup_printf ("%s/tmp_%d.aiff", conv.TmpRep, NUm );
+			PConv->tmp_mpc = g_strdup_printf ("%s/tmp_%d.mpc", conv.TmpRep, NUm );
+			PConv->tmp_ape = g_strdup_printf ("%s/tmp_%d.ape", conv.TmpRep, NUm );
+			PConv->tmp_wavpack = g_strdup_printf ("%s/tmp_%d.wv", conv.TmpRep, NUm );
+			PConv->tmp_wavpack_md5 = g_strdup_printf ("%s/tmp_%d.wvc", conv.TmpRep, NUm );
+			PConv->tmp_ac3 = g_strdup_printf ("%s/tmp_%d.ac3", conv.TmpRep, NUm );
+
+			NUm ++;
+
+			if( detail->type_infosong_file_is == FILE_IS_WAV ) {
+
 				gint		 Channels;
 				gint		 Hertz;
 				gint		 Bits;
-				
-				tagswav_file_GetBitrate (detail->namefile, &Channels, &Hertz, &Bits);
-								
-				PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_FLAC ] = 
-					detail->EtatSelection_Flac > ETAT_ATTENTE_EXIST &&
-					(Bits != 24 && Bits != 16 && Bits != 8);
-				
-				PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_APE ] = 
-					detail->EtatSelection_Ape > ETAT_ATTENTE_EXIST &&
-					(Bits != 16 && Bits != 8);
-				
-				PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_OGG ] = 
+
+				tagswav_file_GetBitrate( detail->namefile, &Channels, &Hertz, &Bits );
+
+				PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_OGG ] =
 					detail->EtatSelection_Ogg > ETAT_ATTENTE_EXIST &&
-					(Bits != 24 && Bits != 16 && Bits != 8);				
-												
-				PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_M4A ] = 
+					(Bits != 24 && Bits != 16 && Bits != 8);
+
+				PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_M4A ] =
 					detail->EtatSelection_M4a > ETAT_ATTENTE_EXIST &&
 					(Bits != 64 && Bits != 32 && Bits != 24 && Bits != 16 && Bits != 8);
-				
-				PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_AAC ] = 
-					detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST &&
-					(Bits != 64 && Bits != 32 && Bits != 24 && Bits != 16 && Bits != 8);
 
-				PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_MPC ] = 
-					detail->EtatSelection_Mpc > ETAT_ATTENTE_EXIST &&
+				PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_AAC ] =
+					detail->EtatSelection_Aac > ETAT_ATTENTE_EXIST &&
 					(Bits != 64 && Bits != 32 && Bits != 24 && Bits != 16 && Bits != 8);
-								
-				PConv->BoolEtatConv [ ETAT_FROM_WAV_TO_MP3 ] = 
-					(detail->EtatSelection_Mp3 > ETAT_ATTENTE_EXIST) &&
-					 ((Hertz == 48000 && Bits == 32) || (Bits != 8 || Bits != 16 || Bits != 24 || Bits != 32));
 			}
 		}
 		list = g_list_next(list);
 	}
-	
+
 	fileconv_get_total_convert();
 	/*
 	g_print("\n");
@@ -4393,26 +1539,36 @@
 	g_print("\n");
 	*/
 }
-// 
-// 
+
+//
+//
 void fileconv_action (void)
 {
 	pthread_t nmr_tid;
- 	
-	WindScan_open ("Conversions files", WINDSCAN_PULSE);
+
+	// WindScan_open ("Conversions files", WINDSCAN_PULSE);
+	wind_scan_init(
+		WindMain,
+		"Conversions files",
+		WINDSCAN_PULSE
+		);
 	WindScan_set_label ("Conversions files ...");
-	
+
 	conv_reset_struct (WindScan_close_request);
-	// PREPARE LA LISTE POUR LES CONVERSIONS
+
 	fileconv_set_flags_before_conversion_file ();
-	conv.bool_thread_conv = TRUE;
- 	pthread_create (&nmr_tid, NULL ,(void *)fileconv_thread, (void *)NULL);
-	
-	// Le premier paramètre est le nombre de millisecondes entre les appels à notre fonction.
-	// Le deuxième est la fonction à appeler.
-	// Le troisième est la donnée passée à cette fonction de rappel.
+
+	VarFileConv.bool_thread_conv_one = TRUE;
+ 	VarFileConv.bool_thread_conv_two = FALSE;
+ 	VarFileConv.bool_thread_conv_three = FALSE;
+
+	pthread_mutex_init( &mutex , NULL ) ;
+
+	VarFileConv.bool_thread_conv_one = TRUE;
+ 	pthread_create (&nmr_tid, NULL ,(void *)fileconv_thread_one, (void *)NULL);
+
 	PRINT("DEBUT TIMEOUT FILECONV");
-	conv.handler_timeout_conv = gtk_timeout_add (300, fileconv_timeout, 0);
+	conv.handler_timeout_conv = g_timeout_add( 100, fileconv_timeout, 0 );
 }

xcfa-4.2.8.tar.gz/src/file_lc.c -> xcfa-5.0.2.tar.gz/src/file_lc.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : file_lc.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -58,33 +53,37 @@
 
 
 // 
+// Allocate Tab Args
 // 
-gint filelc_get_command_line_remove (void)
+gchar **filelc_AllocTabArgs( void )
 {
-	gint	pos = 0;
-	
-	for (pos = 0; conv.ArgConv [ pos ] != NULL; pos ++) {
-		g_free (conv.ArgConv [ pos ]);
-		conv.ArgConv [ pos ] = NULL;
-	}
-	return (0);
+	gchar	**PtrTab = (gchar **)g_malloc0( sizeof(gchar **) * 50 );
+
+	PtrTab [ 0 ] = g_strdup( "nice" );
+	PtrTab [ 1 ] = g_strdup( "-n" );
+	PtrTab [ 2 ] = g_strdup_printf( "%d", Config.Nice );
+
+	return( (gchar **)PtrTab );
 }
 // 
+// Remove Tab Args
 // 
-gint filelc_get_command_line_nice (void)
+gchar **filelc_RemoveTab( gchar **p_PtrTabArgs )
 {
-	gint	pos = filelc_get_command_line_remove ();
+	gint	i;
 	
-	conv.ArgConv [ pos++ ] = g_strdup ("nice");
-	conv.ArgConv [ pos++ ] = g_strdup ("-n");
-	conv.ArgConv [ pos++ ] = g_strdup_printf ("%d", Config.Nice);
+	for( i = 0; p_PtrTabArgs[ i ] != NULL; i ++ ) {
+		g_free( p_PtrTabArgs[ i ] );
+		p_PtrTabArgs[ i ] = NULL;
+	}
+	g_free( p_PtrTabArgs );
+	p_PtrTabArgs = NULL;
 	
-	// RETOURNE LA PROCHANE POSITION DE pos
-	return (3);
+	return( (gchar **)NULL );
 }
 // 
 // 
-gint filelc_analyse_line (gchar *entry, gint *pos, TAGS *tags)
+gint filelc_analyse_line( gchar **p_PtrTabArgs, gchar *entry, gint *pos, TAGS *tags )
 {
 	gchar **Larrbuf = NULL;
 	gchar *ptr = entry;
@@ -96,8 +95,7 @@
 	while (ptr && *ptr) {
 		if (*ptr == '\"') {
 			if (bool_open == TRUE) {
-				conv.ArgConv [ (*pos) ++ ] = g_strdup (gstr->str);
-				
+				p_PtrTabArgs[(*pos) ++ ] = g_strdup (gstr->str);
 				g_string_free (gstr, TRUE);
 				gstr = NULL;
 				ptr ++;
@@ -119,7 +117,7 @@
 
 		if (*ptr == ' ') {
 			if (gstr != NULL && *gstr->str) {
-				conv.ArgConv [ (*pos) ++ ] = g_strdup (gstr->str);
+				p_PtrTabArgs[(*pos) ++ ] = g_strdup (gstr->str);
 				
 				g_string_free (gstr, TRUE);
 				gstr = NULL;
@@ -142,7 +140,7 @@
 
 			/* OGGENC_WAV_TO_OGG | OGGENC_FLAC_TO_OGG */
 			if (*ptr == 'b' && (*(ptr+1) == ' ' || *(ptr+1) == '\0')) {
-				conv.ArgConv [ (*pos) ++ ] = g_strdup_printf ("%s", optionsOggenc_get_val_bitrate_oggenc ());
+				p_PtrTabArgs[(*pos) ++ ] = g_strdup_printf ("%s", optionsOggenc_get_val_bitrate_oggenc ());
 				
 				ptr ++;
 			}
@@ -150,7 +148,7 @@
 			else if (*ptr == 'b' && *(ptr+1) == 'l' && (*(ptr+2) == ' ' || *(ptr+2) == '\0')) {
 				Larrbuf = g_strsplit (optionsLame_get_str_val_bitrate_abr_vbr_lame (), " ", 0);
 				for (i=0; Larrbuf[i]; i++) {
-					conv.ArgConv [ (*pos) ++ ] = g_strdup (Larrbuf[i]);
+					p_PtrTabArgs[(*pos) ++ ] = g_strdup (Larrbuf[i]);
 					
 				}
 				g_strfreev(Larrbuf);
@@ -191,109 +189,121 @@
 		}
 	}
 	if (gstr != NULL && *gstr->str) {
-		conv.ArgConv [ (*pos) ++ ] = g_strdup (gstr->str);
+		p_PtrTabArgs[(*pos) ++ ] = g_strdup (gstr->str);
 		
 		g_string_free (gstr, TRUE);
 		gstr = NULL;
 	}
-	return (*pos);
+	return( *pos );
 }
-void filelc_analyse_command_line (PARAM_FILELC *param_filelc, gchar *entry)
+gchar **filelc_analyse_command_line( PARAM_FILELC *param_filelc, gchar *entry )
 {
 	gint	pos = 0;
+	gchar	**PtrTabArgs = NULL;
 	
 	if (param_filelc->type_conv == LAME_WAV_TO_MP3) {
 		
-		pos = filelc_get_command_line_nice ();
-		conv.ArgConv [ pos++ ] = g_strdup ("lame");
-		pos = filelc_analyse_line (entry, &pos, param_filelc->tags);
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filesrc);
-		conv.ArgConv [ pos++ ] = g_strdup ("-o");
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filedest);
-		conv.ArgConv [ pos++ ] = NULL;
+		PtrTabArgs = filelc_AllocTabArgs();
+		pos = 3; 
+		PtrTabArgs[ pos++ ] = g_strdup ("lame");
+		pos = filelc_analyse_line( PtrTabArgs, entry, &pos, param_filelc->tags );
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filesrc);
+		PtrTabArgs[ pos++ ] = g_strdup ("-o");
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filedest);
+		PtrTabArgs[ pos++ ] = NULL;
 	}
 	else if (param_filelc->type_conv == OGGENC_WAV_TO_OGG || param_filelc->type_conv == OGGENC_FLAC_TO_OGG) {
 		
-		pos = filelc_get_command_line_nice ();
-		conv.ArgConv [ pos++ ] = g_strdup ("oggenc");
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filesrc);
-		pos = filelc_analyse_line (entry, &pos, param_filelc->tags);
-		conv.ArgConv [ pos++ ] = g_strdup ("-o");
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filedest);
-		conv.ArgConv [ pos++ ] = NULL;
+		PtrTabArgs = filelc_AllocTabArgs();
+		pos = 3;
+		PtrTabArgs[ pos++ ] = g_strdup ("oggenc");
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filesrc);
+		pos = filelc_analyse_line (PtrTabArgs, entry, &pos, param_filelc->tags);
+		PtrTabArgs[ pos++ ] = g_strdup ("-o");
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filedest);
+		PtrTabArgs[ pos++ ] = NULL;
 	}
 	else if (param_filelc->type_conv == FLAC_WAV_TO_FLAC) {
 		
-		pos = filelc_get_command_line_nice ();
-		conv.ArgConv [ pos++ ] = g_strdup ("flac");
-		pos = filelc_analyse_line (entry, &pos, param_filelc->tags);
-		conv.ArgConv [ pos++ ] = g_strdup ("-f");
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filesrc);
-		conv.ArgConv [ pos++ ] = g_strdup ("-o");
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filedest);
-		conv.ArgConv [ pos++ ] = NULL;
+		PtrTabArgs = filelc_AllocTabArgs();
+		pos = 3;
+		PtrTabArgs[ pos++ ] = g_strdup ("flac");
+		pos = filelc_analyse_line (PtrTabArgs, entry, &pos, param_filelc->tags);
+		PtrTabArgs[ pos++ ] = g_strdup ("-f");
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filesrc);
+		PtrTabArgs[ pos++ ] = g_strdup ("-o");
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filedest);
+		PtrTabArgs[ pos++ ] = NULL;
 	}
 	else if (param_filelc->type_conv == FAAC_WAV_TO_M4A) {
 		
-		pos = filelc_get_command_line_nice ();
-		conv.ArgConv [ pos++ ] = g_strdup ("faac");
-		pos = filelc_analyse_line (entry, &pos, param_filelc->tags);
-		conv.ArgConv [ pos++ ] = g_strdup ("-o");
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filedest);
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filesrc);
-		conv.ArgConv [ pos++ ] = NULL;
+		PtrTabArgs = filelc_AllocTabArgs();
+		pos = 3;
+		PtrTabArgs[ pos++ ] = g_strdup ("faac");
+		pos = filelc_analyse_line (PtrTabArgs, entry, &pos, param_filelc->tags);
+		PtrTabArgs[ pos++ ] = g_strdup ("-o");
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filedest);
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filesrc);
+		PtrTabArgs[ pos++ ] = NULL;
 	}
 	else if (param_filelc->type_conv == MPPENC_WAV_TO_MPC) {
 		
-		pos = filelc_get_command_line_nice ();
-		conv.ArgConv [ pos++ ] = g_strdup (prginit_get_name (NMR_musepack_tools_mppenc));
-		pos = filelc_analyse_line (entry, &pos, param_filelc->tags);
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filesrc);
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filedest);
-		conv.ArgConv [ pos++ ] = NULL;
+		PtrTabArgs = filelc_AllocTabArgs();
+		pos = 3;
+		PtrTabArgs[ pos++ ] = g_strdup (prginit_get_name (NMR_musepack_tools_mppenc));
+		pos = filelc_analyse_line (PtrTabArgs, entry, &pos, param_filelc->tags);
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filesrc);
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filedest);
+		PtrTabArgs[ pos++ ] = NULL;
 	}
 	else if (param_filelc->type_conv == MAC_WAV_TO_APE || param_filelc->type_conv == MAC_APE_TO_WAV) {
 		
-		pos = filelc_get_command_line_nice ();
-		conv.ArgConv [ pos++ ] = g_strdup (prginit_get_name (NMR_mac));
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filesrc);
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filedest);
-		conv.ArgConv [ pos++ ] = NULL;
+		PtrTabArgs = filelc_AllocTabArgs();
+		pos = 3;
+		PtrTabArgs[ pos++ ] = g_strdup (prginit_get_name (NMR_mac));
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filesrc);
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filedest);
+		PtrTabArgs[ pos++ ] = NULL;
 	}
 	else if (param_filelc->type_conv == WAVPACK_WAV_TO_WAVPACK) {
 		
-		pos = filelc_get_command_line_nice ();
-		conv.ArgConv [ pos++ ] = g_strdup ("wavpack");
-		pos = filelc_analyse_line (entry, &pos, param_filelc->tags);
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filesrc);
-		conv.ArgConv [ pos++ ] = g_strdup ("-o");
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filedest);
-		conv.ArgConv [ pos++ ] = NULL;
+		PtrTabArgs = filelc_AllocTabArgs();
+		pos = 3;
+		PtrTabArgs[ pos++ ] = g_strdup ("wavpack");
+		pos = filelc_analyse_line (PtrTabArgs, entry, &pos, param_filelc->tags);
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filesrc);
+		PtrTabArgs[ pos++ ] = g_strdup ("-o");
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filedest);
+		PtrTabArgs[ pos++ ] = NULL;
 	}
 	else if (param_filelc->type_conv == CDPARANOIA_CD_TO_WAV) {
 		
-		pos = filelc_get_command_line_nice ();
-		conv.ArgConv [ pos++ ] = g_strdup ("cdparanoia");
-		conv.ArgConv [ pos++ ] = g_strdup ("-e");
-		conv.ArgConv [ pos++ ] = g_strdup ("-d");
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->cdrom);
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->num_track);
-		pos = filelc_analyse_line (entry, &pos, param_filelc->tags);
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filedest);
-		conv.ArgConv [ pos++ ] = NULL;
+		PtrTabArgs = filelc_AllocTabArgs();
+		pos = 3;
+		PtrTabArgs[ pos++ ] = g_strdup ("cdparanoia");	
+		PtrTabArgs[ pos++ ] = g_strdup ("-e");
+		PtrTabArgs[ pos++ ] = g_strdup ("-d");
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->cdrom);
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->num_track);
+		pos = filelc_analyse_line (PtrTabArgs, entry, &pos, param_filelc->tags);
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filedest);
+		PtrTabArgs[ pos++ ] = NULL;
 	}
 	else if (param_filelc->type_conv == CDDA2WAV_CD_TO_WAV) {
 		
-		pos = filelc_get_command_line_nice ();
-		conv.ArgConv [ pos++ ] = g_strdup ("cdda2wav");
-		conv.ArgConv [ pos++ ] = g_strdup ("-D");
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->cdrom);
-		conv.ArgConv [ pos++ ] = g_strdup ("-O");
-		conv.ArgConv [ pos++ ] = g_strdup ("wav");
-		conv.ArgConv [ pos++ ] = g_strdup ("-t");
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->num_track);
-		conv.ArgConv [ pos++ ] = NULL;
+		PtrTabArgs = filelc_AllocTabArgs();
+		pos = 3;
+		PtrTabArgs[ pos++ ] = g_strdup ("cdda2wav");
+		PtrTabArgs[ pos++ ] = g_strdup ("-D");
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->cdrom);
+		PtrTabArgs[ pos++ ] = g_strdup ("-O");
+		PtrTabArgs[ pos++ ] = g_strdup ("wav");
+		PtrTabArgs[ pos++ ] = g_strdup ("-t");
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->num_track);
+		PtrTabArgs[ pos++ ] = NULL;
 	}
+	
+	return( (gchar **)PtrTabArgs );
 }
 // 
 // 
@@ -325,35 +335,39 @@
 }
 // 
 // 
-void filelc_get_command_line (PARAM_FILELC *param_filelc)
+gchar **filelc_get_command_line( PARAM_FILELC *param_filelc )
 {
 	gint	pos = 0;
 	gchar	*entry = NULL;
+	gchar	**PtrTabArgs = NULL;
 	
 	// OPTIONS LIGNE DE SAISIE UTILISATEUR
 	if (TRUE == param_filelc->With_CommandLineUser &&
 	 TRUE == filelc_bool_add_line_command (param_filelc->type_conv, &entry)) {
 		
-		filelc_analyse_command_line (param_filelc, entry);
-		return;
+		PtrTabArgs = filelc_analyse_command_line( param_filelc, entry );
+		return( (gchar **)PtrTabArgs );
 	}
+	
 	param_filelc->With_CommandLineUser = FALSE;
 	
+	PtrTabArgs = filelc_AllocTabArgs();
+	
 	if (param_filelc->type_conv == LAME_WAV_TO_MP3) {
 		
 		gchar	**Larrbuf = NULL;
 		gint	 i;
 		
-		pos = filelc_get_command_line_nice ();
-		conv.ArgConv [ pos++ ] = g_strdup ("lame");
-		conv.ArgConv [ pos++ ] = g_strdup ("-h");
-		conv.ArgConv [ pos++ ] = g_strdup ("--nohist");
-		conv.ArgConv [ pos++ ] = g_strdup ("--noreplaygain");
+		pos = 3;
+		PtrTabArgs [ pos++ ] = g_strdup ("lame");
+		PtrTabArgs [ pos++ ] = g_strdup ("-h");
+		PtrTabArgs [ pos++ ] = g_strdup ("--nohist");
+		PtrTabArgs [ pos++ ] = g_strdup ("--noreplaygain");
 		
 		if (param_filelc->PtrStrBitrate != NULL) {
 			Larrbuf = g_strsplit (param_filelc->PtrStrBitrate, " ", 0);
 			for (i=0; Larrbuf[i]; i++) {
-				conv.ArgConv [ pos++ ] = g_strdup (Larrbuf[i]);
+				PtrTabArgs [ pos++ ] = g_strdup (Larrbuf[i]);
 			}
 			g_strfreev(Larrbuf);
 			g_free (param_filelc->PtrStrBitrate);
@@ -363,31 +377,55 @@
 		
 		if (Config.BoolArtistTag || Config.BoolTitleTag || Config.BoolAlbumTag ||
 		 Config.BoolNumerateTag || Config.BoolGenreTag || Config.BoolYearTag || Config.BoolCommentTag) {
-			conv.ArgConv [ pos++ ] = g_strdup ("--add-id3v2");
+			PtrTabArgs [ pos++ ] = g_strdup ("--add-id3v2");
 		}
 		
 		if (Config.BoolArtistTag && param_filelc->tags && param_filelc->tags->Artist && *param_filelc->tags->Artist) {
-			conv.ArgConv [ pos++ ] = g_strdup ("--ta");
-			conv.ArgConv [ pos++ ] = g_strdup (param_filelc->tags->Artist);
+			PtrTabArgs [ pos++ ] = g_strdup ("--ta");
+			PtrTabArgs [ pos++ ] = g_strdup (param_filelc->tags->Artist);
 		}
 		
 		if (Config.BoolTitleTag && param_filelc->tags && param_filelc->tags->Title && *param_filelc->tags->Title) {
-			conv.ArgConv [ pos++ ] = g_strdup ("--tt");
-			conv.ArgConv [ pos++ ] = g_strdup (param_filelc->tags->Title);
+			PtrTabArgs [ pos++ ] = g_strdup ("--tt");
+			PtrTabArgs [ pos++ ] = g_strdup (param_filelc->tags->Title);
 		}
 		
 		if (Config.BoolAlbumTag && param_filelc->tags && param_filelc->tags->Album && *param_filelc->tags->Album) {
-			conv.ArgConv [ pos++ ] = g_strdup ("--tl");
-			conv.ArgConv [ pos++ ] = g_strdup (param_filelc->tags->Album);
+			PtrTabArgs [ pos++ ] = g_strdup ("--tl");
+			PtrTabArgs [ pos++ ] = g_strdup (param_filelc->tags->Album);
 		}
 		
 		if (Config.BoolNumerateTag && param_filelc->tags && param_filelc->tags->Number && *param_filelc->tags->Number) {
-			conv.ArgConv [ pos++ ] = g_strdup ("--tn");
-			conv.ArgConv [ pos++ ] = g_strdup (param_filelc->tags->Number);
+			PtrTabArgs [ pos++ ] = g_strdup ("--tn");
+			PtrTabArgs [ pos++ ] = g_strdup (param_filelc->tags->Number);
 		}
 		
 		if (Config.BoolGenreTag && param_filelc->tags && param_filelc->tags->Genre && *param_filelc->tags->Genre) {
 			
+
+/**
+NAME
+ lame - create mp3 audio files
+
+SYNOPSIS
+ lame [options] <infile> <outfile>
+
+DESCRIPTION
+ LAME is a program which can be used to create compressed audio files.
+ (Lame ain't an MP3 encoder).
+ These audio files can be played back by popular MP3 players such as mpg123 or madplay.
+ To read from stdin, use "-" for <infile>.
+ To write to stdout, use "-" for <outfile>.
+
+OPTIONS
+ ID3 tag options:
+
+ Input options:
+ --tg genre
+ audio/song genre (name or number in list)
+
+*/
+			/**
 			gint value = 147;
 			
 			if (param_filelc->tags->bool_tag_cd == FALSE) {
@@ -396,40 +434,45 @@
 				value = param_filelc->tags->IntGenre;
 			}
 			if (value < 0 || value > 147) value = 147;
-			/*New = g_list_append (New, g_strdup ("--tg"));
-			New = g_list_append (New, g_strdup_printf ("%d", value));*/
-			conv.ArgConv [ pos++ ] = g_strdup ("--tg");
-			conv.ArgConv [ pos++ ] = g_strdup_printf ("%d", value);
+			// New = g_list_append (New, g_strdup ("--tg"));
+			// New = g_list_append (New, g_strdup_printf ("%d", value));
+			PtrTabArgs [ pos++ ] = g_strdup ("--tg");
+			PtrTabArgs [ pos++ ] = g_strdup_printf ("%d", value);
+			*/
+			PtrTabArgs [ pos++ ] = g_strdup ("--tg");
+			PtrTabArgs [ pos++ ] = g_strdup_printf ("%s", param_filelc->tags->Genre);
+			
+			
 		}
 		
 		if (Config.BoolYearTag && param_filelc->tags && param_filelc->tags->Year && *param_filelc->tags->Year) {
-			conv.ArgConv [ pos++ ] = g_strdup ("--ty");
-			conv.ArgConv [ pos++ ] = g_strdup (param_filelc->tags->Year);
+			PtrTabArgs [ pos++ ] = g_strdup ("--ty");
+			PtrTabArgs [ pos++ ] = g_strdup (param_filelc->tags->Year);
 		}
 		
 		if (Config.BoolCommentTag && param_filelc->tags && param_filelc->tags->Comment && *param_filelc->tags->Comment) {
-			conv.ArgConv [ pos++ ] = g_strdup ("--tc");
-			conv.ArgConv [ pos++ ] = g_strdup (param_filelc->tags->Comment);
+			PtrTabArgs [ pos++ ] = g_strdup ("--tc");
+			PtrTabArgs [ pos++ ] = g_strdup (param_filelc->tags->Comment);
 		}
 		
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filesrc);
-		conv.ArgConv [ pos++ ] = g_strdup ("-o");
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filedest);
-		conv.ArgConv [ pos++ ] = NULL;
+		PtrTabArgs [ pos++ ] = g_strdup (param_filelc->filesrc);
+		PtrTabArgs [ pos++ ] = g_strdup ("-o");
+		PtrTabArgs [ pos++ ] = g_strdup (param_filelc->filedest);
+		PtrTabArgs [ pos++ ] = NULL;
 	}
 	else if (param_filelc->type_conv == OGGENC_WAV_TO_OGG || param_filelc->type_conv == OGGENC_FLAC_TO_OGG) {
 
 		gchar	**Larrbuf = NULL;
 		gint	 i;
 		
-		pos = filelc_get_command_line_nice ();
-		conv.ArgConv [ pos++ ] = g_strdup ("oggenc");
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filesrc);
+		pos = 3;
+		PtrTabArgs[ pos++ ] = g_strdup ("oggenc");
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filesrc);
 		
 		if (param_filelc->PtrStrBitrate != NULL) {
 			Larrbuf = g_strsplit (param_filelc->PtrStrBitrate, " ", 0);
 			for (i=0; Larrbuf[i]; i++) {
-				conv.ArgConv [ pos++ ] = g_strdup (Larrbuf[i]);
+				PtrTabArgs[ pos++ ] = g_strdup (Larrbuf[i]);
 			}
 			g_strfreev(Larrbuf);
 			g_free (param_filelc->PtrStrBitrate);
@@ -437,300 +480,301 @@
 		}
 
 		if (Config.BoolArtistTag && param_filelc->tags && param_filelc->tags->Artist && *param_filelc->tags->Artist) {
-			conv.ArgConv [ pos++ ] = g_strdup ("-a");
-			conv.ArgConv [ pos++ ] = g_strdup (param_filelc->tags->Artist);
+			PtrTabArgs[ pos++ ] = g_strdup ("-a");
+			PtrTabArgs[ pos++ ] = g_strdup ("-a");
 		}
 		if (Config.BoolTitleTag && param_filelc->tags && param_filelc->tags->Title && *param_filelc->tags->Title) {
-			conv.ArgConv [ pos++ ] = g_strdup ("-t");
-			conv.ArgConv [ pos++ ] = g_strdup (param_filelc->tags->Title);
+			PtrTabArgs[ pos++ ] = g_strdup ("-t");
+			PtrTabArgs[ pos++ ] = g_strdup (param_filelc->tags->Title);
 		}
 		if (Config.BoolAlbumTag && param_filelc->tags && param_filelc->tags->Album && *param_filelc->tags->Album) {
-			conv.ArgConv [ pos++ ] = g_strdup ("-l");
-			conv.ArgConv [ pos++ ] = g_strdup (param_filelc->tags->Album);
+			PtrTabArgs[ pos++ ] = g_strdup ("-l");
+			PtrTabArgs[ pos++ ] = g_strdup (param_filelc->tags->Album);
 		}
 		if (Config.BoolNumerateTag && param_filelc->tags && param_filelc->tags->Number && *param_filelc->tags->Number) {
-			conv.ArgConv [ pos++ ] = g_strdup ("-N");
-			conv.ArgConv [ pos++ ] = g_strdup (param_filelc->tags->Number);
+			PtrTabArgs[ pos++ ] = g_strdup ("-N");
+			PtrTabArgs[ pos++ ] = g_strdup (param_filelc->tags->Number);
 		}
 		if (Config.BoolGenreTag && param_filelc->tags && param_filelc->tags->Genre && *param_filelc->tags->Genre) {
-			conv.ArgConv [ pos++ ] = g_strdup ("-G");
-			conv.ArgConv [ pos++ ] = g_strdup (param_filelc->tags->Genre);
+			PtrTabArgs[ pos++ ] = g_strdup ("-G");
+			PtrTabArgs[ pos++ ] = g_strdup (param_filelc->tags->Genre);
 		}
 		if (Config.BoolYearTag && param_filelc->tags && param_filelc->tags->Year && *param_filelc->tags->Year) {
-			conv.ArgConv [ pos++ ] = g_strdup ("--date");
-			conv.ArgConv [ pos++ ] = g_strdup (param_filelc->tags->Year);
+			PtrTabArgs[ pos++ ] = g_strdup ("--date");
+			PtrTabArgs[ pos++ ] = g_strdup (param_filelc->tags->Year);
 		}
 		if (Config.BoolCommentTag && param_filelc->tags && param_filelc->tags->Comment && *param_filelc->tags->Comment) {
-			conv.ArgConv [ pos++ ] = g_strdup ("-c");
-			conv.ArgConv [ pos++ ] = g_strdup (param_filelc->tags->Comment);
+			PtrTabArgs[ pos++ ] = g_strdup ("-c");
+			PtrTabArgs[ pos++ ] = g_strdup (param_filelc->tags->Comment);
 		}
 
-		conv.ArgConv [ pos++ ] = g_strdup ("-o");
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filedest);
-		conv.ArgConv [ pos++ ] = NULL;
+		PtrTabArgs[ pos++ ] = g_strdup ("-o");
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filedest);
+		PtrTabArgs[ pos++ ] = NULL;
 	}
 	else if (param_filelc->type_conv == FLAC_WAV_TO_FLAC || param_filelc->type_conv == FLAC_FLAC_TO_WAV) {
 		
-		pos = filelc_get_command_line_nice ();
-		conv.ArgConv [ pos++ ] = g_strdup ("flac");
-		conv.ArgConv [ pos++ ] = g_strdup_printf ("%s", optionsFlac_get_compression_level_flac ());
+		pos = 3;
+		PtrTabArgs[ pos++ ] = g_strdup ("flac");
+		PtrTabArgs[ pos++ ] = g_strdup_printf ("%s", optionsFlac_get_compression_level_flac ());
 		
 		if (Config.BoolArtistTag && param_filelc->tags && param_filelc->tags->Artist && *param_filelc->tags->Artist) {
-			conv.ArgConv [ pos++ ] = g_strdup ("-T");
-			conv.ArgConv [ pos++ ] = g_strdup_printf ("artist=%s",param_filelc->tags->Artist);
+			PtrTabArgs[ pos++ ] = g_strdup ("-T");
+			PtrTabArgs[ pos++ ] = g_strdup_printf ("artist=%s",param_filelc->tags->Artist);
 		}
 		if (Config.BoolTitleTag && param_filelc->tags && param_filelc->tags->Title && *param_filelc->tags->Title) {
-			conv.ArgConv [ pos++ ] = g_strdup ("-T");
-			conv.ArgConv [ pos++ ] = g_strdup_printf ("title=%s", param_filelc->tags->Title);
+			PtrTabArgs[ pos++ ] = g_strdup ("-T");
+			PtrTabArgs[ pos++ ] = g_strdup_printf ("title=%s", param_filelc->tags->Title);
 		}
 		if (Config.BoolAlbumTag && param_filelc->tags && param_filelc->tags->Album && *param_filelc->tags->Album) {
-			conv.ArgConv [ pos++ ] = g_strdup ("-T");
-			conv.ArgConv [ pos++ ] = g_strdup_printf ("album=%s", param_filelc->tags->Album);
+			PtrTabArgs[ pos++ ] = g_strdup ("-T");
+			PtrTabArgs[ pos++ ] = g_strdup_printf ("album=%s", param_filelc->tags->Album);
 		}
 		if (Config.BoolNumerateTag && param_filelc->tags && param_filelc->tags->IntNumber > -1) {
-			conv.ArgConv [ pos++ ] = g_strdup ("-T");
-			conv.ArgConv [ pos++ ] = g_strdup_printf ("tracknumber=%d", param_filelc->tags->IntNumber);
+			PtrTabArgs[ pos++ ] = g_strdup ("-T");
+			PtrTabArgs[ pos++ ] = g_strdup_printf ("tracknumber=%d", param_filelc->tags->IntNumber);
 		}
 		if (Config.BoolGenreTag && param_filelc->tags && param_filelc->tags->Genre && *param_filelc->tags->Genre) {
-			conv.ArgConv [ pos++ ] = g_strdup ("-T");
-			conv.ArgConv [ pos++ ] = g_strdup_printf ("genre=%s", param_filelc->tags->Genre);
+			PtrTabArgs[ pos++ ] = g_strdup ("-T");
+			PtrTabArgs[ pos++ ] = g_strdup_printf ("genre=%s", param_filelc->tags->Genre);
 		}
 		if (Config.BoolYearTag && param_filelc->tags && param_filelc->tags->Year && *param_filelc->tags->Year) {
-			conv.ArgConv [ pos++ ] = g_strdup ("-T");
-			conv.ArgConv [ pos++ ] = g_strdup_printf ("date=%s", param_filelc->tags->Year);
+			PtrTabArgs[ pos++ ] = g_strdup ("-T");
+			PtrTabArgs[ pos++ ] = g_strdup_printf ("date=%s", param_filelc->tags->Year);
 		}
 		if (Config.BoolCommentTag && param_filelc->tags && param_filelc->tags->Comment && *param_filelc->tags->Comment) {
-			conv.ArgConv [ pos++ ] = g_strdup ("-T");
-			conv.ArgConv [ pos++ ] = g_strdup_printf ("Description=%s",param_filelc->tags->Comment);
+			PtrTabArgs[ pos++ ] = g_strdup ("-T");
+			PtrTabArgs[ pos++ ] = g_strdup_printf ("Description=%s",param_filelc->tags->Comment);
 		}
 		
-		if (param_filelc->type_conv == FLAC_FLAC_TO_WAV) conv.ArgConv [ pos++ ] = g_strdup ("-d");
+		if (param_filelc->type_conv == FLAC_FLAC_TO_WAV) PtrTabArgs [ pos++ ] = g_strdup ("-d");
 		
-		conv.ArgConv [ pos++ ] = g_strdup ("-f");
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filesrc);
-		conv.ArgConv [ pos++ ] = g_strdup ("-o");
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filedest);
-		conv.ArgConv [ pos++ ] = NULL;
+		PtrTabArgs[ pos++ ] = g_strdup ("-f");
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filesrc);
+		PtrTabArgs[ pos++ ] = g_strdup ("-o");
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filedest);
+		PtrTabArgs[ pos++ ] = NULL;
 	}
 	else if (param_filelc->type_conv == FAAC_WAV_TO_M4A) {
 
 		gchar *Ptr = NULL;
 		
-		pos = filelc_get_command_line_nice ();
-		conv.ArgConv [ pos++ ] = g_strdup ("faac");
+		pos = 3;
+		PtrTabArgs [ pos++ ] = g_strdup ("faac");
 		
 		// filelc_analyse_line (entry, New, param_filelc->tags);
 		// -----------------------------------------------------
 		
 		if ('-' == *OptionsFaac_get_faac_conteneur ()) {
-			conv.ArgConv [ pos++ ] = g_strdup (OptionsFaac_get_faac_conteneur ());
+			PtrTabArgs [ pos++ ] = g_strdup (OptionsFaac_get_faac_conteneur ());
 		}
 		
 		Ptr = OptionsFaac_get_faac_set_choice_vbr_abr ();
 		if ( *(Ptr + 1) == 'b') {
-			conv.ArgConv [ pos++ ] = g_strdup ("-b");
+			PtrTabArgs [ pos++ ] = g_strdup ("-b");
 		}
 		else {
-			conv.ArgConv [ pos++ ] = g_strdup ("-q");
+			PtrTabArgs [ pos++ ] = g_strdup ("-q");
 		}
-		conv.ArgConv [ pos++ ] = g_strdup_printf ("%s", (Ptr +3));
+		PtrTabArgs [ pos++ ] = g_strdup_printf ("%s", (Ptr +3));
 		
 		
 		if (Config.BoolArtistTag && param_filelc->tags && param_filelc->tags->Artist && *param_filelc->tags->Artist) {
-			conv.ArgConv [ pos++ ] = g_strdup ("--artist");
-			conv.ArgConv [ pos++ ] = g_strdup (param_filelc->tags->Artist);
+			PtrTabArgs [ pos++ ] = g_strdup ("--artist");
+			PtrTabArgs [ pos++ ] = g_strdup (param_filelc->tags->Artist);
 		}
 		if (Config.BoolTitleTag && param_filelc->tags && param_filelc->tags->Title && *param_filelc->tags->Title) {
-			conv.ArgConv [ pos++ ] = g_strdup ("--title");
-			conv.ArgConv [ pos++ ] = g_strdup (param_filelc->tags->Title);
+			PtrTabArgs [ pos++ ] = g_strdup ("--title");
+			PtrTabArgs [ pos++ ] = g_strdup (param_filelc->tags->Title);
 		}
 		if (Config.BoolAlbumTag && param_filelc->tags && param_filelc->tags->Album && *param_filelc->tags->Album) {
-			conv.ArgConv [ pos++ ] = g_strdup ("--album");
-			conv.ArgConv [ pos++ ] = g_strdup (param_filelc->tags->Album);
+			PtrTabArgs [ pos++ ] = g_strdup ("--album");
+			PtrTabArgs [ pos++ ] = g_strdup (param_filelc->tags->Album);
 		}
 		if (Config.BoolGenreTag && param_filelc->tags && param_filelc->tags->Genre && *param_filelc->tags->Genre) {
-			conv.ArgConv [ pos++ ] = g_strdup ("--genre");
-			conv.ArgConv [ pos++ ] = g_strdup (param_filelc->tags->Genre);
+			PtrTabArgs [ pos++ ] = g_strdup ("--genre");
+			PtrTabArgs [ pos++ ] = g_strdup (param_filelc->tags->Genre);
 		}
 		if (Config.BoolYearTag && param_filelc->tags && param_filelc->tags->Year && *param_filelc->tags->Year) {
-			conv.ArgConv [ pos++ ] = g_strdup ("--year");
-			conv.ArgConv [ pos++ ] = g_strdup (param_filelc->tags->Year);
+			PtrTabArgs [ pos++ ] = g_strdup ("--year");
+			PtrTabArgs [ pos++ ] = g_strdup (param_filelc->tags->Year);
 		}
 		if (Config.BoolNumerateTag && param_filelc->tags && param_filelc->tags->IntNumber > -1) {
-			conv.ArgConv [ pos++ ] = g_strdup ("--track");
-			conv.ArgConv [ pos++ ] = g_strdup_printf ("%d", param_filelc->tags->IntNumber);
+			PtrTabArgs [ pos++ ] = g_strdup ("--track");
+			PtrTabArgs [ pos++ ] = g_strdup_printf ("%d", param_filelc->tags->IntNumber);
 		}
 		if (Config.BoolCommentTag && param_filelc->tags && param_filelc->tags->Comment && *param_filelc->tags->Comment) {
-			conv.ArgConv [ pos++ ] = g_strdup ("--comment");
-			conv.ArgConv [ pos++ ] = g_strdup (param_filelc->tags->Comment);
+			PtrTabArgs [ pos++ ] = g_strdup ("--comment");
+			PtrTabArgs [ pos++ ] = g_strdup (param_filelc->tags->Comment);
 		}
 
 		// -----------------
 		
-		conv.ArgConv [ pos++ ] = g_strdup ("-o");
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filedest);
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filesrc);
-		conv.ArgConv [ pos++ ] = NULL;
+		PtrTabArgs [ pos++ ] = g_strdup ("-o");
+		PtrTabArgs [ pos++ ] = g_strdup (param_filelc->filedest);
+		PtrTabArgs [ pos++ ] = g_strdup (param_filelc->filesrc);
+		PtrTabArgs [ pos++ ] = NULL;
 	}
 	else if (param_filelc->type_conv == MPPENC_WAV_TO_MPC) {
 		
-		pos = filelc_get_command_line_nice ();
-		conv.ArgConv [ pos++ ] = g_strdup (prginit_get_name (NMR_musepack_tools_mppenc));
-		conv.ArgConv [ pos++ ] = g_strdup ("--verbose");
-		conv.ArgConv [ pos++ ] = g_strdup ("--overwrite");
-		conv.ArgConv [ pos++ ] = g_strdup (optionsMusepack_get_quality_mppenc ());
+		pos = 3;
+		PtrTabArgs[ pos++ ] = g_strdup (prginit_get_name (NMR_musepack_tools_mppenc));
+		PtrTabArgs[ pos++ ] = g_strdup ("--verbose");
+		PtrTabArgs[ pos++ ] = g_strdup ("--overwrite");
+		PtrTabArgs[ pos++ ] = g_strdup (optionsMusepack_get_quality_mppenc ());
 
 		if (Config.BoolArtistTag && param_filelc->tags && param_filelc->tags->Artist && *param_filelc->tags->Artist) {
-			conv.ArgConv [ pos++ ] = g_strdup ("--artist");
-			conv.ArgConv [ pos++ ] = g_strdup (param_filelc->tags->Artist);
+			PtrTabArgs[ pos++ ] = g_strdup ("--artist");
+			PtrTabArgs[ pos++ ] = g_strdup (param_filelc->tags->Artist);
 		}
 		if (Config.BoolTitleTag && param_filelc->tags && param_filelc->tags->Title && *param_filelc->tags->Title) {
-			conv.ArgConv [ pos++ ] = g_strdup ("--title");
-			conv.ArgConv [ pos++ ] = g_strdup (param_filelc->tags->Title);
+			PtrTabArgs[ pos++ ] = g_strdup ("--title");
+			PtrTabArgs[ pos++ ] = g_strdup (param_filelc->tags->Title);
 		}
 		if (Config.BoolAlbumTag && param_filelc->tags && param_filelc->tags->Album && *param_filelc->tags->Album) {
-			conv.ArgConv [ pos++ ] = g_strdup ("--album");
-			conv.ArgConv [ pos++ ] = g_strdup (param_filelc->tags->Album);
+			PtrTabArgs[ pos++ ] = g_strdup ("--album");
+			PtrTabArgs[ pos++ ] = g_strdup (param_filelc->tags->Album);
 		}
 		if (Config.BoolGenreTag && param_filelc->tags && param_filelc->tags->Genre && *param_filelc->tags->Genre) {
-			conv.ArgConv [ pos++ ] = g_strdup ("--genre");
-			conv.ArgConv [ pos++ ] = g_strdup (param_filelc->tags->Genre);
+			PtrTabArgs[ pos++ ] = g_strdup ("--genre");
+			PtrTabArgs[ pos++ ] = g_strdup (param_filelc->tags->Genre);
 		}
 		if (Config.BoolYearTag && param_filelc->tags && param_filelc->tags->Year && *param_filelc->tags->Year) {
-			conv.ArgConv [ pos++ ] = g_strdup ("--year");
-			conv.ArgConv [ pos++ ] = g_strdup (param_filelc->tags->Year);
+			PtrTabArgs[ pos++ ] = g_strdup ("--year");
+			PtrTabArgs[ pos++ ] = g_strdup (param_filelc->tags->Year);
 		}
 		if (Config.BoolNumerateTag && param_filelc->tags && param_filelc->tags->Number && *param_filelc->tags->Number) {
-			conv.ArgConv [ pos++ ] = g_strdup ("--track");
-			conv.ArgConv [ pos++ ] = g_strdup (param_filelc->tags->Number);
+			PtrTabArgs[ pos++ ] = g_strdup ("--track");
+			PtrTabArgs[ pos++ ] = g_strdup (param_filelc->tags->Number);
 		}
 		if (Config.BoolCommentTag && param_filelc->tags && param_filelc->tags->Comment && *param_filelc->tags->Comment) {
-			conv.ArgConv [ pos++ ] = g_strdup ("--comment");
-			conv.ArgConv [ pos++ ] = g_strdup (param_filelc->tags->Comment);
+			PtrTabArgs[ pos++ ] = g_strdup ("--comment");
+			PtrTabArgs[ pos++ ] = g_strdup (param_filelc->tags->Comment);
 		}
 		
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filesrc);
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filedest);
-		conv.ArgConv [ pos++ ] = NULL;
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filesrc);
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filedest);
+		PtrTabArgs[ pos++ ] = NULL;
 	}
 	else if (param_filelc->type_conv == MAC_WAV_TO_APE || param_filelc->type_conv == MAC_APE_TO_WAV) {
 		
-		pos = filelc_get_command_line_nice ();
-		conv.ArgConv [ pos++ ] = g_strdup (prginit_get_name (NMR_mac));
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filesrc);
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filedest);
+		pos = 3;
+		PtrTabArgs[ pos++ ] = g_strdup (prginit_get_name (NMR_mac));	
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filesrc);
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filedest);
 		
 		if (param_filelc->type_conv == MAC_APE_TO_WAV) {
-			conv.ArgConv [ pos++ ] = g_strdup ("-d");
+			PtrTabArgs[ pos++ ] = g_strdup ("-d");
 		}
 		else if (param_filelc->type_conv == MAC_WAV_TO_APE) {
-			conv.ArgConv [ pos++ ] = g_strdup (optionsApe_get_compression_level_ape ());
+			PtrTabArgs[ pos++ ] = g_strdup (optionsApe_get_compression_level_ape ());
 		}
-		conv.ArgConv [ pos++ ] = NULL;
+		PtrTabArgs[ pos++ ] = NULL;
 	}
 	else if (param_filelc->type_conv == WAVPACK_WAV_TO_WAVPACK) {
 		
-		pos = filelc_get_command_line_nice ();
-		conv.ArgConv [ pos++ ] = g_strdup ("wavpack");
-		conv.ArgConv [ pos++ ] = g_strdup ("-y");
-		
+		pos = 3;
+		PtrTabArgs[ pos++ ] = g_strdup ("wavpack");
+		PtrTabArgs[ pos++ ] = g_strdup ("-y");
+				
 		if (*optionsWavpack_get_wavpack_compression () != '\0')
-			conv.ArgConv [ pos++ ] = g_strdup (optionsWavpack_get_wavpack_compression ());
-		conv.ArgConv [ pos++ ] = g_strdup (optionsWavpack_get_wavpack_sound ());
+			PtrTabArgs[ pos++ ] = g_strdup (optionsWavpack_get_wavpack_compression ());
+		PtrTabArgs[ pos++ ] = g_strdup (optionsWavpack_get_wavpack_sound ());
 		
 		if (*optionsWavpac_get_wavpack_hybride () != '\0') {
-			conv.ArgConv [ pos++ ] = g_strdup (optionsWavpac_get_wavpack_hybride ());
+			PtrTabArgs[ pos++ ] = g_strdup (optionsWavpac_get_wavpack_hybride ());
 			if (*optionsWavpack_get_wavpack_correction_file () != '\0') {
-				conv.ArgConv [ pos++ ] = g_strdup (optionsWavpack_get_wavpack_correction_file ());
+				PtrTabArgs[ pos++ ] = g_strdup (optionsWavpack_get_wavpack_correction_file ());
 			}
 			if (*optionsWavpack_get_wavpack_maximum_compression () != '\0') {
-				conv.ArgConv [ pos++ ] = g_strdup (optionsWavpack_get_wavpack_maximum_compression ());
+				PtrTabArgs[ pos++ ] = g_strdup (optionsWavpack_get_wavpack_maximum_compression ());
 			}
 		}
 		if (*optionsWavpack_get_wavpack_signature_md5 () != '\0') {
-			conv.ArgConv [ pos++ ] = g_strdup (optionsWavpack_get_wavpack_signature_md5 ());
+			PtrTabArgs[ pos++ ] = g_strdup (optionsWavpack_get_wavpack_signature_md5 ());
 		}
 		if (*optionsWavpack_get_wavpack_extra_encoding () != '\0') {
-			conv.ArgConv [ pos++ ] = g_strdup (optionsWavpack_get_wavpack_extra_encoding ());
+			PtrTabArgs[ pos++ ] = g_strdup (optionsWavpack_get_wavpack_extra_encoding ());
 		}
 
 		if (Config.BoolArtistTag && param_filelc->tags && param_filelc->tags->Artist && *param_filelc->tags->Artist) {
-			conv.ArgConv [ pos++ ] = g_strdup ("-w");
-			conv.ArgConv [ pos++ ] = g_strdup_printf ("Artist=%s", param_filelc->tags->Artist);
+			PtrTabArgs[ pos++ ] = g_strdup ("-w");
+			PtrTabArgs[ pos++ ] = g_strdup_printf ("Artist=%s", param_filelc->tags->Artist);
 		}
 		if (Config.BoolTitleTag && param_filelc->tags && param_filelc->tags->Title && *param_filelc->tags->Title) {
-			conv.ArgConv [ pos++ ] = g_strdup ("-w");
-			conv.ArgConv [ pos++ ] = g_strdup_printf ("Title=%s", param_filelc->tags->Title);
+			PtrTabArgs[ pos++ ] = g_strdup ("-w");
+			PtrTabArgs[ pos++ ] = g_strdup_printf ("Title=%s", param_filelc->tags->Title);
 		}
 		if (Config.BoolAlbumTag && param_filelc->tags && param_filelc->tags->Album && *param_filelc->tags->Album) {
-			conv.ArgConv [ pos++ ] = g_strdup ("-w");
-			conv.ArgConv [ pos++ ] = g_strdup_printf ("Album=%s", param_filelc->tags->Album);
+			PtrTabArgs[ pos++ ] = g_strdup ("-w");
+			PtrTabArgs[ pos++ ] = g_strdup_printf ("Album=%s", param_filelc->tags->Album);
 		}
 		if (Config.BoolGenreTag && param_filelc->tags && param_filelc->tags->Genre && *param_filelc->tags->Genre) {
-			conv.ArgConv [ pos++ ] = g_strdup ("-w");
-			conv.ArgConv [ pos++ ] = g_strdup_printf ("Genre=%s", param_filelc->tags->Genre);
+			PtrTabArgs[ pos++ ] = g_strdup ("-w");
+			PtrTabArgs[ pos++ ] = g_strdup_printf ("Genre=%s", param_filelc->tags->Genre);
 		}
 		if (Config.BoolYearTag && param_filelc->tags && param_filelc->tags->Year && *param_filelc->tags->Year) {
-			conv.ArgConv [ pos++ ] = g_strdup ("-w");
-			conv.ArgConv [ pos++ ] = g_strdup_printf ("Year=%s", param_filelc->tags->Year);
+			PtrTabArgs[ pos++ ] = g_strdup ("-w");
+			PtrTabArgs[ pos++ ] = g_strdup_printf ("Year=%s", param_filelc->tags->Year);
 		}
 		if (Config.BoolNumerateTag && param_filelc->tags && param_filelc->tags->Number && *param_filelc->tags->Number) {
-			conv.ArgConv [ pos++ ] = g_strdup ("-w");
-			conv.ArgConv [ pos++ ] = g_strdup_printf ("Track=%s", param_filelc->tags->Number);
+			PtrTabArgs[ pos++ ] = g_strdup ("-w");
+			PtrTabArgs[ pos++ ] = g_strdup_printf ("Track=%s", param_filelc->tags->Number);
 		}
 		if (Config.BoolCommentTag && param_filelc->tags &&param_filelc->tags->Comment && *param_filelc->tags->Comment) {
-			conv.ArgConv [ pos++ ] = g_strdup ("-w");
-			conv.ArgConv [ pos++ ] = g_strdup_printf ("Comment=%s", param_filelc->tags->Comment);
+			PtrTabArgs[ pos++ ] = g_strdup ("-w");
+			PtrTabArgs[ pos++ ] = g_strdup_printf ("Comment=%s", param_filelc->tags->Comment);
 		}
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filesrc);
-		conv.ArgConv [ pos++ ] = g_strdup ("-o");
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filedest);
-		conv.ArgConv [ pos++ ] = NULL;
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filesrc);
+		PtrTabArgs[ pos++ ] = g_strdup ("-o");
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filedest);
+		PtrTabArgs[ pos++ ] = NULL;
 	}
 	else if (param_filelc->type_conv == CDPARANOIA_CD_TO_WAV) {
 		
-		pos = filelc_get_command_line_nice ();
-		conv.ArgConv [ pos++ ] = g_strdup ("cdparanoia");
-		conv.ArgConv [ pos++ ] = g_strdup ("-e");
-		conv.ArgConv [ pos++ ] = g_strdup ("-d");
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->cdrom);
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->num_track);
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filedest);
-		conv.ArgConv [ pos++ ] = NULL;
+		pos = 3;
+		PtrTabArgs[ pos++ ] = g_strdup ("cdparanoia");
+		PtrTabArgs[ pos++ ] = g_strdup ("-e");
+		PtrTabArgs[ pos++ ] = g_strdup ("-d");
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->cdrom);
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->num_track);
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filedest);
+		PtrTabArgs[ pos++ ] = NULL;
 	}
 	else if (param_filelc->type_conv == CDDA2WAV_CD_TO_WAV) {
 		
 		// cdda2wav -D /dev/hda -O wav -t 7
-		//
-		pos = filelc_get_command_line_nice ();
-		conv.ArgConv [ pos++ ] = g_strdup ("cdda2wav");
-		conv.ArgConv [ pos++ ] = g_strdup ("-D");
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->cdrom);
-		conv.ArgConv [ pos++ ] = g_strdup ("-O");
-		conv.ArgConv [ pos++ ] = g_strdup ("wav");
-		conv.ArgConv [ pos++ ] = g_strdup ("-t");
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->num_track);
-		conv.ArgConv [ pos++ ] = NULL;
+		pos = 3;
+		PtrTabArgs[ pos++ ] = g_strdup ("cdda2wav");
+		PtrTabArgs[ pos++ ] = g_strdup ("-D");
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->cdrom);
+		PtrTabArgs[ pos++ ] = g_strdup ("-O");
+		PtrTabArgs[ pos++ ] = g_strdup ("wav");
+		PtrTabArgs[ pos++ ] = g_strdup ("-t");
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->num_track);
+		PtrTabArgs[ pos++ ] = NULL;
 	}
 	else if (param_filelc->type_conv == AACPLUSENC_WAV_TO_AAC) {
 		
-		pos = filelc_get_command_line_nice ();
-		conv.ArgConv [ pos++ ] = g_strdup ("aacplusenc");
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filesrc);
-		conv.ArgConv [ pos++ ] = g_strdup (param_filelc->filedest);
-
-		if (param_filelc->tags->bool_tag_cd == TRUE) {
-			conv.ArgConv [ pos++ ] = g_strdup_printf ("%d", optionsaacplusenc_get_bitrate_stereo ());
+		pos = 3;
+		PtrTabArgs[ pos++ ] = g_strdup ("aacplusenc");
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filesrc);
+		PtrTabArgs[ pos++ ] = g_strdup (param_filelc->filedest);
+		
+		if( NULL != param_filelc->tags && TRUE == param_filelc->tags->bool_tag_cd ) {
+			PtrTabArgs[ pos++ ] = g_strdup_printf ("%d", optionsaacplusenc_get_bitrate_stereo ());
 		}
 		else {
 			if (tagswav_file_is_mono (param_filelc->filesrc) == TRUE) {
-				conv.ArgConv [ pos++ ] = g_strdup_printf ("%d", optionsaacplusenc_get_bitrate_mono ());
+				PtrTabArgs[ pos++ ] = g_strdup_printf ("%d", optionsaacplusenc_get_bitrate_mono ());
 			} else {
-				conv.ArgConv [ pos++ ] = g_strdup_printf ("%d", optionsaacplusenc_get_bitrate_stereo ());
+				PtrTabArgs[ pos++ ] = g_strdup_printf ("%d", optionsaacplusenc_get_bitrate_stereo ());
 			}
 		}
-		conv.ArgConv [ pos++ ] = NULL;
+		PtrTabArgs[ pos++ ] = NULL;
 	}
+	
+	return( (gchar **)PtrTabArgs );
 }
 // 
 //

xcfa-4.2.8.tar.gz/src/file_mp3ogg.c -> xcfa-5.0.2.tar.gz/src/file_mp3ogg.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : file_mp3ogg.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -30,11 +30,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <stdio.h>
@@ -57,11 +52,34 @@
 #include "tags.h"
 #include "file.h"
 #include "statusbar.h"
-
-
-
-
-VAR_FILE_MP3OGG var_file_mp3ogg;
+#include "popup.h"
+
+
+
+/*
+typedef struct {
+	GtkWidget		*Adr_scroll;				// Adresse
+	GtkListStore		*Adr_List_Store;			// Adresse
+	GtkTreeModel		*Adr_Tree_Model;			// Adresse
+	GtkTreeSelection	*Adr_Line_Selected;			// Adresse
+	GtkWidget		*Adr_TreeView;				// Adresse
+	GtkWidget		*Adr_Entry_Dest;			// Adresse
+	GtkWidget		*Adr_Button_Dest;			// Adresse
+	GtkComboBox		*Adr_combobox_DestFile;			// Adresse
+	GdkPixbuf		*Pixbuf_NotInstall;			// not_install.png
+	GtkCellRenderer		*Renderer;
+	GtkTreeViewColumn	*Adr_ColumnFileMp3OggType;
+	GtkTreeViewColumn	*Adr_ColumnFileMp3OggBitrate;
+	GtkTreeViewColumn	*Adr_ColumnFileMp3OggNewBitrate;
+	GtkTreeViewColumn	*Adr_ColumnFileMp3OggSize;
+	GtkTreeViewColumn	*Adr_ColumnFileMp3OggTime;
+	GtkTreeViewColumn	*Adr_ColumnFileMp3OggName;
+	gboolean		BoolPopUpIsSelected;			// 
+} VAR_FILE_MP3OGG;
+*/
+VAR_FILE_MP3OGG var_file_mp3ogg = {
+	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
+};
 
 enum
 {
@@ -71,7 +89,6 @@
 	COLUMN_FILEMP3OGG_SIZE,
 	COLUMN_FILEMP3OGG_TIME,
 	COLUMN_FILEMP3OGG_NAME,
-	
 	COLUMN_FILEMP3OGG_POINTER_STRUCT,
 
 	COLUMN_FILE_NUM
@@ -89,21 +106,11 @@
 };
 
 
-gint		BitrateLameIndice = 0;		// abr .. vbr_new
-gint		TabBitrateLame[4] = {0,0,0,0};	// [ abr | cbr | vbr | vbr_new ]
-gint		TabModeLame[4] = {0,0,0,0};	// [ ModeAbr | ModeCbr | ModeVbr | ModeVbrNew ]
-
-gint		BitrateOggenc = 0;		// 
-gint		ManagedOggenc = 0;		// 
-gint		DownmixOggenc = 0;		// 
-
-
-
 
+/*
 // 
+// IDEE POUR AFFICHAGE AVEC PLUS DE DETAILS POUR L'UTILISATEUR
 // 
-gchar *FileMp3Ogg_get_param_lame_affiche (gint abr_cbr_vbr, gint bitrate, gint mode)
-{
 	gchar *str_abr [] = {
 	"ABR: -b 32",
 	"ABR: -b 40",
@@ -173,61 +180,8 @@
 	"VBR NEW: -V9"
 	};
 
-	gchar *str_val_mode[] = {
-	"Defaut",		/* 	*/
-	"Stereo",		/* -m s	*/
-	"Join Stereo",		/* -m j	*/
-	"Forced Join Stereo",	/* -m f	*/
-	"Duo Channels",		/* -m d	*/
-	"Mono"			/* -m m	*/
-	};
-
-	gchar *PtrStrLame = NULL;
-	gchar *PtrOne = NULL;
-	
-	if (abr_cbr_vbr < 0) return ((gchar *)g_strdup (""));
-	if (bitrate < 0) return ((gchar *)g_strdup (""));
-
-	switch (abr_cbr_vbr) {
-
-	/* ABR */
-	case 0 :
-		if (bitrate > 13) bitrate = 0;
-		PtrOne = g_strdup (str_abr [ bitrate ]);
-		break;
-
-	/* CBR */
-	case 1 :
-		if (bitrate > 14) bitrate = 0;
-		PtrOne = g_strdup (str_cbr [ bitrate ]);
-		break;
 
-	/* VBR */
-	case 2 :
-		if (bitrate > 14) bitrate = 0;
-		PtrOne = g_strdup (str_vbr [ bitrate ]);
-		break;
 
-	/* VBR_NEW */
-	case 3 :
-		if (bitrate > 15) bitrate = 0;
-		PtrOne = g_strdup (str_vbr_new [ bitrate ]);
-		break;
-	default:
-		return ((gchar *)g_strdup (""));
-	}
-	
-	if (mode < 0) mode = 0;
-	PtrStrLame = g_strdup_printf ("%s %s", PtrOne, str_val_mode[ mode ]);
-	g_free (PtrOne);
-	PtrOne = NULL;
-		
-	return ((gchar *)PtrStrLame);
-}
-// 
-// 
-gchar *FileMp3Ogg_get_param_oggenc_affiche (gint bitrate, gint managed, gint downmix)
-{
 	gchar *val[] = {
 	"--bitrate=45",
 	"--bitrate=64",
@@ -253,29 +207,10 @@
 	"--quality=9",
 	"--quality=10"
 	};
-	
-	gchar StrOggenc[ 1000 ];
-
-	if (bitrate < 0 || bitrate > 22) return ((gchar *)g_strdup (""));
-	
-	strcpy (StrOggenc, (gchar *)val[ bitrate ]);
+*/
 
-	if (bitrate < 11) {
-		if (managed == 0) {
-			strcat (StrOggenc, " ");
-			strcat (StrOggenc, "--managed");
-		}
-	}
-	if (bitrate < 9) {
-		if (downmix == 0) {
-			strcat (StrOggenc, " ");
-			strcat (StrOggenc, "--downmix");
-		}
-	}
 
-	return ((gchar *)g_strdup (StrOggenc));
-}
-// MISE A JOUR DES PARAMETRES EN TENANT COMPTE DU FLAG: detail->TypeMp3Ogg.BoolChanged == TRUE
+// MISE A JOUR DES PARAMETRES EN TENANT COMPTE DU FLAG: detail->BoolChanged == TRUE
 // 
 void FileMp3Ogg_change_parameters (void)
 {
@@ -290,7 +225,7 @@
 		PtrBitrate = NULL;
 
 		gtk_tree_model_get (var_file_mp3ogg.Adr_Tree_Model, &iter, COLUMN_FILEMP3OGG_POINTER_STRUCT, &detail, -1);
-		if (NULL != detail && TRUE == detail->TypeMp3Ogg.BoolChanged) {
+		if (NULL != detail && TRUE == detail->BoolChanged) {
 			if (FILE_IS_OGG == detail->type_infosong_file_is) {
 				
 				INFO_OGG *info = (INFO_OGG *)detail->info;
@@ -316,27 +251,39 @@
 				gtk_list_store_set (var_file_mp3ogg.Adr_List_Store, &iter, COLUMN_FILEMP3OGG_NEWBITRATE, "", -1);
 				gtk_list_store_set (var_file_mp3ogg.Adr_List_Store, &iter, COLUMN_FILEMP3OGG_SIZE, file_get_size (detail), -1);
 				gtk_list_store_set (var_file_mp3ogg.Adr_List_Store, &iter, COLUMN_FILEMP3OGG_TIME, file_get_time (detail), -1);
-				
-				detail->TypeMp3Ogg.type = -1;
-				detail->TypeMp3Ogg.debit [ 0 ] =
-				detail->TypeMp3Ogg.debit [ 1 ] =
-				detail->TypeMp3Ogg.debit [ 2 ] =
-				detail->TypeMp3Ogg.debit [ 3 ] = -1;
-					
-				detail->TypeMp3Ogg.mode [ 0 ] =
-				detail->TypeMp3Ogg.mode [ 1 ] =
-				detail->TypeMp3Ogg.mode [ 2 ] =
-				detail->TypeMp3Ogg.mode [ 3 ] = -1;
-				
-				detail->TypeMp3Ogg.BoolChanged = FALSE;
+								
+				detail->Mp3_Debit =
+				detail->Mp3_Mode =
+				detail->Ogg_Debit =
+				detail->Ogg_Managed =
+				detail->Ogg_Downmix = -1;
+				detail->BoolChanged = FALSE;
 			}
-			valid = gtk_tree_model_iter_next (var_file_mp3ogg.Adr_Tree_Model, &iter);
+			// BUG SOLVED: 24 03 2012
+			// valid = gtk_tree_model_iter_next (var_file_mp3ogg.Adr_Tree_Model, &iter);
 		}
+		valid = gtk_tree_model_iter_next (var_file_mp3ogg.Adr_Tree_Model, &iter);
 	}
 }
 // 
 // 
-gboolean FileMp3Ogg_is_modified (void)
+gboolean FileMp3Ogg_is_appliqued (void)
+{
+	GList		*List = NULL;
+	DETAIL		*detail = NULL;
+
+	List = g_list_first (entetefile);
+	while (List) {
+		if( NULL != (detail = (DETAIL *)List->data)) {
+			if( TRUE == detail->BoolChanged ) return( TRUE );
+		}
+		List = g_list_next (List);
+	}
+	return (FALSE);
+}
+// 
+// 
+gboolean FileMp3Ogg_is_removed (void)
 {
 	GtkTreeIter	iter;
 	GtkTreeModel	*model = NULL;
@@ -351,7 +298,7 @@
 		if (NULL != (path = list->data)) {
 			gtk_tree_model_get_iter (model, &iter, path);
 			gtk_tree_model_get (var_file_mp3ogg.Adr_Tree_Model, &iter, COLUMN_FILEMP3OGG_POINTER_STRUCT, &detail, -1);
-			if (NULL != detail && TRUE == detail->TypeMp3Ogg.BoolChanged) return (TRUE);
+			if( NULL != detail && TRUE == detail->BoolChanged ) return (TRUE);
 		}
 		list = g_list_next (list);
 	}
@@ -384,31 +331,18 @@
 // 
 void FileMp3Ogg_set_flag_buttons (void)
 {
-	gboolean BoolButtonsAudio [ 5 ] = { FALSE, FALSE, FALSE, FALSE, FALSE };
+	gboolean BoolButtonsAudio [ 3 ] = { FALSE, FALSE, FALSE };
 
 	// APPLIQUE
-	BoolButtonsAudio [ 0 ] = 
+	BoolButtonsAudio [ 0 ] = FileMp3Ogg_is_appliqued();
 	// EFFACE
-	BoolButtonsAudio [ 1 ] = FileMp3Ogg_is_modified ();
-	// COMBOBOX LAME
-	BoolButtonsAudio [ 3 ] = FileMp3Ogg_is_selected_FILE (FILE_IS_MP3);
-	// COMBOBOX OGGENC
-	BoolButtonsAudio [ 4 ] = FileMp3Ogg_is_selected_FILE (FILE_IS_OGG);
-	// SUPPRESSION DE L ENTREE
-	BoolButtonsAudio [ 2 ] = BoolButtonsAudio [ 3 ] | BoolButtonsAudio [ 4 ];
-	
+	BoolButtonsAudio [ 1 ] = FileMp3Ogg_is_removed ();
+	// REMOVE FILE
+	BoolButtonsAudio [ 2 ] = FileMp3Ogg_is_selected_FILE (FILE_IS_MP3) | FileMp3Ogg_is_selected_FILE (FILE_IS_OGG);	
 	// ACTION
 	gtk_widget_set_sensitive (GTK_WIDGET (GLADE_GET_OBJECT("button_applique_file_mp3ogg")),			BoolButtonsAudio [ 0 ]);
 	gtk_widget_set_sensitive (GTK_WIDGET (GLADE_GET_OBJECT("button_efface_bitrate_mp3ogg")),		BoolButtonsAudio [ 1 ]);
 	gtk_widget_set_sensitive (GTK_WIDGET (GLADE_GET_OBJECT("button_del_file")),				BoolButtonsAudio [ 2 ]);
-	// COMBOBOX LAME
-	gtk_widget_set_sensitive (GTK_WIDGET (GLADE_GET_OBJECT("eventbox_combobox_lame_abr_cbr_vbr_mp3ogg")),	BoolButtonsAudio [ 3 ]);
-	gtk_widget_set_sensitive (GTK_WIDGET (GLADE_GET_OBJECT("eventbox_combobox_lame_type_bitrate_mp3ogg")),	BoolButtonsAudio [ 3 ]);
-	gtk_widget_set_sensitive (GTK_WIDGET (GLADE_GET_OBJECT("eventbox_combobox_lame_mode_mp3ogg")),		BoolButtonsAudio [ 3 ]);
-	// COMBOBOX OGGENC
-	gtk_widget_set_sensitive (GTK_WIDGET (GLADE_GET_OBJECT("eventbox_combobox_oggenc_bitrate_mp3ogg")),	BoolButtonsAudio [ 4 ]);
-	gtk_widget_set_sensitive (GTK_WIDGET (GLADE_GET_OBJECT("eventbox_combobox_oggenc_managed_mp3ogg")),	BoolButtonsAudio [ 4 ]);
-	gtk_widget_set_sensitive (GTK_WIDGET (GLADE_GET_OBJECT("eventbox_combobox_oggenc_downmix_m3ogg")),	BoolButtonsAudio [ 4 ]);
 }
 // MARQUER LES LIGNES POUR LA DESTRUCTION
 // 
@@ -436,13 +370,13 @@
 			}
 			list = g_list_next (list);
 		}
-		gtk_tree_selection_unselect_all (var_file_mp3ogg.Adr_Line_Selected);
+		// gtk_tree_selection_unselect_all (var_file_mp3ogg.Adr_Line_Selected);
 	}
 	return (BoolPrint);
 }
 // UPDATE NEW BITRATE
 // 
-void FileMp3Ogg_update_newbitrate (TYPE_FILE_IS p_TypeFileIs)
+void FileMp3Ogg_update_newbitrate( TYPE_FILE_IS p_TypeFileIs, gint p_debit, gint p_mode_managed, gint p_downmix )
 {
 	GtkTreeModel		*model = NULL;
 	GList			*list = NULL;
@@ -454,7 +388,7 @@
 	model = gtk_tree_view_get_model (GTK_TREE_VIEW(var_file_mp3ogg.Adr_TreeView));
 	list = g_list_first (gtk_tree_selection_get_selected_rows (var_file_mp3ogg.Adr_Line_Selected, &model));
 	while (list) {
-		if ((path = list->data)) {
+		if (NULL != (path = list->data)) {
 			gtk_tree_model_get_iter (model, &iter, path);
 			gtk_tree_model_get (var_file_mp3ogg.Adr_Tree_Model, &iter, COLUMN_FILEMP3OGG_POINTER_STRUCT, &detail, -1);
 			
@@ -464,29 +398,34 @@
 			}
 			// FILE_IS_MP3
 			if (FILE_IS_MP3 == p_TypeFileIs && FILE_IS_MP3 == detail->type_infosong_file_is) {
-				detail->TypeMp3Ogg.type = BitrateLameIndice;
-				detail->TypeMp3Ogg.debit [ BitrateLameIndice ] = TabBitrateLame[ BitrateLameIndice ];
-				detail->TypeMp3Ogg.mode [ BitrateLameIndice ] = TabModeLame[ BitrateLameIndice ];
-				Str = FileMp3Ogg_get_param_lame_affiche (detail->TypeMp3Ogg.type,
-								 detail->TypeMp3Ogg.debit [ BitrateLameIndice ],
-								 detail->TypeMp3Ogg.mode [ BitrateLameIndice ]);
-				gtk_list_store_set (var_file_mp3ogg.Adr_List_Store, &iter, COLUMN_FILEMP3OGG_NEWBITRATE, Str, -1);
-				g_free (Str);
-				Str = NULL;
-				detail->TypeMp3Ogg.BoolChanged = TRUE;
+				
+				// Str = popup_get_param_mp3( detail->Mp3_Debit, detail->Mp3_Mode );
+				detail->Mp3_Debit = p_debit;
+				detail->Mp3_Mode = p_mode_managed;
+				Str = popup_get_param_mp3( p_debit, p_mode_managed );
+				gtk_list_store_set (var_file_mp3ogg.Adr_List_Store, &iter, COLUMN_FILEMP3OGG_NEWBITRATE, Str != NULL ? Str : "", -1);
+				
+				detail->BoolChanged = (Str != NULL) ? TRUE : FALSE;
+				if( NULL != Str ) {
+					g_free (Str);
+					Str = NULL;
+				}
 			}
 			// FILE_IS_OGG
 			else if (FILE_IS_OGG == p_TypeFileIs && FILE_IS_OGG == detail->type_infosong_file_is) {
-				detail->TypeMp3Ogg.type = BitrateOggenc;
-				detail->TypeMp3Ogg.debit [ 0 ] = ManagedOggenc;
-				detail->TypeMp3Ogg.mode [ 0 ] = DownmixOggenc;
-				Str = FileMp3Ogg_get_param_oggenc_affiche (BitrateOggenc,
-								 ManagedOggenc,
-								 DownmixOggenc);
-				gtk_list_store_set (var_file_mp3ogg.Adr_List_Store, &iter, COLUMN_FILEMP3OGG_NEWBITRATE, Str, -1);
-				g_free (Str);
-				Str = NULL;
-				detail->TypeMp3Ogg.BoolChanged = TRUE;
+				
+				// Str = popup_get_param_ogg( detail->Ogg_Debit, detail->Ogg_Managed, detail->Ogg_Downmix );
+				detail->Ogg_Debit = p_debit;
+				detail->Ogg_Managed = p_mode_managed;
+				detail->Ogg_Downmix = p_downmix;
+				Str = popup_get_param_ogg( p_debit, p_mode_managed, p_downmix );
+				gtk_list_store_set (var_file_mp3ogg.Adr_List_Store, &iter, COLUMN_FILEMP3OGG_NEWBITRATE, Str != NULL ? Str : "", -1);
+				
+				detail->BoolChanged = (Str != NULL) ? TRUE : FALSE;
+				if( NULL != Str ) {
+					g_free (Str);
+					Str = NULL;
+				}
 			}
 		}
 
@@ -500,38 +439,23 @@
 {
 	DETAIL		*detail = NULL;
 	GList		*List = NULL;
-	GList		*FreegList = NULL;
 	GtkTreeIter	iter;
 	GtkAdjustment	*Adj = NULL;
 	gdouble		AdjValue;
-	gint		*TabInt = NULL;		// TABLEAU DES LIGNES EN SELECTION
-	gint		Cpt = 0;		// INDICE DANS LE TABLEAU
 	gint		Line = 0;		// LIGNE EN COURS
 	INFO_MP3	*info_mp3 = NULL;
 	INFO_OGG	*info_ogg = NULL;
 	gchar		*StrInfo = NULL;
 	gchar		*PtrBitrate = NULL;
 	gchar		*NameDest = NULL;
+	gint		NumLineSelected = -1;
+	gboolean	BoolNumLineSelected = FALSE;
 
-	
-	// LIBERATION LIGNE(S) DU GLIST SI NECESSARE
-	// 
-	List = g_list_first (entetefile);
-	while (List) {
-		if ((detail = (DETAIL *)List->data) && TRUE == detail->BoolRemove) {
-			FreegList = List;
-			FreegList->data = NULL;
-			List = g_list_next (List);
-			entetefile = g_list_remove_link (entetefile, FreegList);
-			List = g_list_first (entetefile);
-			continue;
-		}
-		List = g_list_next (List);
-	}
-	
 	// RECUP SELECTION
 	// 
-	TabInt = libutils_get_tab_selected_line (var_file_mp3ogg.Adr_Line_Selected, var_file_mp3ogg.Adr_Tree_Model);
+	NumLineSelected = libutils_get_first_line_is_selected( var_file_mp3ogg.Adr_Line_Selected, var_file_mp3ogg.Adr_Tree_Model );
+	
+	gtk_tree_selection_unselect_all (var_file_mp3ogg.Adr_Line_Selected);
 
 	// DELETE TREEVIEW
 	// 
@@ -544,7 +468,6 @@
 	
 	// AFFICHAGE DE LA LISTE
 	// 
-	Cpt = 0;
 	Line = 0;
 	List = g_list_first (entetefile);
 	while (List) {
@@ -558,24 +481,18 @@
 			}
 			else {
 				List = g_list_next (List);
-				Line ++;
 				continue;
 			}
 			if (NULL == info_mp3 && NULL == info_ogg) {
 				List = g_list_next (List);
-				Line ++;
 				continue;
 			}
 			
 			if (detail->type_infosong_file_is == FILE_IS_MP3) {
-				StrInfo = FileMp3Ogg_get_param_lame_affiche (detail->TypeMp3Ogg.type,
-								 detail->TypeMp3Ogg.debit [ detail->TypeMp3Ogg.type ],
-								 detail->TypeMp3Ogg.mode [ detail->TypeMp3Ogg.type ]);
+				StrInfo = popup_get_param_mp3( detail->Mp3_Debit, detail->Mp3_Mode );
 			}
 			else {
-				StrInfo = FileMp3Ogg_get_param_oggenc_affiche (detail->TypeMp3Ogg.type,
-									 detail->TypeMp3Ogg.debit [ 0 ],
-									 detail->TypeMp3Ogg.mode [ 0 ]);
+				StrInfo = popup_get_param_ogg( detail->Ogg_Debit, detail->Ogg_Managed, detail->Ogg_Downmix );
 			}
 			
 			NameDest = libutils_get_name_without_ext_with_amp (detail->namefile);
@@ -584,10 +501,11 @@
 			gtk_list_store_set (var_file_mp3ogg.Adr_List_Store, &iter,
 						COLUMN_FILEMP3OGG_TYPE,			tags_get_str_type_file_is (detail->type_infosong_file_is),
 						COLUMN_FILEMP3OGG_BITRATE,		PtrBitrate,
-						COLUMN_FILEMP3OGG_NEWBITRATE,		detail->TypeMp3Ogg.BoolChanged == TRUE ? StrInfo : "",
+						COLUMN_FILEMP3OGG_NEWBITRATE,		detail->BoolChanged == TRUE ? StrInfo : "",
 						COLUMN_FILEMP3OGG_SIZE,			file_get_size (detail),
 						COLUMN_FILEMP3OGG_TIME,			file_get_time (detail),
 						COLUMN_FILEMP3OGG_NAME,			NameDest,
+						// COLUMN_FILEMP3OGG_COLOR,		&YellowColor,
 						COLUMN_FILEMP3OGG_POINTER_STRUCT,	detail,
 						-1);
 			
@@ -596,26 +514,26 @@
 			
 			// AFFICHE LES EVENTUELLES LIGNES EN SELECTION
 			// 
-			if (NULL != TabInt) {
-				if (Line == *(TabInt + Cpt)) {
-					gtk_tree_selection_select_iter (var_file_mp3ogg.Adr_Line_Selected, &iter);
-					Cpt ++;
-				}
-				Line ++;
+			if( NumLineSelected == Line ) {
+				gtk_tree_selection_select_iter (var_file_mp3ogg.Adr_Line_Selected, &iter);
+				BoolNumLineSelected = TRUE;
 			}
+			
+			Line ++;
 		}
 		List = g_list_next (List);
 	}
 	
 	// SUPPRESSON TABLEAU DES EVENTUELLES LIGNES EN SELECTION
 	// 
-	if (NULL != TabInt) {
-		g_free (TabInt);
-		TabInt = NULL;
-	}
-	else {
-		if (gtk_tree_model_get_iter_first (var_file_mp3ogg.Adr_Tree_Model, &iter))
+	if( NumLineSelected == -1 ) {
+		if (gtk_tree_model_get_iter_first (var_file_mp3ogg.Adr_Tree_Model, &iter)) {
 			gtk_tree_selection_select_iter (var_file_mp3ogg.Adr_Line_Selected, &iter);
+			BoolNumLineSelected = TRUE;
+		}
+	}
+	if( NumLineSelected > 0 && NULL != entetefile && BoolNumLineSelected == FALSE ) {
+		gtk_tree_selection_select_iter (var_file_mp3ogg.Adr_Line_Selected, &iter);
 	}
 
 	// REAJUSTEMENT DE LA LISTE
@@ -646,18 +564,13 @@
 			gtk_tree_model_get (var_file_mp3ogg.Adr_Tree_Model, &iter, COLUMN_FILEMP3OGG_POINTER_STRUCT, &detail, -1);
 			if (NULL != detail) {
 				if (detail->type_infosong_file_is == FILE_IS_MP3 || detail->type_infosong_file_is == FILE_IS_OGG) {
-					detail->TypeMp3Ogg.type = -1;
-					detail->TypeMp3Ogg.debit [ 0 ] =
-					detail->TypeMp3Ogg.debit [ 1 ] =
-					detail->TypeMp3Ogg.debit [ 2 ] =
-					detail->TypeMp3Ogg.debit [ 3 ] = -1;
-					
-					detail->TypeMp3Ogg.mode [ 0 ] =
-					detail->TypeMp3Ogg.mode [ 1 ] =
-					detail->TypeMp3Ogg.mode [ 2 ] =
-					detail->TypeMp3Ogg.mode [ 3 ] = -1;
 					
-					detail->TypeMp3Ogg.BoolChanged = FALSE;
+					detail->Mp3_Debit = -1;	// SET DEBIT
+					detail->Mp3_Mode = -1;	// SET MODE
+					detail->Ogg_Debit = -1;	// SET DEBIT
+					detail->Ogg_Managed = -1;	// SET MANAGED
+					detail->Ogg_Downmix = -1;	// SET DOWNMIX
+					detail->BoolChanged = FALSE;
 				}
 				gtk_list_store_set (var_file_mp3ogg.Adr_List_Store, &iter, COLUMN_FILEMP3OGG_NEWBITRATE, "", -1);
 			}
@@ -668,331 +581,9 @@
 }
 // 
 // 
-DETAIL *FileMp3Ogg_get (TYPE_FILE_IS p_TypeFileIs, gint *p_type, gint *p_debit, gint *p_mode)
-{
-	GtkTreeIter iter;
-	GtkTreeModel *model = NULL;
-	GList *begin_list = NULL;
-	GList *list = NULL;
-	GtkTreePath *path;
-	DETAIL *detail = NULL;
-
-	*p_type = 0;
-	*p_debit = 0;
-	*p_mode = 0;
-	model = gtk_tree_view_get_model (GTK_TREE_VIEW(var_file_mp3ogg.Adr_TreeView));
-	if (NULL != (begin_list = gtk_tree_selection_get_selected_rows (var_file_mp3ogg.Adr_Line_Selected, &model))) {
-		list = g_list_first (begin_list);
-		while (list) {
-			if (NULL != (path = list->data)) {
-				gtk_tree_model_get_iter (model, &iter, path);
-				gtk_tree_model_get (var_file_mp3ogg.Adr_Tree_Model, &iter, COLUMN_FILEMP3OGG_POINTER_STRUCT, &detail, -1);
-				if (NULL != detail){
-					if (p_TypeFileIs == detail->type_infosong_file_is && FILE_IS_MP3 == p_TypeFileIs) {
-						*p_type = detail->TypeMp3Ogg.type;
-						*p_debit = detail->TypeMp3Ogg.debit [ detail->TypeMp3Ogg.type ];
-						*p_mode = detail->TypeMp3Ogg.mode [ detail->TypeMp3Ogg.type ];
-						break;
-					}
-					else if (p_TypeFileIs == detail->type_infosong_file_is && FILE_IS_OGG == p_TypeFileIs) {
-						*p_type = detail->TypeMp3Ogg.type;
-						*p_debit = detail->TypeMp3Ogg.debit [ 0 ];
-						*p_mode = detail->TypeMp3Ogg.mode [ 0 ];
-						break;
-					}
-					else detail = NULL;
-				}
-			}
-			list = g_list_next (list);
-		}
-	}
-	// g_print("FileMp3Ogg_get -> ");
-	// if (NULL != detail) g_print("detail->TypeMp3Ogg.BoolChanged=%s ", detail->TypeMp3Ogg.BoolChanged ? "TRUE" : "FALSE");
-	// g_print("type=%d debit=%d mode=%d\n", *p_type,*p_debit,*p_mode);
-	// if (*p_type < 0)	*p_type = 0;
-	// if (*p_debit < 0)	*p_debit = 0;
-	// if (*p_mode < 0)	*p_mode = 0;
-	
-	return ((DETAIL *)detail);
-}
-// 
-// 
-void on_combobox_lame_abr_cbr_vbr_mp3ogg_realize (GtkWidget *widget, gpointer user_data)
-{
-	var_file_mp3ogg.Adr_Widget_Lame_abr_cbr_vbr = GTK_COMBO_BOX (widget);
-	// libcombo_alloc (GTK_COMBO_BOX (widget));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "ABR");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "CBR");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "VBR");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "VBR-NEW");
-	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
-}
-// 
-// 
-void on_combobox_lame_abr_cbr_vbr_mp3ogg_changed (GtkComboBox *combobox, gpointer user_data)
-{
-	gint	ind;
-	
-	if (NULL == var_file_mp3ogg.Adr_Widget_Lame_bitrate) return;
-	if (NULL == var_file_mp3ogg.Adr_Widget_Lame_abr_cbr_vbr) return;
-	if ((ind = gtk_combo_box_get_active (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_abr_cbr_vbr))) < 0) return;
-	BitrateLameIndice = ind;
-	
-	switch (BitrateLameIndice) {
-	// ABR 0 .. 13
-	case 0 :
-		libcombo_alloc (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate));
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), " 32");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), " 40");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), " 48");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), " 56");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), " 64");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), " 80");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), " 96");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "112");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "128");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "160");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "192");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "224");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "256");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "320");
-		break;
-	// CBR 0 .. 14
-	case 1 :
-		libcombo_alloc (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate));
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), " 32");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), " 40");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), " 48");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), " 56");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), " 64");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), " 80");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), " 96");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "112");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), _("128 -defaut"));
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "160");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "192");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "224");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "256");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "320");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "preset insane");
-		break;
-	// VBR 0 .. 14
-	case 2 :
-		libcombo_alloc (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate));
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "preset medium");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "preset standard");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "preset extreme");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "preset fast standard");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "preset fast extreme");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), _("V0 -meilleure qualite"));
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "V1");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "V2");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "V3");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), _("V4 -defaut"));
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "V5");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "V6");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "V7");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "V8");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), _("V9 -moins bonne qualite"));
-		break;
-	// VBR_NEW 0 .. 14
-	case 3 :
-		libcombo_alloc (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate));
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), " ");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "preset medium");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "preset standard");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "preset extreme");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "preset fast standard");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "preset fast extreme");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "V0");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "V1");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "V2");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "V3");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), _("V4 -defaut"));
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "V5");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "V6");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "V7");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "V8");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), "V9");
-		break;
-	}
-	gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), TabBitrateLame[ BitrateLameIndice ]);
-	if (NULL != var_file_mp3ogg.Adr_Widget_Lame_Mode)
-		gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_Mode), TabModeLame[ BitrateLameIndice ]);
-	
-	FileMp3Ogg_update_newbitrate (FILE_IS_MP3);
-}
-// 
-// 
-void on_combobox_lame_type_bitrate_mp3ogg_realize (GtkWidget *widget, gpointer user_data)
-{
-	var_file_mp3ogg.Adr_Widget_Lame_bitrate = GTK_COMBO_BOX (widget);
-	on_combobox_lame_abr_cbr_vbr_mp3ogg_changed (NULL,NULL);
-}
-// 
-// 
-void on_combobox_lame_type_bitrate_mp3ogg_changed (GtkComboBox *combobox, gpointer user_data)
-{
-	gint	ind;
-	
-	if (var_file_mp3ogg.Adr_Widget_Lame_abr_cbr_vbr == NULL || var_file_mp3ogg.Adr_Widget_Lame_bitrate == NULL) return;
-	if ((ind = gtk_combo_box_get_active (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate))) < 0) return;
-	TabBitrateLame[ BitrateLameIndice ] = ind;
-	FileMp3Ogg_update_newbitrate (FILE_IS_MP3);
-}
-// 
-// 
-void on_combobox_lame_mode_mp3ogg_realize (GtkWidget *widget, gpointer user_data)
-{
-	var_file_mp3ogg.Adr_Widget_Lame_Mode = GTK_COMBO_BOX (widget);
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Defaut"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Stereo");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Join Stereo");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Forced Join Stereo");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Duo Channels");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Mono");
-	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), TabModeLame[ BitrateLameIndice ]);
-}
-// 
-// 
-void on_combobox_lame_mode_mp3ogg_changed (GtkComboBox *combobox, gpointer user_data)
-{
-	gint	ind;
-	
-	if (var_file_mp3ogg.Adr_Widget_Lame_Mode == NULL) return;
-	if ((ind = gtk_combo_box_get_active (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_Mode))) < 0) return;
-	TabModeLame[ BitrateLameIndice ] = ind;
-	FileMp3Ogg_update_newbitrate (FILE_IS_MP3);
-}
-// 
-// 
-void on_combobox_oggenc_bitrate_mp3ogg_realize (GtkWidget *widget, gpointer user_data)
-{
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), " 45 kbit/s");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), " 64 kbit/s");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), " 80 kbit/s");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), " 96 kbit/s");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "112 kbit/s");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "128 kbit/s");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "160 kbit/s");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "192 kbit/s");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "224 kbit/s");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "256 kbit/s");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "320 kbit/s");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Qualite -1 -Moins bonne qualite"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Qualite 0"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Qualite 1"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Qualite 2"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Qualite 3 -Defaut"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Qualite 4"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Qualite 5"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Qualite 6"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Qualite 7"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Qualite 8"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Qualite 9"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Qualite 10 -Meilleure qualite"));
-	var_file_mp3ogg.Adr_Widget_Oggenc_bitrate = GTK_COMBO_BOX (widget);
-	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), BitrateOggenc);
-}
-// 
-// 
-void on_combobox_oggenc_bitrate_mp3ogg_changed (GtkComboBox *combobox, gpointer user_data)
-{
-	if (var_file_mp3ogg.Adr_Widget_Oggenc_bitrate == NULL) return;
-	
-	gtk_widget_set_sensitive (
-		GTK_WIDGET (GLADE_GET_OBJECT("combobox_oggenc_managed_mp3ogg")),
-		gtk_combo_box_get_active (var_file_mp3ogg.Adr_Widget_Oggenc_bitrate) < 11 ? TRUE : FALSE);
-	gtk_widget_set_sensitive (
-		GTK_WIDGET (GLADE_GET_OBJECT("combobox_oggenc_downmix_m3ogg")),
-		gtk_combo_box_get_active (var_file_mp3ogg.Adr_Widget_Oggenc_bitrate) < 9 ? TRUE : FALSE);
-	
-	if (NULL != var_file_mp3ogg.Adr_Widget_Oggenc_bitrate)
-		BitrateOggenc = gtk_combo_box_get_active (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Oggenc_bitrate));
-	if (NULL != var_file_mp3ogg.Adr_Widget_Oggenc_managed)
-		ManagedOggenc = gtk_combo_box_get_active (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Oggenc_managed));
-	if (NULL != var_file_mp3ogg.Adr_Widget_Oggenc_downmix)
-		DownmixOggenc = gtk_combo_box_get_active (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Oggenc_downmix));
-	
-	FileMp3Ogg_update_newbitrate (FILE_IS_OGG);
-}
-// 
-// 
-void on_combobox_oggenc_managed_mp3ogg_realize (GtkWidget *widget, gpointer user_data)
-{
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Oui"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Non"));
-	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), ManagedOggenc);
-	var_file_mp3ogg.Adr_Widget_Oggenc_managed = GTK_COMBO_BOX (widget);
-}
-// 
-// 
-void on_combobox_oggenc_managed_mp3ogg_changed (GtkComboBox *combobox, gpointer user_data)
-{
-	if (NULL != var_file_mp3ogg.Adr_Widget_Oggenc_bitrate)
-		BitrateOggenc = gtk_combo_box_get_active (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Oggenc_bitrate));
-	if (NULL != var_file_mp3ogg.Adr_Widget_Oggenc_managed)
-		ManagedOggenc = gtk_combo_box_get_active (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Oggenc_managed));
-	if (NULL != var_file_mp3ogg.Adr_Widget_Oggenc_downmix)
-		DownmixOggenc = gtk_combo_box_get_active (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Oggenc_downmix));
-	
-	FileMp3Ogg_update_newbitrate (FILE_IS_OGG);
-}
-// 
-// 
-void on_combobox_oggenc_downmix_m3ogg_realize (GtkWidget *widget, gpointer user_data)
-{
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Mono force"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Stereo"));
-	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), DownmixOggenc);
-	var_file_mp3ogg.Adr_Widget_Oggenc_downmix = GTK_COMBO_BOX (widget);
-}
-// 
-// 
-void on_combobox_oggenc_downmix_m3ogg_changed (GtkComboBox *combobox, gpointer user_data)
-{
-	if (NULL != var_file_mp3ogg.Adr_Widget_Oggenc_bitrate)
-		BitrateOggenc = gtk_combo_box_get_active (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Oggenc_bitrate));
-	if (NULL != var_file_mp3ogg.Adr_Widget_Oggenc_managed)
-		ManagedOggenc = gtk_combo_box_get_active (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Oggenc_managed));
-	if (NULL != var_file_mp3ogg.Adr_Widget_Oggenc_downmix)
-		DownmixOggenc = gtk_combo_box_get_active (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Oggenc_downmix));
-	
-	FileMp3Ogg_update_newbitrate (FILE_IS_OGG);
-}
-// 
-// 
 void FileMp3Ogg_changed_selection_row (GtkTreeSelection *selection, gpointer data)
-{
-	DETAIL	*detail = NULL;
-	gint	 type, debit, mode;
-	
+{	
 	var_file_mp3ogg.Adr_Line_Selected = selection;
-	
-	if (NULL != (detail = FileMp3Ogg_get (FILE_IS_MP3, &type, &debit, &mode))) {
-		if (type > -1 && debit > -1 && mode > -1) {
-			BitrateLameIndice = type;
-			TabBitrateLame[ BitrateLameIndice ] = debit;
-			TabModeLame[ BitrateLameIndice ] = mode;
-			gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_abr_cbr_vbr), type);
-			gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_bitrate), debit);
-			gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Lame_Mode), mode);
-		}
-	}
-	else if (NULL != (detail = FileMp3Ogg_get (FILE_IS_OGG, &type, &debit, &mode))) {
-		if (type > -1 && debit > -1 && mode > -1) {
-			BitrateOggenc = type;
-			ManagedOggenc = debit;
-			DownmixOggenc = mode;
-			gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Oggenc_bitrate), type);
-			gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Oggenc_managed), debit);
-			gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_mp3ogg.Adr_Widget_Oggenc_downmix), mode);
-		}
-	}
 	FileMp3Ogg_set_flag_buttons ();
 }
 // 
@@ -1003,7 +594,7 @@
 		gtk_tree_selection_unselect_all (var_file_mp3ogg.Adr_Line_Selected);
 		gtk_tree_selection_select_all (var_file_mp3ogg.Adr_Line_Selected);
 	}
-	if (keys.keyval == GDK_Delete) {
+	if (keys.keyval == GDK_KEY_Delete) {
 		GtkTreeIter iter;
 		if (gtk_tree_model_get_iter_first (var_file_mp3ogg.Adr_Tree_Model, &iter)) {
 			on_file_button_del_file_clicked (NULL, NULL);
@@ -1027,9 +618,13 @@
 	gint Pos_X = 0, Pos_Y = 0;
 	gint i;
 	gboolean BoolSelectColNom = FALSE;
+	gboolean BoolSelectNewBitrate = FALSE;
 	
-	// SI PAS DANS LE TREEVIEW
-	gdk_window_get_pointer (((GdkEventButton*)event)->window, &x, &y, &state);
+	/* Si pas de selection a cet endroit retour */
+	GdkDeviceManager *manager = gdk_display_get_device_manager( gdk_display_get_default() );
+	GdkDevice		 *device = gdk_device_manager_get_client_pointer( manager );
+	gdk_window_get_device_position( ((GdkEventButton*)event)->window, device, &x, &y, &state );
+	// gdk_window_get_pointer (((GdkEventButton*)event)->window, &x, &y, &state);
 	if (FALSE == gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW(treeview),
 					 x, y,
 					 &path, &column, &Pos_X, &Pos_Y)) {
@@ -1057,7 +652,8 @@
 		ColumnDum = gtk_tree_view_get_column (GTK_TREE_VIEW(treeview), i);
 		if (ColumnDum == column) {
 			switch ( i ) {
-			case NUM_TREE_FILEMP3OGG_Nom :		BoolSelectColNom		= TRUE;	break;
+			case NUM_TREE_FILEMP3OGG_Nom :			BoolSelectColNom	= TRUE;	break;
+			case NUM_TREE_FILEMP3OGG_NOUVEAUBITRATE :	BoolSelectNewBitrate	= TRUE;	break;
 			default: 
 				StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, "");
 				StatusBar_puts();
@@ -1067,8 +663,11 @@
 			break;
 		}
 	}
-	if (BoolSelectColNom) {
-		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, detail->namefile);
+	if( BoolSelectColNom ) {
+		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, detail->namefile );
+	}
+	else if( BoolSelectNewBitrate ) {
+		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("Right click: access popup") );
 	}
 	
 	StatusBar_puts( );
@@ -1077,17 +676,20 @@
 }
 // 
 // 
-static void FileMp3Ogg_drag_data_received (GtkWidget	 *widget,
-					GdkDragContext *drag_context,
-					gint x,
-					gint y,
-					GtkSelectionData *data,
-					guint info,
-					guint time)
-{
- /* Une copie ne peut aller vers elle meme !!! */
-	if (gtk_drag_get_source_widget(drag_context) != widget) {
-		dragndrop_list_drag_data (widget, (gchar *)data->data);
+static void FileMp3Ogg_drag_data_received(
+					GtkWidget *widget,
+					GdkDragContext *context,
+					gint x,
+					gint y,
+					GtkSelectionData *data,
+					guint info,
+					guint time,
+					gpointer user_data)
+{
+	// Une copie ne peut aller vers elle meme !!! */
+	if (gtk_drag_get_source_widget(context) != widget) {
+		// dragndrop_list_drag_data (widget, (gchar *)data->data);
+		dragndrop_list_drag_data( widget, (gchar*)gtk_selection_data_get_data( data ));
 	}
 }
 // 
@@ -1128,7 +730,8 @@
 
 			gtk_selection_data_set( selection_data,
 						// GDK_SELECTION_TYPE_STRING,
-						selection_data->target,
+						// selection_data->target,
+						GDK_POINTER_TO_ATOM(gtk_selection_data_get_data( selection_data )),
 						8,
 						(guchar *)text,
 						strlen( text )
@@ -1141,8 +744,82 @@
 }
 // 
 // 
-gboolean FileMp3Ogg_event_click_mouse (GtkWidget *treeview, GdkEventButton *event, gpointer data)
+gboolean FileMp3Ogg_event_click_mouse( GtkWidget *treeview, GdkEventButton *event, gpointer data )
 {
+	GtkTreePath *path;
+	GtkTreeViewColumn *column;
+	GtkTreeIter iter;
+	GtkTreeModel *model = (GtkTreeModel *)data;
+	DETAIL *detail = NULL;
+	gint Pos_X = 0, Pos_Y = 0;
+	gboolean bool_click_droit = (event->button == 3);	
+	
+	
+	
+	/* Single clicks only */
+	if (event->type != GDK_BUTTON_PRESS) return (FALSE);
+	
+	/* Si pas de selection a cet endroit retour */
+	if (FALSE == gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW(treeview),
+					 (gint)event->x, (gint)event->y,
+					 &path, &column, &Pos_X, &Pos_Y)) return (FALSE);
+
+	// RECUP DE LA STRUCTURE
+	gtk_tree_model_get_iter (model, &iter, path);
+	gtk_tree_model_get (var_file_mp3ogg.Adr_Tree_Model, &iter, COLUMN_FILEMP3OGG_POINTER_STRUCT, &detail, -1);
+	if (NULL == detail) return (FALSE);
+	
+	/*-----------------*/
+	/*if( (bool_click_droit) && (FILE_IS_MP3 == detail->type_infosong_file_is || FILE_IS_OGG == detail->type_infosong_file_is) )
+	{
+		GtkTreeSelection *selection;
+
+		selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
+
+		if (gtk_tree_selection_count_selected_rows(selection) <= 1)
+		{
+			GtkTreePath *path;
+
+			
+			if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(treeview),
+							(gint) event->x, 
+							(gint) event->y,
+							&path, NULL, NULL, NULL))
+			{
+				gtk_tree_selection_unselect_all(selection);
+				gtk_tree_selection_select_path(selection, path);
+				gtk_tree_path_free(path);
+			}
+		}
+	}
+	*/
+	
+	/*-----------------*/
+	if( bool_click_droit && FILE_IS_MP3 == detail->type_infosong_file_is )
+	{
+		// DEBIT MODE
+		popup_file_mp3_type( detail, detail->Mp3_Debit, detail->Mp3_Mode );
+		
+		// AUTORISE LE POPUP SUR UNE SELECTION MULTIPLE
+		var_file_mp3ogg.Adr_Line_Selected = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
+		gtk_tree_selection_select_path(var_file_mp3ogg.Adr_Line_Selected, path);
+		// gtk_tree_path_free(path);
+		return TRUE;
+		
+	}
+	else if( bool_click_droit && FILE_IS_OGG == detail->type_infosong_file_is )
+	{
+		// DEBIT MANAGED DOWNMIX
+		popup_file_ogg_type( detail, detail->Ogg_Debit, detail->Ogg_Managed, detail->Ogg_Downmix );
+		
+		var_file_mp3ogg.Adr_Line_Selected = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
+		// AUTORISE LE POPUP SUR UNE SELECTION MULTIPLE
+		gtk_tree_selection_select_path(var_file_mp3ogg.Adr_Line_Selected, path);
+		// gtk_tree_path_free(path);
+		return TRUE;
+		
+	}
+	
 	return (FALSE);
 }
 // 
@@ -1170,7 +847,7 @@
 	g_signal_connect(G_OBJECT(var_file_mp3ogg.Adr_Line_Selected),
 			 "changed",
 	 G_CALLBACK(FileMp3Ogg_changed_selection_row),
- 	 "1");
+ 	 model);
 	
 	// SIGNAL 'key-press-event'
 	g_signal_connect(G_OBJECT(treeview),
@@ -1225,7 +902,7 @@
 	renderer = gtk_cell_renderer_text_new ();
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_file_mp3ogg.Adr_ColumnFileMp3OggBitrate =
-	column = gtk_tree_view_column_new_with_attributes (_("Bitrate"),
+	column = gtk_tree_view_column_new_with_attributes ("Bitrate",
 						 renderer,
 						 "text", COLUMN_FILEMP3OGG_BITRATE,
 						 NULL);
@@ -1241,7 +918,7 @@
 	renderer = gtk_cell_renderer_text_new ();
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_file_mp3ogg.Adr_ColumnFileMp3OggNewBitrate =
-	column = gtk_tree_view_column_new_with_attributes (_("Nouveau bitrate"),
+	column = gtk_tree_view_column_new_with_attributes (_("New bitrate"),
 						 renderer,
 						 "markup", COLUMN_FILEMP3OGG_NEWBITRATE,
 						 NULL);
@@ -1255,7 +932,7 @@
 	renderer = gtk_cell_renderer_text_new ();
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_file_mp3ogg.Adr_ColumnFileMp3OggSize =
-	column = gtk_tree_view_column_new_with_attributes (_("Taille"),
+	column = gtk_tree_view_column_new_with_attributes (_("Size"),
 						 renderer,
 						 "text", COLUMN_FILEMP3OGG_SIZE,
 						 NULL);
@@ -1269,7 +946,7 @@
 	renderer = gtk_cell_renderer_text_new ();
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_file_mp3ogg.Adr_ColumnFileMp3OggTime =
-	column = gtk_tree_view_column_new_with_attributes (_("Temps"),
+	column = gtk_tree_view_column_new_with_attributes (_("Time"),
 						 renderer,
 						 "text", COLUMN_FILEMP3OGG_TIME,
 						 NULL);
@@ -1284,9 +961,10 @@
 	renderer = gtk_cell_renderer_text_new ();
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_file_mp3ogg.Adr_ColumnFileMp3OggName =
-	column = gtk_tree_view_column_new_with_attributes (_("Nom"),
+	column = gtk_tree_view_column_new_with_attributes (_("Name"),
 						 renderer,
 						 "markup", COLUMN_FILEMP3OGG_NAME,
+						 // "background-gdk", COLUMN_FILEMP3OGG_COLOR,
 						 NULL);
 	gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
 				 GTK_TREE_VIEW_COLUMN_FIXED);
@@ -1307,19 +985,20 @@
 	var_file_mp3ogg.Pixbuf_NotInstall		= libutils_init_pixbufs ("xcfa/not_install.png");
 	
 	var_file_mp3ogg.Adr_List_Store = store =
-	gtk_list_store_new (	COLUMN_FILE_NUM,	/* TOTAL NUMBER			*/
-				G_TYPE_STRING,		/* COLUMN_FILEMP3OGG_TYPE	*/
-				G_TYPE_STRING,		/* COLUMN_FILEMP3OGG_BITRATE	*/
-				G_TYPE_STRING,		/* COLUMN_FILEMP3OGG_NEWBITRATE	*/
-				G_TYPE_STRING,		/* COLUMN_FILEMP3OGG_SIZE	*/
-				G_TYPE_STRING,		/* COLUMN_FILEMP3OGG_TIME	*/
-				G_TYPE_STRING,		/* COLUMN_FILEMP3OGG_NAME	*/
+	gtk_list_store_new (	COLUMN_FILE_NUM,	/* TOTAL NUMBER				*/
+				G_TYPE_STRING,		/* COLUMN_FILEMP3OGG_TYPE		*/
+				G_TYPE_STRING,		/* COLUMN_FILEMP3OGG_BITRATE		*/
+				G_TYPE_STRING,		/* COLUMN_FILEMP3OGG_NEWBITRATE		*/
+				G_TYPE_STRING,		/* COLUMN_FILEMP3OGG_SIZE		*/
+				G_TYPE_STRING,		/* COLUMN_FILEMP3OGG_TIME		*/
+				G_TYPE_STRING,		/* COLUMN_FILEMP3OGG_NAME		*/
+				// GDK_TYPE_COLOR,		/* COLUMN_FILEMP3OGG_COLOR		*/
 				G_TYPE_POINTER /* COLUMN_FILEMP3OGG_POINTER_STRUCT	*/
 			 );
 	var_file_mp3ogg.Adr_Tree_Model = model = GTK_TREE_MODEL (store);
 	var_file_mp3ogg.Adr_TreeView =
 	treeview = gtk_tree_view_new_with_model (model);
-	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
+	// gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
 	gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)), GTK_SELECTION_MULTIPLE);	// GTK_SELECTION_BROWSE MULTIPLE
 	g_object_unref (model);
 	gtk_container_add (GTK_CONTAINER (widget), treeview);

xcfa-4.2.8.tar.gz/src/file_mp3ogg_conv.c -> xcfa-5.0.2.tar.gz/src/file_mp3ogg_conv.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : file_mp3ogg_conv.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -30,11 +30,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <glib.h>
 #include <glib/gstdio.h>
@@ -58,13 +53,15 @@
 #include "prg_init.h"
 #include "win_scan.h"
 #include "win_info.h"
-#include "popup_systray.h"
+#include "popup.h"
 #include "file.h"
 
 
 
 
 
+gboolean	BoolErrMplayer = FALSE;
+gboolean	BoolErrSox = FALSE;
 
 // 
 // 
@@ -75,6 +72,7 @@
 	PARAM_FILELC	param_filelc;
 	CONV_FIC_MP3OGG	*PConvMp3Ogg;
 	gint		pos;
+	gchar		**PtrTabArgs = NULL;
 	
 	g_print ("\n");
 	g_print ("!-------------------------------------------------!\n");
@@ -85,18 +83,18 @@
 	conv.bool_thread_conv = TRUE;
 
 	list = g_list_first (entetefile);
-	while (FALSE == conv.bool_stop && list) {
+	while( NULL != list && FALSE == conv.bool_stop ) {
+
 		if (NULL != (detail = (DETAIL *)list->data)) {
-			
+
 			if (FILE_IS_OGG != detail->type_infosong_file_is && FILE_IS_MP3 != detail->type_infosong_file_is) {
 				list = g_list_next(list);
 				continue;
 			}
-			if (FALSE == detail->TypeMp3Ogg.BoolChanged) {
+			if( FALSE == detail->BoolChanged ) {
 				list = g_list_next(list);
 				continue;
 			}
-			
 			PConvMp3Ogg = detail->PConvMp3Ogg;
 			
 			if (FILE_IS_MP3 == detail->type_infosong_file_is) {
@@ -108,67 +106,84 @@
 				* SOURCE MP3 -> DESTINATION WAV
 				* ------------------------------------
 				*/
-				g_print ("SOURCE MP3<%s>\n", detail->namefile);
-				g_print ("DEST WAV<%s>\n", PConvMp3Ogg->destwav);
-
-				pos = filelc_get_command_line_nice ();
-				conv.ArgConv [ pos++ ] = g_strdup ("mplayer");
-				conv.ArgConv [ pos++ ] = g_strdup ("-nojoystick");
-				conv.ArgConv [ pos++ ] = g_strdup ("-nolirc");
-				conv.ArgConv [ pos++ ] = g_strdup_printf ("%s", detail->namefile);
-				conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-				conv.ArgConv [ pos++ ] = g_strdup ("pcm");
-				conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-				conv.ArgConv [ pos++ ] = g_strdup_printf ("pcm:file=%s", PConvMp3Ogg->destwav);
-				conv.ArgConv [ pos++ ] = g_strdup ("-af");
-				conv.ArgConv [ pos++ ] = g_strdup ("channels=2");
-				conv.ArgConv [ pos++ ] = g_strdup ("-srate");
-				conv.ArgConv [ pos++ ] = g_strdup ("44100");
-				conv.ArgConv [ pos++ ] = NULL;
+				if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
+					g_print ("SOURCE MP3<%s>\n", detail->namefile);
+					g_print ("DEST WAV<%s>\n", PConvMp3Ogg->destwav);
+				}
 				
-				conv_to_convert (FALSE, MPLAYER_WAV_TO_WAV, "MPLAYER_WAV_TO_WAV");
-				filelc_get_command_line_remove ();
+				PtrTabArgs = filelc_AllocTabArgs();
+				pos = 3;
+				PtrTabArgs [ pos++ ] = g_strdup ("mplayer");
+				PtrTabArgs [ pos++ ] = g_strdup ("-nojoystick");
+				PtrTabArgs [ pos++ ] = g_strdup ("-nolirc");
+				PtrTabArgs [ pos++ ] = g_strdup ("-novideo");
+				PtrTabArgs [ pos++ ] = g_strdup_printf ("%s", detail->namefile);
+				PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+				PtrTabArgs [ pos++ ] = g_strdup ("pcm");
+				PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+				PtrTabArgs [ pos++ ] = g_strdup_printf ("pcm:file=%s", PConvMp3Ogg->destwav);
+				PtrTabArgs [ pos++ ] = g_strdup ("-af");
+				PtrTabArgs [ pos++ ] = g_strdup ("channels=2");
+				PtrTabArgs [ pos++ ] = g_strdup ("-srate");
+				PtrTabArgs [ pos++ ] = g_strdup ("44100");
+				PtrTabArgs [ pos++ ] = NULL;
+				conv_to_convert( PtrTabArgs, FALSE, MPLAYER_WAV_TO_WAV, "MPLAYER_WAV_TO_WAV");
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 				
-				/* SOX wav TO soxwav
-				* RENAME soxwav TO wav
-				*/
-				if (InfoMp3->mpeg_is != MPEG_1) {
-
-					g_print ("SOURCE MP3<%s>\n", PConvMp3Ogg->destwav);
-					g_print ("DEST WAV<%s>\n", PConvMp3Ogg->destsox);
-					conv_with_sox_get_param( PConvMp3Ogg->destwav, PConvMp3Ogg->destsox, "44100", "2", "16" );
-					conv_to_convert (FALSE, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
-					filelc_get_command_line_remove ();
-					conv_copy_src_to_dest (PConvMp3Ogg->destsox, PConvMp3Ogg->destwav);
+				if( TRUE == libutils_test_file_exist( PConvMp3Ogg->destwav )) {
+					
+					/* SOX wav TO soxwav
+					* RENAME soxwav TO wav
+					*/
+					if (InfoMp3->mpeg_is != MPEG_1) {
+
+						if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
+							g_print ("SOURCE MP3<%s>\n", PConvMp3Ogg->destwav);
+							g_print ("DEST WAV<%s>\n", PConvMp3Ogg->destsox);
+						}
+						PtrTabArgs = conv_with_sox_get_param( PConvMp3Ogg->destwav, PConvMp3Ogg->destsox, "44100", "2", "16" );
+						conv_to_convert( PtrTabArgs, FALSE, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
+						PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+						conv_copy_src_to_dest (PConvMp3Ogg->destsox, PConvMp3Ogg->destwav);
 					
-					// conv.encode_completed ++;
+						// conv.encode_completed ++;
+					}
+					
+					if( TRUE == libutils_test_file_exist( PConvMp3Ogg->destwav ) && libutils_get_size_file( PConvMp3Ogg->destwav ) > 0 ) {
+						/* lame SOURCE WAV -> DESTINATION MP3
+						* ----------------------------------
+						*/
+						if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
+							g_print ("SOURCE WAV%s>\n", PConvMp3Ogg->destwav);
+							g_print ("DEST MP3<%s>\n", PConvMp3Ogg->destmp3);
+						}
+						param_filelc.type_conv = LAME_WAV_TO_MP3;
+						param_filelc.With_CommandLineUser = FALSE;
+						param_filelc.filesrc = PConvMp3Ogg->destwav;
+						param_filelc.filedest = PConvMp3Ogg->destmp3;
+						param_filelc.tags = InfoMp3->tags;
+						param_filelc.cdrom = NULL;
+						param_filelc.num_track = NULL;
+						param_filelc.BoolSetBitrate = TRUE;
+						param_filelc.PtrStrBitrate = popup_get_param_mp3( detail->Mp3_Debit, detail->Mp3_Mode );
+
+						PtrTabArgs = filelc_get_command_line (&param_filelc);
+						conv_to_convert( PtrTabArgs, FALSE, LAME_WAV_TO_MP3, "LAME_WAV_TO_MP3");
+						PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+
+						/* copy SOURCE MP3 -> DESTINATION MP3
+						* ----------------------------------
+						*/
+						if (FALSE == conv.bool_stop) {
+							conv_copy_src_to_dest (PConvMp3Ogg->destmp3, PConvMp3Ogg->destfile);
+						}
+					}
+					else {
+						BoolErrSox = TRUE;
+					}
 				}
-
-				/* lame SOURCE WAV -> DESTINATION MP3
-				* ----------------------------------
-				*/
-				g_print ("SOURCE WAV%s>\n", PConvMp3Ogg->destwav);
-				g_print ("DEST MP3<%s>\n", PConvMp3Ogg->destmp3);
-
-				param_filelc.type_conv = LAME_WAV_TO_MP3;
-				param_filelc.With_CommandLineUser = FALSE;
-				param_filelc.filesrc = PConvMp3Ogg->destwav;
-				param_filelc.filedest = PConvMp3Ogg->destmp3;
-				param_filelc.tags = InfoMp3->tags;
-				param_filelc.cdrom = NULL;
-				param_filelc.num_track = NULL;
-				param_filelc.BoolSetBitrate = TRUE;
-				param_filelc.PtrStrBitrate = options_get_params (LAME_WAV_TO_MP3, detail);
-
-				filelc_get_command_line (&param_filelc);
-				conv_to_convert (FALSE, LAME_WAV_TO_MP3, "LAME_WAV_TO_MP3");
-				filelc_get_command_line_remove ();
-
-				/* copy SOURCE MP3 -> DESTINATION MP3
-				* ----------------------------------
-				*/
-				if (FALSE == conv.bool_stop) {
-					conv_copy_src_to_dest (PConvMp3Ogg->destmp3, PConvMp3Ogg->destfile);
+				else {
+					BoolErrMplayer = TRUE;
 				}
 			}
 			else if (FILE_IS_OGG == detail->type_infosong_file_is) {
@@ -178,52 +193,60 @@
 				/* ogg123 SOURCE OGG -> DESTINATION WAV
 				* ------------------------------------
 				*/
-				g_print ("SOURCE MP3<%s>\n", detail->namefile);
-				g_print ("DEST WAV<%s>\n", PConvMp3Ogg->destwav);
-			
-				pos = filelc_get_command_line_nice ();
-				conv.ArgConv [ pos++ ] = g_strdup ("mplayer");
-				conv.ArgConv [ pos++ ] = g_strdup ("-nojoystick");
-				conv.ArgConv [ pos++ ] = g_strdup ("-nolirc");
-				conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-				conv.ArgConv [ pos++ ] = g_strdup ("pcm");
-				conv.ArgConv [ pos++ ] = g_strdup_printf ("%s", detail->namefile);
-				conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-				conv.ArgConv [ pos++ ] = g_strdup_printf ("pcm:file=%s", PConvMp3Ogg->destwav);
-				conv.ArgConv [ pos++ ] = g_strdup ("-af");
-				conv.ArgConv [ pos++ ] = g_strdup ("channels=2");
-				conv.ArgConv [ pos++ ] = g_strdup ("-srate");
-				conv.ArgConv [ pos++ ] = g_strdup ("44100");
-				conv.ArgConv [ pos++ ] = NULL;
-
-				conv_to_convert (param_filelc.With_CommandLineUser, MPLAYER_OGG_TO_WAV, "MPLAYER_OGG_TO_WAV");
-				filelc_get_command_line_remove ();
+				if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
+					g_print ("SOURCE MP3<%s>\n", detail->namefile);
+					g_print ("DEST WAV<%s>\n", PConvMp3Ogg->destwav);
+				}
+				PtrTabArgs = filelc_AllocTabArgs();
+				pos = 3;
+				PtrTabArgs [ pos++ ] = g_strdup ("mplayer");
+				PtrTabArgs [ pos++ ] = g_strdup ("-nojoystick");
+				PtrTabArgs [ pos++ ] = g_strdup ("-nolirc");
+				PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+				PtrTabArgs [ pos++ ] = g_strdup ("pcm");
+				PtrTabArgs [ pos++ ] = g_strdup_printf ("%s", detail->namefile);
+				PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+				PtrTabArgs [ pos++ ] = g_strdup_printf ("pcm:file=%s", PConvMp3Ogg->destwav);
+				PtrTabArgs [ pos++ ] = g_strdup ("-af");
+				PtrTabArgs [ pos++ ] = g_strdup ("channels=2");
+				PtrTabArgs [ pos++ ] = g_strdup ("-srate");
+				PtrTabArgs [ pos++ ] = g_strdup ("44100");
+				PtrTabArgs [ pos++ ] = NULL;
+				conv_to_convert( PtrTabArgs, param_filelc.With_CommandLineUser, MPLAYER_OGG_TO_WAV, "MPLAYER_OGG_TO_WAV");
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 								
-				/* oggenc SOURCE WAV -> DESTINATION OGG
-				* ----------------------------------
-				*/
-				g_print ("SOURCE WAV%s>\n", PConvMp3Ogg->destwav);
-				g_print ("DEST MP3<%s>\n", PConvMp3Ogg->destogg);
-
-				param_filelc.type_conv = OGGENC_WAV_TO_OGG;
-				param_filelc.With_CommandLineUser = FALSE;
-				param_filelc.filesrc = PConvMp3Ogg->destwav;
-				param_filelc.filedest = PConvMp3Ogg->destogg;
-				param_filelc.tags = InfoOgg->tags;
-				param_filelc.cdrom = NULL;
-				param_filelc.num_track = NULL;
-				param_filelc.BoolSetBitrate = TRUE;
-				param_filelc.PtrStrBitrate = options_get_params (OGGENC_WAV_TO_OGG, detail);
-
-				filelc_get_command_line (&param_filelc);
-				conv_to_convert (FALSE, OGGENC_WAV_TO_OGG, "OGGENC_WAV_TO_OGG");
-				filelc_get_command_line_remove ();
+				if( TRUE == libutils_test_file_exist( PConvMp3Ogg->destwav ) && libutils_get_size_file( PConvMp3Ogg->destwav ) > 0 ) {
+					
+					/* oggenc SOURCE WAV -> DESTINATION OGG
+					* ----------------------------------
+					*/
+					if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
+						g_print ("SOURCE WAV%s>\n", PConvMp3Ogg->destwav);
+						g_print ("DEST MP3<%s>\n", PConvMp3Ogg->destogg);
+					}
+					param_filelc.type_conv = OGGENC_WAV_TO_OGG;
+					param_filelc.With_CommandLineUser = FALSE;
+					param_filelc.filesrc = PConvMp3Ogg->destwav;
+					param_filelc.filedest = PConvMp3Ogg->destogg;
+					param_filelc.tags = InfoOgg->tags;
+					param_filelc.cdrom = NULL;
+					param_filelc.num_track = NULL;
+					param_filelc.BoolSetBitrate = TRUE;
+					param_filelc.PtrStrBitrate = popup_get_param_ogg( detail->Ogg_Debit, detail->Ogg_Managed, detail->Ogg_Downmix );
+
+					PtrTabArgs = filelc_get_command_line (&param_filelc);
+					conv_to_convert( PtrTabArgs, FALSE, OGGENC_WAV_TO_OGG, "OGGENC_WAV_TO_OGG");
+					PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 				
-				/* copy SOURCE OGG -> DESTINATION MP3
-				* ----------------------------------
-				*/
-				if (FALSE == conv.bool_stop) {
-					conv_copy_src_to_dest (PConvMp3Ogg->destogg, PConvMp3Ogg->destfile);
+					/* copy SOURCE OGG -> DESTINATION MP3
+					* ----------------------------------
+					*/
+					if (FALSE == conv.bool_stop) {
+						conv_copy_src_to_dest (PConvMp3Ogg->destogg, PConvMp3Ogg->destfile);
+					}
+				}
+				else {
+					BoolErrMplayer = TRUE;
 				}
 			}
 
@@ -255,7 +278,7 @@
 		conv.bool_percent_conv = FALSE;
 	}
 	
-	else if (FALSE == conv.bool_thread_conv) {
+	else if( FALSE == conv.bool_thread_conv ) {
 		
 		GList *list = NULL;
 		DETAIL *detail = NULL;
@@ -281,6 +304,14 @@
 						PConvMp3Ogg = detail->PConvMp3Ogg = NULL;
 					}
 				}
+				if( FILE_IS_OGG == detail->type_infosong_file_is )
+				{
+					detail->BoolChanged = ( -1 != detail->Ogg_Debit || -1 != detail->Ogg_Managed || -1 != detail->Ogg_Downmix );
+				}
+				if( FILE_IS_MP3 == detail->type_infosong_file_is )
+				{
+					detail->BoolChanged = ( -1 != detail->Mp3_Debit || -1 != detail->Mp3_Mode );
+				}
 			}
 			list = g_list_next(list);
 		}
@@ -290,16 +321,38 @@
 			conv.TmpRep = libutils_remove_temporary_rep (conv.TmpRep);
 		}
 
-		PopupSystray_set_BoolMainAction (FALSE);
-
-		gtk_timeout_remove (conv.handler_timeout_conv);
+		g_source_remove (conv.handler_timeout_conv);
 		WindScan_close ();
 		FileMp3Ogg_set_flag_buttons ();
 
 		if (FALSE == conv.bool_stop) {
-			NotifySend_msg (_("XCFA: Modification bitrate"), _("Ok"), conv.bool_stop);
+			NotifySend_msg (_("XCFA: Bitrate change"), _("Ok"), conv.bool_stop);
 		} else {
-			NotifySend_msg (_("XCFA: Modification bitrate"), _("Arret par l'utilisateur"), conv.bool_stop);
+			NotifySend_msg (_("XCFA: Bitrate change"), _("Stop by user"), conv.bool_stop);
+		}
+		if( TRUE == BoolErrMplayer ) {
+			wind_info_init (
+				WindMain,
+				_("Error from MPLAYER !"),
+				_("You can enable XCFA command line with: "),
+				 "\n",
+				_("$ xcfa -verbose"),
+				 "\n",
+				_("to see the type of error returned by mplayer."),
+			 	"");
+		
+		}
+		else if( TRUE == BoolErrSox ) {
+			wind_info_init (
+				WindMain,
+				_("Error from SOX !"),
+				_("You can enable XCFA command line with: "),
+				 "\n",
+				_("$ xcfa -verbose"),
+				 "\n",
+				_("to see the type of error returned by sox."),
+			 	"");
+		
 		}
 	}
 
@@ -313,10 +366,10 @@
 	DETAIL *detail = NULL;
 	CONV_FIC_MP3OGG	*PConvMp3Ogg;
 
-	// INIT DOSSIER TEMPORAIRE
-	if (NULL == conv.TmpRep) {
+	// Create tmp rep
+	if( NULL == conv.TmpRep )
 		conv.TmpRep = libutils_create_temporary_rep (Config.PathnameTMP, PATH_TMP_XCFA_AUDIOFILEMP3OGG);
-	}
+
 
 	list = g_list_first (entetefile);
 	while (list) {
@@ -327,7 +380,7 @@
 				detail->PConvMp3Ogg = (CONV_FIC_MP3OGG *)g_malloc0 (sizeof (CONV_FIC_MP3OGG));
 				PConvMp3Ogg = detail->PConvMp3Ogg;
 				
-				if (TRUE == detail->TypeMp3Ogg.BoolChanged) {
+				if( TRUE == detail->BoolChanged ) {
 
 					conv.total_convert += 3;
 
@@ -366,7 +419,7 @@
 	list = g_list_first (entetefile);
 	while (list) {
 		if (NULL != (detail = (DETAIL *)list->data)) {
-			if (TRUE == detail->TypeMp3Ogg.BoolChanged) {
+			if( TRUE == detail->BoolChanged ) {
 				if (FILE_IS_MP3 == detail->type_infosong_file_is)	bool_mp3 = TRUE;
 				else if (FILE_IS_OGG == detail->type_infosong_file_is)	bool_ogg = TRUE;
 			}
@@ -376,7 +429,7 @@
 
 	if (bool_mp3 && bool_ogg) {
 		if (FALSE == PrgInit.bool_mplayer || FALSE == PrgInit.bool_lame || FALSE == PrgInit.bool_oggenc)
-		str = g_strdup_printf (_(" ATTENTION: Il faut installer %s%s%s"),
+		str = g_strdup_printf (_(" WARNING : you need to install %s%s%s"),
 					FALSE == PrgInit.bool_mplayer ? " \n MPLAYER" : "",
 					FALSE == PrgInit.bool_lame ? " \n LAME" : "",
 					FALSE == PrgInit.bool_oggenc ? " \n OGGENC" : ""
@@ -384,19 +437,20 @@
 	}
 	else if (bool_mp3) {
 		if (FALSE == PrgInit.bool_mplayer || FALSE == PrgInit.bool_lame)
-		str = g_strdup_printf (_(" ATTENTION: Il faut installer %s%s"),
+		str = g_strdup_printf (_(" WARNING : you need to install %s%s"),
 					FALSE == PrgInit.bool_mplayer ? " \n MPLAYER" : "",
 					FALSE == PrgInit.bool_lame ? " \n LAME" : ""
 					);
 	}
 	else if (bool_ogg) {
 		if (FALSE == PrgInit.bool_oggenc)
-		str = g_strdup_printf (_(" ATTENTION: Il faut installer %s"),
+		str = g_strdup_printf (_(" WARNING : you need to install %s"),
 					FALSE == PrgInit.bool_oggenc ? " \n OGGENC" : ""
 					);
 	}
 	if (NULL != str) {
-		wininfo_create (
+		wind_info_init (
+			WindMain,
 			_("Package NOT FOUND !"),
 			str,
 		 	"");
@@ -417,16 +471,22 @@
 
 	if (TRUE == filemp3oggconv_is_regul_ok ()) {
 		
-		WindScan_open ("Conversions bitrate", WINDSCAN_PULSE);
+		// WindScan_open ("Conversions bitrate", WINDSCAN_PULSE);
+		wind_scan_init(
+			WindMain,
+			"Conversions bitrate",
+			WINDSCAN_PULSE
+			);
 		WindScan_set_label ("Conversions bitrate ...");
 	
-		PopupSystray_set_BoolMainAction (TRUE);
-	
+		BoolErrMplayer = FALSE;
+		BoolErrSox = FALSE;
+		
 		conv_reset_struct (WindScan_close_request);
 		filemp3oggconv_set_flags_before_conversion ();
 		conv.bool_thread_conv = TRUE;
 		pthread_create (&nmr_tid, NULL ,(void *)filemp3oggconv_thread, (void *)NULL);
- 		conv.handler_timeout_conv = gtk_timeout_add (100, filemp3oggconv_timeout, 0);
+ 		conv.handler_timeout_conv = g_timeout_add (100, filemp3oggconv_timeout, 0);
 	}
 }

xcfa-4.2.8.tar.gz/src/file_scan_db.c -> xcfa-5.0.2.tar.gz/src/file_scan_db.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : file_scan_db.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -30,11 +30,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <string.h>
@@ -50,7 +45,6 @@
 #include "configuser.h"
 #include "get_info.h"
 #include "win_scan.h"
-#include "popup_systray.h"
 #include "file.h"
 
 
@@ -206,8 +200,7 @@
 	
 	if (VarFileScanDB.bool_thread_end == TRUE) {
 		if (FALSE == VarFileScanDB.BoolWindScanUsed) WindScan_close ();
-		PopupSystray_set_BoolMainAction (FALSE);
-		gtk_timeout_remove (VarFileScanDB.handler_timeout);
+		g_source_remove (VarFileScanDB.handler_timeout);
 	}
 	
 	return (TRUE);
@@ -228,10 +221,14 @@
 		VarFileScanDB.bool_update = FALSE;
 		VarFileScanDB.MessUser = NULL;
 		
-		PopupSystray_set_BoolMainAction (TRUE);
-	
-		VarFileScanDB.BoolWindScanUsed = WindScan_open ("Scan dBFS", WINDSCAN_PULSE);
-		VarFileScanDB.handler_timeout = gtk_timeout_add (50, FileScanDB_timeout, 0);
+		// VarFileScanDB.BoolWindScanUsed = WindScan_open ("Scan dBFS", WINDSCAN_PULSE);
+		VarFileScanDB.BoolWindScanUsed =
+			wind_scan_init(
+				WindMain,
+				"Scan dBFS",
+				WINDSCAN_PULSE
+				);
+		VarFileScanDB.handler_timeout = g_timeout_add (50, FileScanDB_timeout, 0);
 		pthread_create (&VarFileScanDB.nmr_tid, NULL ,(void *)FileScanDB_thread, (void *)NULL);
 	}
 }

xcfa-4.2.8.tar.gz/src/file_tags.c -> xcfa-5.0.2.tar.gz/src/file_tags.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : file_tags.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -35,11 +35,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <stdio.h>
@@ -62,6 +57,7 @@
 #include "file.h"
 #include <taglib/tag_c.h>
 #include "statusbar.h"
+#include "popup.h"
 
 
 
@@ -356,20 +352,18 @@
 	gtk_spin_button_set_value (GTK_SPIN_BUTTON (var_file_tags.Adr_spinbutton_tag_track), (gdouble)tags->IntNumber);
 	FileTags_bool_changed_OK = TRUE;
 }
-// 
-// 
-void FileTags_set_combobox_tag_genre (void)
+void FileTags_set_combobox_tag_genre( void )
 {
 	TAGS *tags = FileTags_get_tag (NULL);
-	
-	if (NULL == var_file_tags.Adr_combobox_tag_genre) return;
-	if (NULL == tags) return;
-	
+	// tags->Genre = g_strdup( FilePopupGenre.name );
+	// tags->IntGenre = tags_get_genre_by_value( FilePopupGenre.name );
 	FileTags_bool_changed_OK = FALSE;
-
-	gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_tags.Adr_combobox_tag_genre), tags_get_elements_combobox (tags->IntGenre));
+	gtk_entry_set_text( GTK_ENTRY(GLADE_GET_OBJECT("entry_tag_genre_file")), tags->Genre ? tags->Genre : "" );
+	printf(">tags->Genre = %s\n", tags->Genre );
+	printf(">tags->IntGenre = %d\n", tags->IntGenre );
 	FileTags_bool_changed_OK = TRUE;
 }
+
 // CETTE FONCTION INDIQUE QU UNE MODIFICATION DE TAG A EU LIEU
 // FLAG MODIFIE: : LA COLONNE 'TYPE' EST EN ROUGE GRAS
 // APRES UNE SAUVEGARDE : COLONNE 'TYPE' EST EN COULEUR NORMALE
@@ -435,7 +429,6 @@
 	gchar *str = NULL;
 	gint changed = 0;
 	
-	
 	if (NULL == var_file_tags.Adr_label_tag_change) return;
 	tags = FileTags_get_tag (NULL);
 	gtk_widget_set_sensitive (GTK_WIDGET (var_file_tags.Adr_table_tag), tags ? TRUE : FALSE);
@@ -496,12 +489,29 @@
 				switch (TYPE_TAG) {
 				case TAG_GENRE :
 					if (NULL != (tags = FileTags_get_tag (detail))) {
-						g_free (tags->Genre);
-						tags->Genre = NULL;
-						tags->Genre = g_strdup ((gchar *)gtk_combo_box_get_active_text (var_file_tags.Adr_combobox_tag_genre));
-						tags->IntGenre = tags_get_num_combobox ((gint)gtk_combo_box_get_active (var_file_tags.Adr_combobox_tag_genre));
-						tags_set_flag_modification (tags, TRUE);
-						FileTags_set_label_tag_change ();
+						if( TRUE == FilePopupGenre.BoolFromPopup ) {
+							printf("TRUE == FilePopupGenre.BoolFromPopup\n");
+							if( tags->Genre )
+								g_free (tags->Genre);
+							tags->Genre = NULL;
+							tags->Genre = g_strdup( FilePopupGenre.name );
+							tags->IntGenre = tags_get_genre_by_value( FilePopupGenre.name );
+							gtk_entry_set_text( GTK_ENTRY(GLADE_GET_OBJECT("entry_tag_genre_file")), FilePopupGenre.name );
+							if( TRUE == FileTags_bool_changed_OK )
+								tags_set_flag_modification (tags, TRUE);
+							FileTags_set_label_tag_change ();
+						}
+						else {
+							printf("FALSE == FilePopupGenre.BoolFromPopup\n");
+							if( tags->Genre )
+								g_free (tags->Genre);
+							tags->Genre = NULL;
+							tags->Genre = g_strdup( (gchar *)gtk_entry_get_text( GTK_ENTRY(GLADE_GET_OBJECT("entry_tag_genre_file")) ));
+							tags->IntGenre = tags_get_genre_by_value( tags->Genre );
+							if( TRUE == FileTags_bool_changed_OK )
+								tags_set_flag_modification (tags, TRUE);
+							FileTags_set_label_tag_change ();
+						}
 					}
 					break;
 				case TAG_TRACK :
@@ -654,24 +664,64 @@
 	if (FALSE == FileTags_bool_changed_OK) return;
 	FileTags_changed_all_tags (TAG_YEAR);
 }
-// 
-// 
-void on_combobox_tag_genre_file_realize (GtkWidget *widget, gpointer user_data)
+
+#define _CONTACT_NAME_	0
+void on_entry_tag_genre_file_changed( GtkEditable *editable, gpointer user_data )
 {
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-	tags_set_elements_combobox (widget);
-	gtk_combo_box_set_wrap_width (GTK_COMBO_BOX (widget), 4);
-	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
-	var_file_tags.Adr_combobox_tag_genre = GTK_COMBO_BOX (widget);
+	gchar	*PtrEntry = NULL;
+	gint	NumEntry = -1;
+	
+	if( FALSE == FilePopupGenre.BoolFromPopup ) {
+		PRINT_FUNC_LF();
+		PtrEntry = (gchar *)gtk_entry_get_text( GTK_ENTRY(GLADE_GET_OBJECT("entry_tag_genre_file")));
+		NumEntry = tags_get_genre_by_value( PtrEntry );
+		if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
+			g_print( "\tPtrEntry = %s\n", PtrEntry );
+			g_print( "\tNumEntry = %d\n", NumEntry);
+		}
+		FileTags_changed_all_tags (TAG_GENRE);
+		// cd_expander_set_genre( NumEntry, PtrEntry );
+	}
 }
-// 
-// 
-void on_combobox_tag_genre_file_changed (GtkComboBox *combobox, gpointer user_data)
+/**
+gboolean on_match_select_file(GtkEntryCompletion *widget, GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data)
+{ 
+	if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
+		GValue value = {0, };
+		gtk_tree_model_get_value(model, iter, _CONTACT_NAME_, &value);
+		g_print( "You have selected %s\n", g_value_get_string(&value) );
+		g_value_unset(&value);
+	}
+	return FALSE;
+} 
+*/
+void on_entry_tag_genre_file_realize( GtkWidget *widget, gpointer user_data )
 {
-	if (NULL == var_file_tags.Adr_combobox_tag_genre) return;
-	if (FALSE == FileTags_bool_changed_OK) return;
-	FileTags_changed_all_tags (TAG_GENRE);
+	STRUCT_TAGS_FILE_MP3	*Contact;
+	GtkEntryCompletion		*completion;
+	GtkListStore			*model;
+	GtkTreeIter				iter;
+	
+	// set up completion
+	completion = gtk_entry_completion_new();
+	gtk_entry_completion_set_text_column( completion, _CONTACT_NAME_ );
+	gtk_entry_set_completion( GTK_ENTRY(widget), completion );
+	// g_signal_connect( G_OBJECT(completion), "match-selected", G_CALLBACK(on_match_select_file), NULL );
+	g_signal_connect( G_OBJECT(widget), "changed", G_CALLBACK(on_entry_tag_genre_file_changed), widget );
+	model = gtk_list_store_new( 1, G_TYPE_STRING );
+	for( Contact = StructTagsFileMp3; Contact && Contact->name; Contact++ ) {
+		gtk_list_store_append( model, &iter );
+		gtk_list_store_set( model, &iter, _CONTACT_NAME_, Contact->name, -1 );
+	}
+	gtk_entry_completion_set_model( completion, GTK_TREE_MODEL(model) );
+}
+
+
+void on_button_tag_call_popup_file_clicked( GtkButton *button, gpointer user_data )
+{
+	popup_menu_file();
 }
+
 // 
 // 
 void on_spinbutton_tag_track_file_realize (GtkWidget *widget, gpointer user_data)
@@ -835,7 +885,7 @@
 			}
 			list = g_list_next (list);
 		}
-		gtk_tree_selection_unselect_all (var_file_tags.Adr_Line_Selected);
+		// gtk_tree_selection_unselect_all (var_file_tags.Adr_Line_Selected);
 	}
 	return (BoolPrint);
 }
@@ -845,39 +895,25 @@
 // FILE_IS_MPC
 // 
 // 
-void FileTags_affiche_glist (void)
+void FileTags_affiche_glist( void )
 {
 	DETAIL		*detail = NULL;
 	GList		*List = NULL;
-	GList		*FreegList = NULL;
 	GtkTreeIter	iter;
 	GtkAdjustment	*Adj = NULL;
 	gdouble		AdjValue;
-	gint		*TabInt = NULL;		// TABLEAU DES LIGNES EN SELECTION
-	gint		Cpt = 0;		// INDICE DANS LE TABLEAU
 	gint		Line = 0;		// LIGNE EN COURS
 	gchar		*NameDest = NULL;
+	gint		NumLineSelected = -1;
+	gboolean	BoolNumLineSelected = FALSE;
 	
 	// PRINT_FUNC_LF();
 	
-	// LIBERATION LIGNE(S) DU GLIST SI NECESSARE
-	// 
-	List = g_list_first (entetefile);
-	while (List) {
-		if (NULL != (detail = (DETAIL *)List->data) && TRUE == detail->BoolRemove) {
-			FreegList = List;
-			FreegList->data = NULL;
-			List = g_list_next (List);
-			entetefile = g_list_remove_link (entetefile, FreegList);
-			List = g_list_first (entetefile);
-			continue;
-		}
-		List = g_list_next (List);
-	}
-	
 	// RECUP SELECTION
 	// 
-	TabInt = libutils_get_tab_selected_line (var_file_tags.Adr_Line_Selected, var_file_tags.Adr_Tree_Model);
+	NumLineSelected = libutils_get_first_line_is_selected( var_file_tags.Adr_Line_Selected, var_file_tags.Adr_Tree_Model );
+
+	gtk_tree_selection_unselect_all (var_file_tags.Adr_Line_Selected);
 
 	// DELETE TREEVIEW
 	// 
@@ -890,7 +926,6 @@
 	
 	// AFFICHAGE DE LA LISTE
 	// 
-	Cpt = 0;
 	Line = 0;
 	List = g_list_first (entetefile);
 	while (List) {
@@ -901,7 +936,6 @@
 			 FILE_IS_OGG != detail->type_infosong_file_is &&
 			 FILE_IS_MPC != detail->type_infosong_file_is) {
 				List = g_list_next (List);
-				// Line ++;
 				continue;
 			}
 			
@@ -912,6 +946,7 @@
 						COLUMN_FILETAGS_TYPE,		tags_get_str_type_file_is (detail->type_infosong_file_is),
 						COLUMN_FILETAGS_TIME,		file_get_time (detail),
 						COLUMN_FILETAGS_NAME,		NameDest,
+						// COLUMN_FILETAGS_COLOR,		&YellowColor,
 						COLUMN_FILETAGS_POINTER_STRUCT,	detail,
 						-1);
 						
@@ -919,26 +954,28 @@
 			
 			// AFFICHE LES EVENTUELLES LIGNES EN SELECTION
 			// 
-			if (NULL != TabInt) {
-				if (Line == *(TabInt + Cpt)) {
-					gtk_tree_selection_select_iter (var_file_tags.Adr_Line_Selected, &iter);
-					Cpt ++;
-				}
-				Line ++;
+			if( NumLineSelected == Line ) {
+				gtk_tree_selection_select_iter (var_file_tags.Adr_Line_Selected, &iter);
+				BoolNumLineSelected = TRUE;
 			}
+			
+			Line ++;
 		}
 		List = g_list_next (List);
 	}
 	
 	// SUPPRESSON TABLEAU DES EVENTUELLES LIGNES EN SELECTION
 	// 
-	if (NULL != TabInt) {
-		g_free (TabInt);
-		TabInt = NULL;
-	}
-	else {
-		if (gtk_tree_model_get_iter_first (var_file_tags.Adr_Tree_Model, &iter))
+	
+	if( NumLineSelected == -1 ) {
+		if (gtk_tree_model_get_iter_first (var_file_tags.Adr_Tree_Model, &iter)) {
 			gtk_tree_selection_select_iter (var_file_tags.Adr_Line_Selected, &iter);
+			BoolNumLineSelected = TRUE;
+		}
+	}
+
+	if( NumLineSelected > 0 && NULL != entetefile && BoolNumLineSelected == FALSE ) {
+		gtk_tree_selection_select_iter (var_file_tags.Adr_Line_Selected, &iter);
 	}
 
 	// REAJUSTEMENT DE LA LISTE
@@ -978,7 +1015,7 @@
 		gtk_tree_selection_unselect_all (var_file_tags.Adr_Line_Selected);
 		gtk_tree_selection_select_all (var_file_tags.Adr_Line_Selected);
 	}
-	if (keys.keyval == GDK_Delete) {
+	if (keys.keyval == GDK_KEY_Delete) {
 		GtkTreeIter iter;
 		if (gtk_tree_model_get_iter_first (var_file_tags.Adr_Tree_Model, &iter)) {
 			on_file_button_del_file_clicked (NULL, NULL);
@@ -1007,8 +1044,11 @@
 	// return (FALSE);
 	// PRINT_FUNC_LF();
 		
-	// SI PAS DANS LE TREEVIEW
-	gdk_window_get_pointer (((GdkEventButton*)event)->window, &x, &y, &state);
+	/* Si pas de selection a cet endroit retour */
+	GdkDeviceManager *manager = gdk_display_get_device_manager( gdk_display_get_default() );
+	GdkDevice		 *device = gdk_device_manager_get_client_pointer( manager );
+	gdk_window_get_device_position( ((GdkEventButton*)event)->window, device, &x, &y, &state );
+	// gdk_window_get_pointer (((GdkEventButton*)event)->window, &x, &y, &state);
 	if (FALSE == gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW(treeview),
 					 x, y,
 					 &path, &column, &Pos_X, &Pos_Y)) {
@@ -1054,18 +1094,21 @@
 }
 // 
 // 
-static void FileTags_drag_data_received (GtkWidget	 *widget,
-					GdkDragContext *drag_context,
-					gint x,
-					gint y,
-					GtkSelectionData *data,
-					guint info,
-					guint time)
+static void FileTags_drag_data_received(
+					GtkWidget *widget,
+					GdkDragContext *context,
+					gint x,
+					gint y,
+					GtkSelectionData *data,
+					guint info,
+					guint time,
+					gpointer user_data)
 {
 	/* PRINT_FUNC_LF(); */
 /* Une copie ne peut aller vers elle meme !!! */
-	if (gtk_drag_get_source_widget(drag_context) != widget) {
-		dragndrop_list_drag_data (widget, (gchar *)data->data);
+	if (gtk_drag_get_source_widget(context) != widget) {
+		//dragndrop_list_drag_data (widget, (gchar *)data->data);
+		dragndrop_list_drag_data( widget, (gchar*)gtk_selection_data_get_data( data ));
 	}
 }
 // 
@@ -1107,7 +1150,8 @@
 
 			gtk_selection_data_set( selection_data,
 						// GDK_SELECTION_TYPE_STRING,
-						selection_data->target,
+						// selection_data->target,
+						GDK_POINTER_TO_ATOM(gtk_selection_data_get_data( selection_data )),
 						8,
 						(guchar *)text,
 						strlen( text )
@@ -1190,7 +1234,7 @@
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	// var_file_tags.Adr_ColumnFileWavNewHertz =
 	var_file_tags.Adr_ColumnFileTagsTime =
-	column = gtk_tree_view_column_new_with_attributes (_("Temps"),
+	column = gtk_tree_view_column_new_with_attributes (_("Time"),
 						 renderer,
 						 "markup", COLUMN_FILETAGS_TIME,
 						 NULL);
@@ -1206,9 +1250,10 @@
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	// var_file_tags.Adr_ColumnFileWavNewHertz =
 	var_file_tags.Adr_ColumnFileTagsName =
-	column = gtk_tree_view_column_new_with_attributes (_("Nom"),
+	column = gtk_tree_view_column_new_with_attributes (_("Name"),
 						 renderer,
 						 "markup", COLUMN_FILETAGS_NAME,
+						 // "background-gdk", COLUMN_FILETAGS_COLOR,
 						 NULL);
 	gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
 				 GTK_TREE_VIEW_COLUMN_FIXED);
@@ -1232,12 +1277,13 @@
 				G_TYPE_STRING,		// COLUMN_FILETAGS_TYPE
 				G_TYPE_STRING,		// COLUMN_FILETAGS_TIME
 				G_TYPE_STRING,		// COLUMN_FILETAGS_NAME
+				// GDK_TYPE_COLOR,		// COLUMN_FILETAGS_COLOR
 				G_TYPE_POINTER // COLUMN_FILETAGS_POINTER_STRUCT
 			 );
 	var_file_tags.Adr_Tree_Model = model = GTK_TREE_MODEL (store);
 	var_file_tags.Adr_TreeView =
 	treeview = gtk_tree_view_new_with_model (model);
-	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
+	// gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
 	gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)), GTK_SELECTION_MULTIPLE);	// GTK_SELECTION_BROWSE MULTIPLE
 	g_object_unref (model);
 	gtk_container_add (GTK_CONTAINER (widget), treeview);

xcfa-4.2.8.tar.gz/src/file_trash.c -> xcfa-5.0.2.tar.gz/src/file_trash.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : file_trash.h
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,7 +29,7 @@
 
 
 /*
-void main_trash (void )
+void filetrash_main_test_trash (void )
 {
 	GFile		*file = NULL;
 	
@@ -40,8 +40,7 @@
 	else {
 		g_print("TRASH OK\n");
 	}
-
- g_object_unref( file );
+	g_object_unref( file );
 }
 */
 
@@ -54,11 +53,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <glib/gstdio.h>
 #include <string.h>
@@ -107,172 +101,20 @@
 
 
 
-/*
-mv ./11\ Track_11.wav /home/cat/.Trash/11\ Track_11.wav
-
-Sous Ubuntu
-	$HOME/.Trash
-Kubuntu et Xubuntu
-	$HOME/.local/share/Trash/files
-
-*/
-
-
-
-/* #include <gio/gio.h>
- * 
- * gboolean g_file_trash (GFile *file, GCancellable *cancellable, GError **error);
- * 
- * 
- * 
-void filetrash_test (gchar *Name)
-{
-	GError *error;
-	g_file_trash ((GFile *)Name, NULL, &error);
-}
- * 
- * 
- */
- 
-
-
-// 
-// 
-gboolean filetrash_test_desktop_is_kde (void)
-{
-	FILE		*fp;
-#define MAX_CARS_KDE 255
-	gchar		buf [ MAX_CARS_KDE +1 ];
-	gboolean	BoolRet = FALSE;
-	gint		Dummy;
-	
-	/*
-	KDE_FULL_SESSION
-	*/
-	Dummy = system ("env | grep \"KDE_FULL_SESSION\" > /tmp/tst_kde_full_session.txt");
-	if ((fp = fopen ("/tmp/tst_kde_full_session.txt", "r")) != NULL) {
-		while (fgets (buf, MAX_CARS_KDE, fp) != NULL) {
-			if (strcmp (buf, "KDE_FULL_SESSION") == 0) {
-				if (strcmp (buf, "true") == 0 || strcmp (buf, "TRUE") == 0) {
-					BoolRet = TRUE;
-					break;
-				}
-			}
-		}
-		fclose (fp);
-	}
-	g_unlink ("/tmp/tst_kde_full_session.txt");
-	return (BoolRet);	
-}
-// 
-// 
-gboolean filetrash_move_to_trash (gchar *Name)
-{
-	gchar	*NameDest = NULL;
-	gchar	 *Ptr = NULL;
-	gchar	*LineCommand = NULL;
-	gint	Dummy;
-	
-	/*PRINT_FUNC_LF();*/
-	
-	if ((Ptr = strrchr (Name, '/')))
-		Ptr ++;
-	else	Ptr = Name;
-	
-	NameDest = g_strdup_printf ("%s/%s", filetrash_get_trash (), Ptr);
-	
-	LineCommand = g_strdup_printf ("mv -f \"%s\" \"%s\"", Name, NameDest);
-	g_print ("To Trash:\n\t%s\n", LineCommand);
-	Dummy = system (LineCommand);
-	
-	g_free (LineCommand);
-	LineCommand = NULL;
-	
-	g_free (NameDest);
-	NameDest = NULL;
-	
-	return (TRUE);
-}
-// 
-// 
-gchar *filetrash_get_trash (void)
-{
-	if (var_filetrash.Bool_kde_full_session == TRUE)
-		g_sprintf (var_filetrash.PathNameTrash, "%s/.local/share/Trash/files", getenv ("HOME"));
-	else	g_sprintf (var_filetrash.PathNameTrash, "%s/.Trash", getenv ("HOME"));
-
-	return ((gchar *)var_filetrash.PathNameTrash);
-}
 // 
 // 
-void filetrash_test_trash_is_ok (void)
+gboolean filetrash_move_to_trash( gchar *p_Name )
 {
-	gboolean BoolExistTrashOLD;
-	gboolean BoolExistTrashNEW;
-	gchar *Path = NULL;
-	gchar *StrTrash = NULL;
-	gint Dummy;
-	
-	if( TRUE == OptionsCommandLine.BoolVerboseMode )
-		g_print ("\n[ Trash ]\n");
+	GFile		*src_file = NULL;
+	gboolean	bool_ret = FALSE;
 	
-	if (var_filetrash.BoolTrashIsOk == TRUE) return;
-	var_filetrash.BoolTrashIsOk = TRUE;
-	var_filetrash.Bool_kde_full_session = filetrash_test_desktop_is_kde ();
-	
-	if( TRUE == OptionsCommandLine.BoolVerboseMode )
-		g_print ("KDE SESSION : %s\n", var_filetrash.Bool_kde_full_session ? "TRUE" : "FALSE");
-
-	Path = g_strdup_printf ("%s/.Trash", getenv ("HOME"));
-	BoolExistTrashOLD = libutils_test_dir_exist (Path);
-	if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
-		if (BoolExistTrashOLD == TRUE)
-			g_print ("EXIST ......: %s\n", Path);
-		else	g_print ("NOT EXIST ..: %s\n", Path);
-	}
-	g_free (Path);
-	Path = NULL;
-	
-	Path = g_strdup_printf ("%s/.local/share/Trash/files", getenv ("HOME"));
-	BoolExistTrashNEW = libutils_test_dir_exist (Path);
-	if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
-		if (BoolExistTrashNEW == TRUE)
-			g_print ("EXIST ......: %s\n", Path);
-		else	g_print ("NOT EXIST ..: %s\n", Path);
-	}
-	g_free (Path);
-	Path = NULL;
-	
-	// SI SESSION KDE
-	if (var_filetrash.Bool_kde_full_session == TRUE) {
-		if (BoolExistTrashNEW == FALSE) {
-			StrTrash = g_strdup_printf ("mkdir -p %s", filetrash_get_trash ());
-			Dummy = system (StrTrash);
-			g_free (StrTrash);
-			StrTrash = NULL;
-			BoolExistTrashNEW = TRUE;
-		}
-	}
-	// SI PAS SESSION KDE
-	else {
-		if (BoolExistTrashNEW == TRUE) {
-			var_filetrash.Bool_kde_full_session = TRUE;
-		}
-		else if (BoolExistTrashOLD == FALSE) {
-			var_filetrash.Bool_kde_full_session = TRUE;
-			StrTrash = g_strdup_printf ("mkdir -p %s", filetrash_get_trash ());
-			Dummy = system (StrTrash);
-			g_free (StrTrash);
-			StrTrash = NULL;
-			BoolExistTrashNEW = TRUE;
-		}
-		else {
-			
+	if( NULL != (src_file = g_file_new_for_path( p_Name ))) {
+		if( TRUE == g_file_query_exists( src_file, NULL ) ) {
+			bool_ret = g_file_trash( src_file, NULL, NULL );
 		}
+		g_object_unref( src_file );
 	}
-	
-	if( TRUE == OptionsCommandLine.BoolVerboseMode )
-		g_print ("---\nUSE ........: %s\n---\n\n", filetrash_get_trash ());
+	return( bool_ret );
 }
 // 
 // 
@@ -307,10 +149,6 @@
 // 
 static gint filetrash_timeout (gpointer data)
 {
-	// if (TRUE == WindScan_close_request (void)) {
-	// 	var_filetrash.bool_thread_end = TRUE;
-	// }
-	
 	if (var_filetrash.bool_pass_conv == TRUE) {
 
 		gchar *str = NULL;
@@ -348,7 +186,7 @@
 		WindScan_close ();
 		
 		fileaction_set_end (TYPE_TRASH);
-		gtk_timeout_remove (var_filetrash.handler_timeout);
+		g_source_remove (var_filetrash.handler_timeout);
 		on_file_button_del_file_clicked (NULL, NULL);
 	}
 	return (TRUE);
@@ -364,11 +202,16 @@
 	var_filetrash.BoolEtat = FALSE;
 	var_filetrash.bool_pass_conv = FALSE;
 	
-	WindScan_open (_("Trash"), WINDSCAN_PULSE);
+	// WindScan_open (_("Trash"), WINDSCAN_PULSE);
+	wind_scan_init(
+		WindMain,
+		_("Trash"),
+		WINDSCAN_PULSE
+		);
 	WindScan_set_label (_("Trash files ..."));
 		
 	pthread_create (&var_filetrash.nmr_tid, NULL ,(void *)filetrash_thread, (void *)NULL);
-	var_filetrash.handler_timeout = gtk_timeout_add (100, filetrash_timeout, 0);
+	var_filetrash.handler_timeout = g_timeout_add (100, filetrash_timeout, 0);
 }
 // 
 // 
@@ -399,3 +242,5 @@
 
 
 
+
+

xcfa-4.2.8.tar.gz/src/file_wav.c -> xcfa-5.0.2.tar.gz/src/file_wav.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : file_wav.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -30,11 +30,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <stdio.h>
@@ -138,9 +133,9 @@
 	BoolButtonsAudio [ 2 ] = FileWav_get_bool_conversion ();
 
 	gtk_widget_set_sensitive (GTK_WIDGET (GLADE_GET_OBJECT("button_del_file")),		BoolButtonsAudio [ 0 ]);
-	gtk_widget_set_sensitive (GTK_WIDGET (GLADE_GET_OBJECT("spinbutton_frequence_wav")),	BoolButtonsAudio [ 1 ]);
-	gtk_widget_set_sensitive (GTK_WIDGET (GLADE_GET_OBJECT("combobox_voie_wav")),		BoolButtonsAudio [ 1 ]);
-	gtk_widget_set_sensitive (GTK_WIDGET (GLADE_GET_OBJECT("combobox_bit_wav")),		BoolButtonsAudio [ 1 ]);
+	// gtk_widget_set_sensitive (GTK_WIDGET (GLADE_GET_OBJECT("spinbutton_frequence_wav")),	BoolButtonsAudio [ 1 ]);
+	// gtk_widget_set_sensitive (GTK_WIDGET (GLADE_GET_OBJECT("combobox_voie_wav")),		BoolButtonsAudio [ 1 ]);
+	// gtk_widget_set_sensitive (GTK_WIDGET (GLADE_GET_OBJECT("combobox_bit_wav")),		BoolButtonsAudio [ 1 ]);
 	gtk_widget_set_sensitive (GTK_WIDGET (GLADE_GET_OBJECT("button_apply_wav")),		BoolButtonsAudio [ 2 ]);
 }
 // CHANGEMENT DES PARAMETRES: freq, voie, bits SI PARAM <> NULL
@@ -209,7 +204,7 @@
 			}
 			list = g_list_next (list);
 		}
-		gtk_tree_selection_unselect_all (var_file_wav.Adr_Line_Selected);
+		// gtk_tree_selection_unselect_all (var_file_wav.Adr_Line_Selected);
 	}
 	return (BoolPrint);
 }
@@ -219,37 +214,23 @@
 {
 	DETAIL		*detail = NULL;
 	GList		*List = NULL;
-	GList		*FreegList = NULL;
 	GtkTreeIter	iter;
 	GtkAdjustment	*Adj = NULL;
 	gdouble		AdjValue;
-	gint		*TabInt = NULL;		// TABLEAU DES LIGNES EN SELECTION
-	gint		Cpt = 0;		// INDICE DANS LE TABLEAU
 	gint		Line = 0;		// LIGNE EN COURS
 	INFO_WAV	*info = NULL;
 	gchar		*NewHertz = NULL;
 	gchar		*NewVoie = NULL;
 	gchar		*NewBits = NULL;
 	gchar		*NameDest = NULL;
-	
-	// LIBERATION LIGNE(S) DU GLIST SI NECESSARE
-	// 
-	List = g_list_first (entetefile);
-	while (List) {
-		if ((detail = (DETAIL *)List->data) && TRUE == detail->BoolRemove) {
-			FreegList = List;
-			FreegList->data = NULL;
-			List = g_list_next (List);
-			entetefile = g_list_remove_link (entetefile, FreegList);
-			List = g_list_first (entetefile);
-			continue;
-		}
-		List = g_list_next (List);
-	}
+	gint		NumLineSelected = -1;
+	gboolean	BoolNumLineSelected = FALSE;
 	
 	// RECUP SELECTION
 	// 
-	TabInt = libutils_get_tab_selected_line (var_file_wav.Adr_Line_Selected, var_file_wav.Adr_Tree_Model);
+	NumLineSelected = libutils_get_first_line_is_selected( var_file_wav.Adr_Line_Selected, var_file_wav.Adr_Tree_Model );
+	
+	gtk_tree_selection_unselect_all (var_file_wav.Adr_Line_Selected);
 
 	// DELETE TREEVIEW
 	// 
@@ -262,19 +243,16 @@
 	
 	// AFFICHAGE DE LA LISTE
 	// 
-	Cpt = 0;
 	Line = 0;
 	List = g_list_first (entetefile);
 	while (List) {
 		if (NULL != ((detail = (DETAIL *)List->data)) && FALSE == detail->BoolRemove) {
 			if (FILE_IS_WAV != detail->type_infosong_file_is) {
 				List = g_list_next (List);
-				// Line ++;
 				continue;
 			}
 			if (NULL == (info = (INFO_WAV *)detail->info)) {
 				List = g_list_next (List);
-				// Line ++;
 				continue;
 			}
 			NewHertz = g_strdup_printf ("%s", info->NewHertz);
@@ -282,7 +260,7 @@
 			NewBits = g_strdup_printf ("%s", info->NewBits);
 			
 			NameDest = libutils_get_name_without_ext_with_amp (detail->namefile);
-			
+
 			gtk_list_store_append (var_file_wav.Adr_List_Store, &iter);
 			gtk_list_store_set (var_file_wav.Adr_List_Store, &iter,
 						COLUMN_FILEWAV_HERTZ,		info->hertz,
@@ -292,6 +270,7 @@
 						COLUMN_FILEWAV_BITS,		info->bits,
 						COLUMN_FILEWAV_NEW_BITS,	NewBits,
 						COLUMN_FILEWAV_NAME,		NameDest,
+						// COLUMN_FILEWAV_COLOR,		&YellowColor,
 						COLUMN_FILEWAV_POINTER_STRUCT,	detail,
 						-1);
 									
@@ -302,26 +281,26 @@
 			
 			// AFFICHE LES EVENTUELLES LIGNES EN SELECTION
 			// 
-			if (NULL != TabInt) {
-				if (Line == *(TabInt + Cpt)) {
-					gtk_tree_selection_select_iter (var_file_wav.Adr_Line_Selected, &iter);
-					Cpt ++;
-				}
-				Line ++;
+			if( NumLineSelected == Line ) {
+				gtk_tree_selection_select_iter (var_file_wav.Adr_Line_Selected, &iter);
+				BoolNumLineSelected = TRUE;
 			}
+			
+			Line ++;
 		}
 		List = g_list_next (List);
 	}
 	
 	// SUPPRESSON TABLEAU DES EVENTUELLES LIGNES EN SELECTION
 	// 
-	if (NULL != TabInt) {
-		g_free (TabInt);
-		TabInt = NULL;
-	}
-	else {
-		if (gtk_tree_model_get_iter_first (var_file_wav.Adr_Tree_Model, &iter))
+	if( NumLineSelected == -1 ) {
+		if (gtk_tree_model_get_iter_first (var_file_wav.Adr_Tree_Model, &iter)) {
 			gtk_tree_selection_select_iter (var_file_wav.Adr_Line_Selected, &iter);
+			BoolNumLineSelected = TRUE;
+		}
+	}
+	if( NumLineSelected > 0 && NULL != entetefile && BoolNumLineSelected == FALSE ) {
+		gtk_tree_selection_select_iter (var_file_wav.Adr_Line_Selected, &iter);
 	}
 
 	// REAJUSTEMENT DE LA LISTE
@@ -331,13 +310,6 @@
 
 	FileWav_set_flag_buttons ();
 }
-// 
-// 
-void on_spinbutton_frequence_wav_realize (GtkWidget *widget, gpointer user_data)
-{
-	var_file_wav.Adr_spinbutton_frequence = GTK_SPIN_BUTTON (widget);
-	gtk_widget_set_sensitive (GTK_WIDGET (GTK_SPIN_BUTTON (var_file_wav.Adr_spinbutton_frequence)), FALSE);
-}
 // CHANGEMENT DES PARAMETRES: freq, voie, ou bits SI <> DE NULL
 // 
 void FileWav_set_change_parameters_is_selected (gchar *freq, gchar *voie, gchar *bits)
@@ -387,9 +359,6 @@
 				else	Str = g_strdup_printf ("%s", info->NewHertz);
 				gtk_list_store_set (var_file_wav.Adr_List_Store, &iter, COLUMN_FILEWAV_NEW_HERTZ, Str, -1);
 				g_free (Str);	Str = NULL;
-				var_file_wav.BOOL_ENTER_SPIN = FALSE;
-				gtk_spin_button_set_value (GTK_SPIN_BUTTON (var_file_wav.Adr_spinbutton_frequence), (gdouble)atoi(info->NewHertz));
-				var_file_wav.BOOL_ENTER_SPIN = TRUE;
 			}
 			if (NULL != voie) {
 				if (info->NewVoie) {
@@ -408,16 +377,6 @@
 				else	Str = g_strdup_printf ("%s", info->NewVoie);
 				gtk_list_store_set (var_file_wav.Adr_List_Store, &iter, COLUMN_FILEWAV_NEW_VOIE, Str, -1);
 				g_free (Str);	Str = NULL;
-				
-				var_file_wav.BOOL_ENTER_SPIN = FALSE;
-				switch (atoi(info->NewVoie)) {
-				case 1 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_voie), 0);	break;
-				case 2 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_voie), 1);	break;
-				case 4 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_voie), 2);	break;
-				case 6 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_voie), 3);	break;
-				default : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_voie), 4);
-				}
-				var_file_wav.BOOL_ENTER_SPIN = TRUE;
 			}
 			if (NULL != bits) {
 				if (info->NewBits) {
@@ -436,18 +395,6 @@
 				else	Str = g_strdup_printf ("%s", info->NewBits);
 				gtk_list_store_set (var_file_wav.Adr_List_Store, &iter, COLUMN_FILEWAV_NEW_BITS, Str, -1);
 				g_free (Str);	Str = NULL;
-				
-				var_file_wav.BOOL_ENTER_SPIN = FALSE;
-				switch (atoi(info->NewBits)) {
-				case 8 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_bit), 0);	break;
-				case 16 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_bit), 1);	break;
-				case 24 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_bit), 2);	break;
-				case 25 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_bit), 3);	break;
-				case 32 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_bit), 4);	break;
-				case 64 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_bit), 5);	break;
-				default : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_bit), 0);
-				}
-				var_file_wav.BOOL_ENTER_SPIN = TRUE;
 			}
 			
 			info->BoolConv = FALSE;
@@ -464,103 +411,9 @@
 }
 // 
 // 
-void on_filewav_spinbutton_frequence_value_changed (GtkSpinButton *spinbutton, gpointer user_data)
-{
-	gchar *ptr = NULL;
-	glong value;
-
-	if (NULL == var_file_wav.Adr_spinbutton_frequence) return;
-	if (FALSE == var_file_wav.BOOL_ENTER_SPIN) return;
-
-	value = (glong)gtk_spin_button_get_value (var_file_wav.Adr_spinbutton_frequence);
-
-	if (value == 0) {
-		FileWav_set_change_parameters_is_selected ("", NULL, NULL);
-	}
-	else {
-		ptr = g_strdup_printf ("%lu", value);
-		FileWav_set_change_parameters_is_selected (ptr, NULL, NULL);
-		g_free (ptr);
-		ptr = NULL;
-	}
-	FileWav_set_flag_buttons ();
-}
-// 
-// 
-void FileWav_get_new_frequence (glong *p_Frequence, gint *p_Voie, gint *p_Bit)
-{
-	GtkTreeIter iter;
-	GtkTreeModel *model = NULL;
-	GList *list = NULL;
-	GList *BeginList = NULL;
-	GtkTreePath *path;
-	DETAIL *detail = NULL;
-	INFO_WAV	 *info = NULL;
-	
-	*p_Frequence = -1;
-	*p_Voie = -1;
-	*p_Bit = -1;
-	
-	model = gtk_tree_view_get_model (GTK_TREE_VIEW(var_file_wav.Adr_TreeView));
-	if (NULL != (BeginList = gtk_tree_selection_get_selected_rows (var_file_wav.Adr_Line_Selected, &model))) {
-		list = g_list_first (BeginList);
-		while (list) {
-			if (NULL != (path = list->data)) {
-				gtk_tree_model_get_iter (model, &iter, path);
-				gtk_tree_model_get (var_file_wav.Adr_Tree_Model, &iter, COLUMN_FILEWAV_POINTER_STRUCT, &detail, -1);
-				if (NULL != detail && NULL != (info = (INFO_WAV *)detail->info)) {
-					*p_Frequence = (glong)atol (info->NewHertz);
-					*p_Voie = (gint)atoi (info->NewVoie);
-					*p_Bit = (gint)atoi (info->NewBits);
-					return;
-				}
-			}
-			list = g_list_next (list);
-		}
-	}
-}
-// 
-// 
 void FileWav_changed_selection_row (GtkTreeSelection *selection, gpointer data)
 {
 	var_file_wav.Adr_Line_Selected = selection;
-	
-	if (NOTEBOOK_FICHIERS == Config.NotebookGeneral && NOTEBOOK_FICHIERS_WAV == Config.NotebookFile) {
-		if (NULL != var_file_wav.Adr_spinbutton_frequence) {
-			glong Frequence;
-			gint Voie;
-			gint Bit;
-			
-			FileWav_get_new_frequence (&Frequence, &Voie, &Bit);
-			if (-1 != Frequence && -1 != Voie && -1 != Bit) {
-
-				var_file_wav.BOOL_ENTER_SPIN = FALSE;
-				
-				gtk_spin_button_set_value (GTK_SPIN_BUTTON (var_file_wav.Adr_spinbutton_frequence), 1.0);
-				gtk_spin_button_set_value (GTK_SPIN_BUTTON (var_file_wav.Adr_spinbutton_frequence), Frequence);
-				
-				switch (Voie) {
-				case 1 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_voie), 0);	break;
-				case 2 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_voie), 1);	break;
-				case 4 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_voie), 2);	break;
-				case 6 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_voie), 3);	break;
-				default : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_voie), 4);
-				}
-				
-				switch (Bit) {
-				case 8 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_bit), 0);	break;
-				case 16 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_bit), 1);	break;
-				case 24 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_bit), 2);	break;
-				case 25 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_bit), 3);	break;
-				case 32 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_bit), 4);	break;
-				case 64 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_bit), 5);	break;
-				default : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_bit), 0);
-				}
-				
-				var_file_wav.BOOL_ENTER_SPIN = TRUE;
-			}
-		}
-	}
 	FileWav_set_flag_buttons ();
 }
 // AFFICHAGE DU NOM COMPLET DU FICHIER SI SURVOL PAR LE CURSEUR SOURIS DU CHAMPS 'Nom'
@@ -582,8 +435,11 @@
 	gboolean BoolSelectColPISTE = FALSE;
 	gboolean BoolSelectColQUANTIFICATION = FALSE;
 	
-	// SI PAS DANS LE TREEVIEW
-	gdk_window_get_pointer (((GdkEventButton*)event)->window, &x, &y, &state);
+	/* Si pas de selection a cet endroit retour */
+	GdkDeviceManager *manager = gdk_display_get_device_manager( gdk_display_get_default() );
+	GdkDevice		 *device = gdk_device_manager_get_client_pointer( manager );
+	gdk_window_get_device_position( ((GdkEventButton*)event)->window, device, &x, &y, &state );
+	// gdk_window_get_pointer (((GdkEventButton*)event)->window, &x, &y, &state);
 	if (FALSE == gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW(treeview),
 					 x, y,
 					 &path, &column, &Pos_X, &Pos_Y)) {
@@ -626,13 +482,13 @@
 		}
 	}
 	if (TRUE == BoolSelectColFREQUENCE) {
-		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / Choix de la frequence"));
+		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Right Click = Menu) / Select frequency"));
 	}
 	else if (TRUE == BoolSelectColPISTE) {
-		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / Choix du nombre de pistes (voies)"));
+		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Right Click = Menu) / Select number of tracks (channels)"));
 	}
 	else if (TRUE == BoolSelectColQUANTIFICATION) {
-		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Click Droit = Menu) / Choix du codage en nombre de bits"));
+		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, _("(Right Click = Menu) / Encoding selection in number of bits"));
 	}
 	else if (TRUE == BoolSelectColNom) {
 		StatusBar_set_mess( NOTEBOOK_FICHIERS, _STATUSBAR_SIMPLE_, detail->namefile);
@@ -646,17 +502,20 @@
 }
 // 
 // 
-static void FileWav_drag_data_received (GtkWidget	 *widget,
-					GdkDragContext *drag_context,
-					gint x,
-					gint y,
-					GtkSelectionData *data,
-					guint info,
-					guint time)
+static void FileWav_drag_data_received(
+					GtkWidget *widget,
+					GdkDragContext *context,
+					gint x,
+					gint y,
+					GtkSelectionData *data,
+					guint info,
+					guint time,
+					gpointer user_data)
 {
 /* Une copie ne peut aller vers elle meme !!! */
-	if (gtk_drag_get_source_widget(drag_context) != widget) {
-		dragndrop_list_drag_data (widget, (gchar *)data->data);
+	if (gtk_drag_get_source_widget(context) != widget) {
+		// dragndrop_list_drag_data (widget, (gchar *)data->data);
+		dragndrop_list_drag_data( widget, (gchar*)gtk_selection_data_get_data( data ));
 	}
 }
 // 
@@ -697,7 +556,8 @@
 			
 			gtk_selection_data_set( selection_data,
 						// GDK_SELECTION_TYPE_STRING,
-						selection_data->target,
+						// selection_data->target,
+						GDK_POINTER_TO_ATOM(gtk_selection_data_get_data( selection_data )),
 						8,
 						(guchar *)text,
 						strlen( text )
@@ -716,7 +576,7 @@
 		gtk_tree_selection_unselect_all (var_file_wav.Adr_Line_Selected);
 		gtk_tree_selection_select_all (var_file_wav.Adr_Line_Selected);
 	}
-	if (keys.keyval == GDK_Delete) {
+	if (keys.keyval == GDK_KEY_Delete) {
 		GtkTreeIter iter;
 		if (gtk_tree_model_get_iter_first (var_file_wav.Adr_Tree_Model, &iter)) {
 			on_file_button_del_file_clicked (NULL, NULL);
@@ -743,8 +603,8 @@
 	// GdkPixbuf *Pixbuf = NULL;
 	DETAIL *detail = NULL;
 	gint Pos_X = 0, Pos_Y = 0;
-	// gboolean bool_key_Control = (keys.keyval == GDK_Control_L || keys.keyval == GDK_Control_R);
-	// gboolean bool_key_Shift = (keys.keyval == GDK_Shift_L || keys.keyval == GDK_Shift_R);
+	// gboolean bool_key_Control = (keys.keyval == GDK_KEY_Control_L || keys.keyval == GDK_KEY_Control_R);
+	// gboolean bool_key_Shift = (keys.keyval == GDK_KEY_Shift_L || keys.keyval == GDK_KEY_Shift_R);
 	// gboolean bool_key_Release = (bool_key_Control == FALSE && bool_key_Shift == FALSE);
 	// gboolean bool_click_gauche = (event->button == 1);
 	gboolean bool_click_droit = (event->button == 3);	
@@ -786,13 +646,31 @@
 	}
 	
 	if (bool_click_droit && BoolSelectColFREQUENCE) {
+		
 		popup_file_wav_frequence (detail);
+
+		// AUTORISE LE POPUP SUR UNE SELECTION MULTIPLE
+		var_file_wav.Adr_Line_Selected = gtk_tree_view_get_selection( GTK_TREE_VIEW(treeview) );
+		gtk_tree_selection_select_path( var_file_wav.Adr_Line_Selected, path );
+		return TRUE;
 	}
 	else if (bool_click_droit && BoolSelectColPISTE) {
+		
 		popup_file_wav_piste (detail);
+
+		// AUTORISE LE POPUP SUR UNE SELECTION MULTIPLE
+		var_file_wav.Adr_Line_Selected = gtk_tree_view_get_selection( GTK_TREE_VIEW(treeview) );
+		gtk_tree_selection_select_path( var_file_wav.Adr_Line_Selected, path );
+		return TRUE;
 	}
 	else if (bool_click_droit && BoolSelectColQUANTIFICATION) {
+		
 		popup_file_wav_quantification (detail);
+
+		// AUTORISE LE POPUP SUR UNE SELECTION MULTIPLE
+		var_file_wav.Adr_Line_Selected = gtk_tree_view_get_selection( GTK_TREE_VIEW(treeview) );
+		gtk_tree_selection_select_path( var_file_wav.Adr_Line_Selected, path );
+		return TRUE;
 	}
 
 	return (FALSE);
@@ -858,7 +736,7 @@
 	renderer = gtk_cell_renderer_text_new ();
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_file_wav.Adr_ColumnFileWavHertz =
-	column = gtk_tree_view_column_new_with_attributes (_("Frequence"),
+	column = gtk_tree_view_column_new_with_attributes (_("Frequency"),
 						 renderer,
 						 "text", COLUMN_FILEWAV_HERTZ,
 						 NULL);
@@ -874,7 +752,7 @@
 	renderer = gtk_cell_renderer_text_new ();
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_file_wav.Adr_ColumnFileWavNewHertz =
-	column = gtk_tree_view_column_new_with_attributes (_("FREQUENCE"),
+	column = gtk_tree_view_column_new_with_attributes (_("FREQUENCY"),
 						 renderer,
 						 "markup", COLUMN_FILEWAV_NEW_HERTZ,
 						 NULL);
@@ -888,7 +766,7 @@
 	renderer = gtk_cell_renderer_text_new ();
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_file_wav.Adr_ColumnFileWavVoie =
-	column = gtk_tree_view_column_new_with_attributes (_("Piste"),
+	column = gtk_tree_view_column_new_with_attributes (_("Track"),
 						 renderer,
 						 "text", COLUMN_FILEWAV_VOIE,
 						 NULL);
@@ -904,7 +782,7 @@
 	renderer = gtk_cell_renderer_text_new ();
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_file_wav.Adr_ColumnFileWavNewVoie =
-	column = gtk_tree_view_column_new_with_attributes (_("PISTE"),
+	column = gtk_tree_view_column_new_with_attributes (_("TRACK"),
 						 renderer,
 						 "markup", COLUMN_FILEWAV_NEW_VOIE,
 						 NULL);
@@ -949,9 +827,10 @@
 	renderer = gtk_cell_renderer_text_new ();
 	g_object_set (renderer, "xalign", 0.5, NULL);
 	var_file_wav.Adr_ColumnFileWavName =
-	column = gtk_tree_view_column_new_with_attributes (_("Nom"),
+	column = gtk_tree_view_column_new_with_attributes (_("Name"),
 						 renderer,
 						 "markup", COLUMN_FILEWAV_NAME,
+						 // "background-gdk", COLUMN_FILEWAV_COLOR,
 						 NULL);
 	gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
 				 GTK_TREE_VIEW_COLUMN_FIXED);
@@ -973,20 +852,21 @@
 	var_file_wav.Pixbuf_NotInstall = libutils_init_pixbufs ("not_install.png");
 	
 	var_file_wav.Adr_List_Store = store =
-	gtk_list_store_new (	COLUMN_FILE_NUM,	/* TOTAL NUMBER			*/
-				G_TYPE_STRING,		/* COLUMN_FILEWAV_HERTZ		*/
-				G_TYPE_STRING,		/* COLUMN_FILEWAV_NEW_HERTZ	*/
-				G_TYPE_STRING,		/* COLUMN_FILEWAV_VOIE		*/
-				G_TYPE_STRING,		/* COLUMN_FILEWAV_NEW_VOIE	*/
-				G_TYPE_STRING,		/* COLUMN_FILEWAV_BITS		*/
-				G_TYPE_STRING,		/* COLUMN_FILEWAV_NEW_BITS	*/
-				G_TYPE_STRING,		/* COLUMN_FILEWAV_NAME		*/
+	gtk_list_store_new (	COLUMN_FILE_NUM,	/* TOTAL NUMBER				*/
+				G_TYPE_STRING,		/* COLUMN_FILEWAV_HERTZ			*/
+				G_TYPE_STRING,		/* COLUMN_FILEWAV_NEW_HERTZ		*/
+				G_TYPE_STRING,		/* COLUMN_FILEWAV_VOIE			*/
+				G_TYPE_STRING,		/* COLUMN_FILEWAV_NEW_VOIE		*/
+				G_TYPE_STRING,		/* COLUMN_FILEWAV_BITS			*/
+				G_TYPE_STRING,		/* COLUMN_FILEWAV_NEW_BITS		*/
+				G_TYPE_STRING,		/* COLUMN_FILEWAV_NAME			*/
+				// GDK_TYPE_COLOR,		/* COLUMN_FILEWAV_COLOR			*/
 				G_TYPE_POINTER /* COLUMN_FILEWAV_POINTER_STRUCT	*/
 			 );
 	var_file_wav.Adr_Tree_Model = model = GTK_TREE_MODEL (store);
 	var_file_wav.Adr_TreeView =
 	treeview = gtk_tree_view_new_with_model (model);
-	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
+	// gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
 	gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)), GTK_SELECTION_MULTIPLE);	// GTK_SELECTION_BROWSE MULTIPLE
 	g_object_unref (model);
 	gtk_container_add (GTK_CONTAINER (widget), treeview);
@@ -995,245 +875,16 @@
 }
 // 
 // 
-void on_combobox_voie_wav_realize (GtkWidget *widget, gpointer user_data)
-{
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "1");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "2");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "4");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "6");
-	// gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "--");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Valeur d'origine");
-	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
-	var_file_wav.Adr_combobox_voie = GTK_COMBO_BOX (widget);
-	gtk_widget_set_sensitive (GTK_WIDGET (var_file_wav.Adr_combobox_voie), FALSE);
-}
-// 
-// 
-void on_combobox_voie_wav_changed (GtkComboBox *combobox, gpointer user_data)
-{
-	gint	Voie;
-	
-	if (NULL == var_file_wav.Adr_combobox_voie) return;
-	if (FALSE == var_file_wav.BOOL_ENTER_SPIN) return;
-	
-	Voie = gtk_combo_box_get_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_voie));
-	switch (Voie) {
-	case 0 : FileWav_set_change_parameters_is_selected (NULL, "1", NULL);	break;
-	case 1 : FileWav_set_change_parameters_is_selected (NULL, "2", NULL);	break;
-	case 2 : FileWav_set_change_parameters_is_selected (NULL, "4", NULL);	break;
-	case 3 : FileWav_set_change_parameters_is_selected (NULL, "6", NULL);	break;
-	case 4 : FileWav_set_change_parameters_is_selected (NULL, "-1", NULL);	break;
-	}
-	FileWav_set_flag_buttons ();
-}
-// 
-// 
-void on_combobox_bit_wav_realize (GtkWidget *widget, gpointer user_data)
-{
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "8");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "16");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "24");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "25");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "32");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "64");
-	// gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "--");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Valeur d'origine");
-	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
-	var_file_wav.Adr_combobox_bit = GTK_COMBO_BOX (widget);
-	gtk_widget_set_sensitive (GTK_WIDGET (var_file_wav.Adr_combobox_bit), FALSE);
-}
-// 
-// 
-void on_combobox_bit_wav_changed (GtkComboBox *combobox, gpointer user_data)
-{
-	gint	Bit;
-	
-	if (NULL == var_file_wav.Adr_combobox_bit) return;
-	if (FALSE == var_file_wav.BOOL_ENTER_SPIN) return;
-	
-	Bit = gtk_combo_box_get_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_bit));
-	switch (Bit) {
-	case 0 : FileWav_set_change_parameters_is_selected (NULL, NULL, "8");	break;
-	case 1 : FileWav_set_change_parameters_is_selected (NULL, NULL, "16");	break;
-	case 2 : FileWav_set_change_parameters_is_selected (NULL, NULL, "24");	break;
-	case 3 : FileWav_set_change_parameters_is_selected (NULL, NULL, "25");	break;
-	case 4 : FileWav_set_change_parameters_is_selected (NULL, NULL, "32");	break;
-	case 5 : FileWav_set_change_parameters_is_selected (NULL, NULL, "64");	break;
-	case 6 : FileWav_set_change_parameters_is_selected (NULL, NULL, "-1");	break;
-	}
-	FileWav_set_flag_buttons ();
-}
-// 
-// 
-INFO_WAV *FileWav_get_info (void)
-{
-	GtkTreeIter	iter;
-	GtkTreeModel	*model = NULL;
-	GtkTreePath	*path;
-	DETAIL		*detail = NULL;
-	GList		*list = NULL;
-	INFO_WAV	*info = NULL;
-
-	model = gtk_tree_view_get_model (GTK_TREE_VIEW(var_file_wav.Adr_TreeView));
-	list = gtk_tree_selection_get_selected_rows (var_file_wav.Adr_Line_Selected, &model);
-	list = g_list_first (list);
-	while (list) {
-		if (NULL != (path = list->data)) {
-			/* prend le numero de la structure
-			*/
-			gtk_tree_model_get_iter (model, &iter, path);
-			gtk_tree_model_get (var_file_wav.Adr_Tree_Model, &iter, COLUMN_FILEWAV_POINTER_STRUCT, &detail, -1);
-			if (NULL == detail) {
-				list = g_list_next (list);
-				continue;
-			}
-			if (NULL != (info = (INFO_WAV *)detail->info)) return ((INFO_WAV *)info);
-						
-		}
-		list = g_list_next (list);
-	}
-	return ((INFO_WAV *)NULL);
-}
-// 
-// 
-void FileWav_from_popup_set_data_column (gchar *freq, gchar *voie, gchar *bits)
-{
-	GtkTreeIter	iter;
-	DETAIL		*detail = NULL;
-	INFO_WAV	*info = NULL;
-	gboolean	valid;
-	gchar		*Str = NULL;
-	
-	valid = gtk_tree_model_get_iter_first (var_file_wav.Adr_Tree_Model, &iter);
-	while (valid) {
-		gtk_tree_model_get (var_file_wav.Adr_Tree_Model, &iter, COLUMN_FILEWAV_POINTER_STRUCT, &detail, -1);
-		if (NULL != detail && NULL != (info = (INFO_WAV *)detail->info)) {
-			
-			/* Et mettre le contenu a jour
-			*/
-			if (NULL != freq) {
-				if (info->NewHertz) {
-					g_free (info->NewHertz);
-					info->NewHertz = NULL;
-				}
-				// VALEURS PAR DEFAUT
-				if (0 == strcmp (freq, "-1")) {
-					info->NewHertz = g_strdup (info->hertz);
-				} else {
-					info->NewHertz = g_strdup (freq);
-				}
-
-				if (strcmp (info->hertz, info->NewHertz) == 0)
-					Str = g_strdup_printf ("%s", info->NewHertz);
-				else	Str = g_strdup_printf ("%s", info->NewHertz);
-				gtk_list_store_set (var_file_wav.Adr_List_Store, &iter, COLUMN_FILEWAV_NEW_HERTZ, Str, -1);
-				g_free (Str);	Str = NULL;
-			}
-			if (NULL != voie) {
-				if (info->NewVoie) {
-					g_free (info->NewVoie);
-					info->NewVoie = NULL;
-				}
-				// VALEURS PAR DEFAUT
-				if (0 == strcmp (voie, "-1")) {
-					info->NewVoie = g_strdup (info->voie);
-				} else {
-					info->NewVoie = g_strdup (voie);
-				}
-
-				if (0 == strcmp (info->voie, info->NewVoie))
-					Str = g_strdup_printf ("%s", info->NewVoie);
-				else	Str = g_strdup_printf ("%s", info->NewVoie);
-				gtk_list_store_set (var_file_wav.Adr_List_Store, &iter, COLUMN_FILEWAV_NEW_VOIE, Str, -1);
-				g_free (Str);	Str = NULL;
-				
-			}
-			if (NULL != bits) {
-				if (info->NewBits) {
-					g_free (info->NewBits);
-					info->NewBits = NULL;
-				}
-				// VALEURS PAR DEFAUT
-				if (0 == strcmp (bits, "-1")) {
-					info->NewBits = g_strdup (info->bits);
-				} else {
-					info->NewBits = g_strdup (bits);
-				}
-
-				if (strcmp (info->bits, info->NewBits) == 0)
-					Str = g_strdup_printf ("%s", info->NewBits);
-				else	Str = g_strdup_printf ("%s", info->NewBits);
-				gtk_list_store_set (var_file_wav.Adr_List_Store, &iter, COLUMN_FILEWAV_NEW_BITS, Str, -1);
-				g_free (Str);	Str = NULL;
-			}
-			
-			info->BoolConv = FALSE;
-			if ( atoi (info->hertz) != atoi (info->NewHertz) ||
-			 atoi (info->voie) != atoi (info->NewVoie) ||
-			 atoi (info->bits) != atoi (info->NewBits)) {
-			
-				info->BoolConv = TRUE;
-			}
-			
-			
-			valid = gtk_tree_model_iter_next (var_file_wav.Adr_Tree_Model, &iter);
-		}
-	}
-	info = FileWav_get_info ();
-
-	var_file_wav.BOOL_ENTER_SPIN = FALSE;
-	
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (var_file_wav.Adr_spinbutton_frequence), (gdouble)atoi(info->NewHertz));
-
-	switch (atoi(info->NewVoie)) {
-	case 1 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_voie), 0);	break;
-	case 2 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_voie), 1);	break;
-	case 4 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_voie), 2);	break;
-	case 6 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_voie), 3);	break;
-	default : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_voie), 4);
-	}
-
-	switch (atoi(info->NewBits)) {
-	case 8 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_bit), 0);	break;
-	case 16 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_bit), 1);	break;
-	case 24 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_bit), 2);	break;
-	case 25 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_bit), 3);	break;
-	case 32 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_bit), 4);	break;
-	case 64 : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_bit), 5);	break;
-	default : gtk_combo_box_set_active (GTK_COMBO_BOX (var_file_wav.Adr_combobox_bit), 0);
-	}
-
-	var_file_wav.BOOL_ENTER_SPIN = TRUE;
-	
-	FileWav_set_flag_buttons ();
-}
-// 
-// 
-void FileWav_from_popup_set_data (DETAIL *detail, gchar *StrFreq, gchar *StrVoie, gchar *StrBits)
+void FileWav_from_popup_set_data (gchar *StrFreq, gchar *StrVoie, gchar *StrBits)
 {
 	// TRAITEMENT DE LA CELLULE POINTEE PAR LA STRUCTURE DETAIL
-	if (NULL == detail) {
-		
-		// VALEUR PAR DEFAUT SUR LA CELLULE POINTEE PAR LA STRUCTURE DETAIL
-		// 	EX: -1, NULL, NULL
-		// ASSIGNEMENT DU POINTEUR NON NULL SUR LA CELLULE POINTEE PAR LA STRUCTURE DETAIL
-		// 	EX: 44100, NULL, NULL
-		// 
-		FileWav_set_change_parameters_is_selected (StrFreq, StrVoie, StrBits);
-	}
-	
-	// TRAITEMENT DE LA COLONNE ENTIERE
-	else {
 		
-		// VALEUR PAR DEFAUT SUR LA COLONNE ENTIERE
-		// 	EX: -1, NULL, NULL
-		// ASSIGNEMENT DU POINTEUR NON NULL SUR LA COLONNE ENTIERE
-		// 	EX: 44100, NULL, NULL
-		// 
-		FileWav_from_popup_set_data_column (StrFreq, StrVoie, StrBits);
-	}
+	// VALEUR PAR DEFAUT SUR LA CELLULE POINTEE PAR LA STRUCTURE DETAIL
+	// 	EX: -1, NULL, NULL
+	// ASSIGNEMENT DU POINTEUR NON NULL SUR LA CELLULE POINTEE PAR LA STRUCTURE DETAIL
+	// 	EX: 44100, NULL, NULL
+	// 
+	FileWav_set_change_parameters_is_selected (StrFreq, StrVoie, StrBits);
 }
 // 
 // 
@@ -1275,24 +926,14 @@
 	// SELECTION ou DESELECTION POUR FREQUENCES VOIE BITS 
 	
 	case FILEWAV_FREQUENCY_CELL_HERTZ :		// Frequence Cellule ou valeur d origine
-		FileWav_from_popup_set_data (NULL, StrFreq, StrVoie, StrBits);
-		break;
-	case FILEWAV_FREQUENCY_COL_HERTZ :		// Frequence Colonne ou valeur d origine
-		FileWav_from_popup_set_data (detail, StrFreq, StrVoie, StrBits);
+		FileWav_from_popup_set_data (StrFreq, StrVoie, StrBits);
 		break;
 	case FILEWAV_TRACK_CELL :			// Voie Cellule ou valeur d origine
-		FileWav_from_popup_set_data (NULL, StrFreq, StrVoie, StrBits);
-		break;
-	case FILEWAV_TRACK_COL :			// Voie Colonne ou valeur d origine
-		FileWav_from_popup_set_data (detail, StrFreq, StrVoie, StrBits);
+		FileWav_from_popup_set_data (StrFreq, StrVoie, StrBits);
 		break;
 	case FILEWAV_QUANTIFICATION_CELL :		// Bits Cellule ou valeur d origine
-		FileWav_from_popup_set_data (NULL, StrFreq, StrVoie, StrBits);
-		break;
-	case FILEWAV_QUANTIFICATION_COL :		// Bits Colonne ou valeur d origine
-		FileWav_from_popup_set_data (detail, StrFreq, StrVoie, StrBits);
+		FileWav_from_popup_set_data (StrFreq, StrVoie, StrBits);
 		break;
-	
 	}
 	
 	if (NULL != StrFreq)	{ g_free (StrFreq);	StrFreq = NULL; }

xcfa-4.2.8.tar.gz/src/file_wav_conv.c -> xcfa-5.0.2.tar.gz/src/file_wav_conv.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : file_wav_conv.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <glib.h>
 #include <glib/gstdio.h>
@@ -55,7 +50,6 @@
 #include "notify_send.h"
 #include "win_scan.h"
 #include "conv.h"
-#include "popup_systray.h"
 #include "file.h"
 
 
@@ -91,6 +85,7 @@
 	INFO_WAV	*info = NULL;
 	gint		pos;
 	CONV_FIC_WAV	*PConvWav = NULL;
+	gchar		**PtrTabArgs = NULL;
 
 	// PRINT_FUNC_LF();
 
@@ -139,24 +134,25 @@
 				
 				PConvWav = detail->PConvWav;
 				
-				pos = filelc_get_command_line_nice ();
-				conv.ArgConv [ pos++ ] = g_strdup ("mplayer");
-				conv.ArgConv [ pos++ ] = g_strdup ("-nojoystick");
-				conv.ArgConv [ pos++ ] = g_strdup ("-nolirc");
-				conv.ArgConv [ pos++ ] = g_strdup (PConvWav->TmpSrc);
-				conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-				conv.ArgConv [ pos++ ] = g_strdup ("pcm");
-				conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-				conv.ArgConv [ pos++ ] = g_strdup_printf ("pcm:file=%s", PConvWav->TmpMplayer);
-				conv.ArgConv [ pos++ ] = g_strdup ("-af");
-				conv.ArgConv [ pos++ ] = g_strdup_printf ("channels=%s", info->NewVoie);
-				conv.ArgConv [ pos++ ] = g_strdup ("-srate");
-				conv.ArgConv [ pos++ ] = g_strdup (info->NewHertz);
-				conv.ArgConv [ pos++ ] = NULL;
+				PtrTabArgs = filelc_AllocTabArgs();
+				pos = 3;
+				PtrTabArgs [ pos++ ] = g_strdup ("mplayer");
+				PtrTabArgs [ pos++ ] = g_strdup ("-nojoystick");
+				PtrTabArgs [ pos++ ] = g_strdup ("-nolirc");
+				PtrTabArgs [ pos++ ] = g_strdup (PConvWav->TmpSrc);
+				PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+				PtrTabArgs [ pos++ ] = g_strdup ("pcm");
+				PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+				PtrTabArgs [ pos++ ] = g_strdup_printf ("pcm:file=%s", PConvWav->TmpMplayer);
+				PtrTabArgs [ pos++ ] = g_strdup ("-af");
+				PtrTabArgs [ pos++ ] = g_strdup_printf ("channels=%s", info->NewVoie);
+				PtrTabArgs [ pos++ ] = g_strdup ("-srate");
+				PtrTabArgs [ pos++ ] = g_strdup (info->NewHertz);
+				PtrTabArgs [ pos++ ] = NULL;
 				
 				VarFilewavconv.BoolMplayer = TRUE;
-				conv_to_convert (FALSE, MPLAYER_WAV_TO_WAV, "MPLAYER_WAV_TO_WAV");
-				filelc_get_command_line_remove ();
+				conv_to_convert( PtrTabArgs, FALSE, MPLAYER_WAV_TO_WAV, "MPLAYER_WAV_TO_WAV");
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 				VarFilewavconv.BoolMplayer = FALSE;
 
 				VarFilewavconv.BoolCopy = TRUE;
@@ -166,9 +162,9 @@
 				if (atoi (info->bits) != atoi (info->NewBits)) {
 					
 					VarFilewavconv.BoolSox = TRUE;
-					conv_with_sox_get_param (PConvWav->TmpSrc, PConvWav->TmpDest, info->NewHertz, info->NewVoie, info->NewBits);
-					conv_to_convert (FALSE, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
-					filelc_get_command_line_remove ();
+					PtrTabArgs = conv_with_sox_get_param (PConvWav->TmpSrc, PConvWav->TmpDest, info->NewHertz, info->NewVoie, info->NewBits);
+					conv_to_convert( PtrTabArgs, FALSE, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
+					PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 					
 					VarFilewavconv.BoolSox = FALSE;
 					VarFilewavconv.BoolCopy = TRUE;
@@ -262,7 +258,7 @@
 		if (VarFilewavconv.BoolCopy == TRUE) {
 			foo [ 0 ] = filewavconv_get_spinner();
 			foo [ 1 ] = '\0';
-			Str = g_strdup_printf (_("%s Copie fichier: %d%%"),
+			Str = g_strdup_printf (_("%s Copy file: %d%%"),
 							foo,
 							(gint)(conv.total_percent * 100));
 			WindScan_set_label (Str);
@@ -272,7 +268,7 @@
 		else if (VarFilewavconv.BoolRest == TRUE) {	
 			foo [ 0 ] = filewavconv_get_spinner();
 			foo [ 1 ] = '\0';
-			Str = g_strdup_printf (_("%s Restitution fichier: %d%%"),
+			Str = g_strdup_printf (_("%s Return file: %d%%"),
 							foo,
 							(gint)(conv.total_percent * 100));
 			WindScan_set_label (Str);
@@ -282,7 +278,7 @@
 		else if (VarFilewavconv.BoolSox == TRUE) {
 			foo [ 0 ] = filewavconv_get_spinner();
 			foo [ 1 ] = '\0';
-			Str = g_strdup_printf (_("%s Traitement Sox: %d%%"),
+			Str = g_strdup_printf (_("%s Use Sox: %d%%"),
 							foo,
 							(gint)(conv.total_percent * 100));
 			WindScan_set_label (Str);
@@ -299,7 +295,7 @@
 		
 		foo [ 0 ] = filewavconv_get_spinner();
 		foo [ 1 ] = '\0';
-		Str = g_strdup_printf (_("%s Traitement Mplayer: %d%%"),
+		Str = g_strdup_printf (_("%s Use Mplayer: %d%%"),
 						foo,
 						(gint)(conv.total_percent * 100));
 		WindScan_set_label (Str);
@@ -314,9 +310,7 @@
 		CONV_FIC_WAV	*PConvWav = NULL;
 		DETAIL		*detail = NULL;
 		
-		PopupSystray_set_BoolMainAction (FALSE);
-		
-		gtk_timeout_remove (conv.handler_timeout_conv);
+		g_source_remove (conv.handler_timeout_conv);
 		WindScan_close ();
 	
 		// SUPPRESSION DE LA STRUCTURE: DETAIL->CONV_FIC_WAV
@@ -348,7 +342,7 @@
 		if (FALSE == conv.bool_stop) {
 			NotifySend_msg (_("XCFA: Conversions WAV TO WAV"), _("Ok"), conv.bool_stop);
 		} else {
-			NotifySend_msg (_("XCFA: Conversions WAV TO WAV"), _("Arret par l'utilisateur"), conv.bool_stop);
+			NotifySend_msg (_("XCFA: Conversions WAV TO WAV"), _("Stop by user"), conv.bool_stop);
 		}
 	}
 	
@@ -386,11 +380,10 @@
 			detail->PConvWav = (CONV_FIC_WAV *)g_malloc0 (sizeof (CONV_FIC_WAV));
 			PConvWav = detail->PConvWav;
 			
-			// Create temporary rep
-			if (NULL == conv.TmpRep) {
+			// Create tmp rep
+			if( NULL == conv.TmpRep )
 				conv.TmpRep = libutils_create_temporary_rep (Config.PathnameTMP, PATH_TMP_XCFA_AUDIOFILEWAVCONV);
-			}
-	
+
 			// Nouvelles: source et destination
 			
 			// $TMP/original
@@ -463,17 +456,20 @@
 
 	// PRINT_FUNC_LF();
 
-	WindScan_open ("Conversions files WAV", WINDSCAN_PULSE);
+	// WindScan_open ("Conversions files WAV", WINDSCAN_PULSE);
+	wind_scan_init(
+		WindMain,
+		"Conversions files WAV",
+		WINDSCAN_PULSE
+		);
 	WindScan_set_label ("Conversions WAV TO WAV ...");
 	
 	VarFilewavconv.PassMplayer = 0;
 	conv_reset_struct (WindScan_close_request);
 	filewavconv_set_flags_before ();
 
-	PopupSystray_set_BoolMainAction (TRUE);
-	
 	conv.bool_thread_conv = TRUE;
-	conv.handler_timeout_conv = gtk_timeout_add (50, filewavconv_timeout, 0);
+	conv.handler_timeout_conv = g_timeout_add (50, filewavconv_timeout, 0);
 	pthread_create (&nmr_tid, NULL ,(void *)filewavconv_thread, (void *)NULL);
 }

xcfa-4.2.8.tar.gz/src/fileselect.c -> xcfa-5.0.2.tar.gz/src/fileselect.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : fileselect.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,17 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-	// #include <libintl.h>
-	//#define _(String) gettext (String)
-	/* INTERNATIONALISATION DE DATAS DEPUIS LES STRUCTURES :
-	 *	http://chl.be/glmf/www.linuxmag-france.org/old/lm5/inter.html
-	 */
-	#define gettext_noop(x) (x) 
-#endif
-
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
@@ -113,17 +102,17 @@
 
 SELECT Select [ ] =
 {
-{gettext_noop("Choix d'un dossier de destination"),			_REP_SIMPLE_,		NULL, ON_button_PATH_CHOICE_DESTINATION_clicked,		NULL},
-{gettext_noop("Choix d'un fichier CUE WAV FLAC OGG MP3 APE WMA"),	_FILE_SIMPLE_,		NULL, ON_button_PATH_LOAD_ONE_FILE_clicked,			NULL},
-{gettext_noop("Choix d'un fichier musical"),				_FILE_SIMPLE_,		NULL, ON_button_PATH_LOAD_ONE_FILE_clicked,			NULL},
-{gettext_noop("Choix d'un fichier"),					_FILE_SIMPLE_,		NULL, ON_button_PATH_LOAD_ONE_FILE_clicked,			NULL},
-{gettext_noop("Choix de fichiers"),					_FILE_MULTIPLE_,	NULL, ON_button_PATH_LOAD_ONE_FILE_clicked,			NULL},
-{gettext_noop("Choix de fichiers WAV"),					_FILE_MULTIPLE_,	NULL, ON_button_PATH_LOAD_ONE_FILE_clicked,			NULL},
-{gettext_noop("Choix de fichiers MP3/OGG"),				_FILE_MULTIPLE_,	NULL, ON_button_PATH_LOAD_ONE_FILE_clicked,			NULL},
-{gettext_noop("Choix de fichiers FLAC MPC OGG MP3"),			_FILE_MULTIPLE_,	NULL, ON_button_PATH_LOAD_ONE_FILE_clicked,			NULL},
-{gettext_noop("Importer des images pour la pochette"),			_FILE_IMG_MULTIPLE_,	NULL, ON_button_PATH_IMPORT_IMAGES_clicked,			NULL},
-{gettext_noop("Choix d'un chemin de stockage des images"),		_FILE_MULTIPLE_,	NULL, ON_button_PATH_POCHETTE_clicked,				NULL},
-{gettext_noop("Choix d'un lieu de sauvegarde"),				_FILE_MULTIPLE_,	NULL, ON_button_PATH_POCHETTE_clicked,				NULL},
+{gettext_noop("Choosing a destination folder"),					_REP_SIMPLE_,			NULL, ON_button_PATH_CHOICE_DESTINATION_clicked,	NULL},
+{gettext_noop("Choosing a file CUE WAV FLAC OGG MP3 APE WMA"),	_FILE_SIMPLE_,			NULL, ON_button_PATH_LOAD_ONE_FILE_clicked,			NULL},
+{gettext_noop("Choosing a file musical"),						_FILE_SIMPLE_,			NULL, ON_button_PATH_LOAD_ONE_FILE_clicked,			NULL},
+{gettext_noop("Choosing a file"),								_FILE_SIMPLE_,			NULL, ON_button_PATH_LOAD_ONE_FILE_clicked,			NULL},
+{gettext_noop("Choosing a file"),								_FILE_MULTIPLE_,		NULL, ON_button_PATH_LOAD_ONE_FILE_clicked,			NULL},
+{gettext_noop("Choosing a WAV file"),							_FILE_MULTIPLE_,		NULL, ON_button_PATH_LOAD_ONE_FILE_clicked,			NULL},
+{gettext_noop("Choosing a MP3 OGG file"),						_FILE_MULTIPLE_,		NULL, ON_button_PATH_LOAD_ONE_FILE_clicked,			NULL},
+{gettext_noop("Choosing a FLAC MPC OGG MP3 file"),				_FILE_MULTIPLE_,		NULL, ON_button_PATH_LOAD_ONE_FILE_clicked,			NULL},
+{gettext_noop("Import pictures for the cover"),					_FILE_IMG_MULTIPLE_,	NULL, ON_button_PATH_IMPORT_IMAGES_clicked,			NULL},
+{gettext_noop("Choosing an Image Storage path"),				_FILE_MULTIPLE_,		NULL, ON_button_PATH_POCHETTE_clicked,				NULL},
+{gettext_noop("Choosing a place for backup"),					_FILE_MULTIPLE_,		NULL, ON_button_PATH_POCHETTE_clicked,				NULL},
 
 {NULL, -1}
 };
@@ -345,16 +334,18 @@
 	}
 }
 // Demande de creation de la fenetre de selection de fichier(s) ou de repertoire
+// https://developer.gnome.org/gtk3/stable/GtkFileChooserDialog.html
 // 
 void fileselect_create (TYPE_FILESELECTION Choice, gchar *Path, void *Func_Extern)
 {
 	GtkWidget *filechooserdialog;
-	GtkWidget *dialog_vbox1;
-	GtkWidget *dialog_action_area1;
-	GtkWidget *button_cancel;
-	GtkWidget *button_ok;
+	// GtkWidget *dialog_vbox1;
+	// GtkWidget *dialog_action_area1;
+	// GtkWidget *button_cancel;
+	// GtkWidget *button_ok;
 	GtkWidget *preview;
 	GtkFileFilter *filter;
+	gint			res;
 	
 	if (_NB_PATH_ <= 0) return;
 	if (Choice < 0 || Choice > _NB_PATH_) return;
@@ -365,7 +356,7 @@
 	filechooserdialog = Select[ Choice ].AdrFileChooser;
 
 	if (filechooserdialog != NULL) {
-		gdk_window_raise (filechooserdialog->window);
+		gdk_window_raise( gtk_widget_get_window(filechooserdialog) );
 		return;
 	}
 
@@ -390,26 +381,48 @@
 	*/
 	if (Select[ Choice ].TypeSelect == _REP_SIMPLE_ || Select[ Choice ].TypeSelect == _REP_MULTIPLE_) {
 		/* selection de directory */
+		/**
 		filechooserdialog = gtk_file_chooser_dialog_new (Select[ Choice ].Title,
 								 NULL,
 								 GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-								 /* |
-								 GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER,
-								 */
+								 // GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER,
 								 NULL,
 								 NULL);
+		*/
+		filechooserdialog = gtk_file_chooser_dialog_new (
+								Select[ Choice ].Title,
+								NULL,
+								GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
+								_("Cancel"),
+								GTK_RESPONSE_CANCEL,
+								_("Open"),
+								GTK_RESPONSE_ACCEPT,
+								NULL);
 	}
 	else if (Select[ Choice ].TypeSelect == _FILE_SIMPLE_ || Select[ Choice ].TypeSelect == _FILE_MULTIPLE_) {
 		/* selection de fichiers(s) */
+		/**
 		filechooserdialog = gtk_file_chooser_dialog_new (Select[ Choice ].Title,
 								 NULL,
 								 GTK_FILE_CHOOSER_ACTION_OPEN,
 								 NULL,
 								 NULL);
+		*/
+		filechooserdialog = gtk_file_chooser_dialog_new (
+								Select[ Choice ].Title,
+								NULL,
+								GTK_FILE_CHOOSER_ACTION_OPEN,
+								_("Cancel"),
+								GTK_RESPONSE_CANCEL,
+								_("Open"),
+								GTK_RESPONSE_ACCEPT,
+								NULL);
 		if (_PATH_LOAD_SPLIT_FILE_ == Choice) {
 			filter = gtk_file_filter_new ();
 			gtk_file_filter_add_pattern (filter, "*.wav");
 			gtk_file_filter_add_pattern (filter, "*.WAV");
+			gtk_file_filter_add_pattern (filter, "*.bwf");
+			gtk_file_filter_add_pattern (filter, "*.BWF");
 			gtk_file_filter_add_pattern (filter, "*.flac");
 			gtk_file_filter_add_pattern (filter, "*.FLAC");
 			gtk_file_filter_add_pattern (filter, "*.ogg");
@@ -434,6 +447,12 @@
 			gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filechooserdialog), filter);
 			
 			filter = gtk_file_filter_new ();
+			gtk_file_filter_set_name (filter, "BWF (*.bwf)");
+			gtk_file_filter_add_pattern (filter, "*.bwf");
+			gtk_file_filter_add_pattern (filter, "*.BWF");
+			gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filechooserdialog), filter);
+			
+			filter = gtk_file_filter_new ();
 			gtk_file_filter_set_name (filter, "FLAC (*.flac)");
 			gtk_file_filter_add_pattern (filter, "*.flac");
 			gtk_file_filter_add_pattern (filter, "*.FLAC");
@@ -475,6 +494,8 @@
 			gtk_file_filter_set_name (filter, _("All Files (*.*)"));
 			gtk_file_filter_add_pattern (filter, "*.wav");
 			gtk_file_filter_add_pattern (filter, "*.WAV");
+			gtk_file_filter_add_pattern (filter, "*.bwf");
+			gtk_file_filter_add_pattern (filter, "*.BWF");
 			gtk_file_filter_add_pattern (filter, "*.flac");
 			gtk_file_filter_add_pattern (filter, "*.FLAC");
 			gtk_file_filter_add_pattern (filter, "*.ape");
@@ -516,6 +537,11 @@
 			gtk_file_filter_add_pattern (filter, "*.WAV");
 			gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filechooserdialog), filter);
 			filter = gtk_file_filter_new ();
+			gtk_file_filter_set_name (filter, "BWF (*.bwf)");
+			gtk_file_filter_add_pattern (filter, "*.bwf");
+			gtk_file_filter_add_pattern (filter, "*.BWF");
+			gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filechooserdialog), filter);
+			filter = gtk_file_filter_new ();
 			gtk_file_filter_set_name (filter, "FLAC (*.flac)");
 			gtk_file_filter_add_pattern (filter, "*.flac");
 			gtk_file_filter_add_pattern (filter, "*.FLAC");
@@ -591,7 +617,9 @@
 			gtk_file_filter_set_name (filter, _("All Files (*.*)"));
 			gtk_file_filter_add_pattern (filter, "*.wav");
 			gtk_file_filter_add_pattern (filter, "*.WAV");
-			gtk_file_filter_set_name (filter, "*.wav");
+			gtk_file_filter_add_pattern (filter, "*.bwf");
+			gtk_file_filter_add_pattern (filter, "*.BWF");
+			gtk_file_filter_set_name (filter, "*.wav *.bwf");
 			gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filechooserdialog), filter);
 		}
 		else if (Choice == _PATH_LOAD_FILE_MP3OGG_) {
@@ -657,17 +685,28 @@
 	}
 	else if (Select[ Choice ].TypeSelect == _FILE_IMG_SIMPLE_ || Select[ Choice ].TypeSelect == _FILE_IMG_MULTIPLE_) {
 		/* selection de fichiers images avec previsualisation */
+		/**
 		filechooserdialog = gtk_file_chooser_dialog_new (Select[ Choice ].Title,
 								 NULL,
 								 GTK_FILE_CHOOSER_ACTION_OPEN,
-								 /*GTK_STOCK_CANCEL,
-								 GTK_RESPONSE_CANCEL,
-								 GTK_STOCK_OPEN,
-								 GTK_RESPONSE_ACCEPT,*/
+								 // GTK_STOCK_CANCEL,
+								 // GTK_RESPONSE_CANCEL,
+								 // GTK_STOCK_OPEN,
+								 // GTK_RESPONSE_ACCEPT,
 								 NULL,
 								 NULL);
+		*/
+		filechooserdialog = gtk_file_chooser_dialog_new (
+								Select[ Choice ].Title,
+								NULL,
+								GTK_FILE_CHOOSER_ACTION_OPEN,
+								_("Cancel"),
+								GTK_RESPONSE_CANCEL,
+								_("Open"),
+								GTK_RESPONSE_ACCEPT,
+								NULL);
 		preview = gtk_image_new ();
-		gtk_widget_set_usize(GTK_WIDGET(preview), 200, 200);
+		gtk_widget_set_size_request(GTK_WIDGET(preview), 200, 200);
 		gtk_file_chooser_set_preview_widget(GTK_FILE_CHOOSER(filechooserdialog), GTK_WIDGET(preview));
 		gtk_file_chooser_set_preview_widget_active (GTK_FILE_CHOOSER (filechooserdialog), TRUE);
 		g_signal_connect(GTK_FILE_CHOOSER(filechooserdialog), "update-preview", G_CALLBACK (chooserDialog_preview_update), preview);
@@ -695,37 +734,15 @@
 
 	gtk_window_set_type_hint (GTK_WINDOW (filechooserdialog), GDK_WINDOW_TYPE_HINT_DIALOG);
 
-	dialog_vbox1 = GTK_DIALOG (filechooserdialog)->vbox;
-	gtk_widget_show (dialog_vbox1);
-
-	dialog_action_area1 = GTK_DIALOG (filechooserdialog)->action_area;
-	gtk_widget_show (dialog_action_area1);
-	gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END);
-
-	button_cancel = gtk_button_new_from_stock ("gtk-cancel");
-	gtk_widget_show (button_cancel);
-	gtk_dialog_add_action_widget (GTK_DIALOG (filechooserdialog), button_cancel, GTK_RESPONSE_CANCEL);
-	GTK_WIDGET_SET_FLAGS (button_cancel, GTK_CAN_DEFAULT);
-
-	button_ok = gtk_button_new_from_stock ("gtk-open");
-	gtk_widget_show (button_ok);
-	gtk_dialog_add_action_widget (GTK_DIALOG (filechooserdialog), button_ok, GTK_RESPONSE_OK);
-	GTK_WIDGET_SET_FLAGS (button_ok, GTK_CAN_DEFAULT);
-
 	g_signal_connect ((gpointer) filechooserdialog, "delete_event", G_CALLBACK (fileselect_on_filechooserdialog_delete_event), (gpointer)Choice);
 	g_signal_connect ((gpointer) filechooserdialog, "destroy_event", G_CALLBACK (fileselect_on_filechooserdialog_destroy_event), (gpointer)Choice);
-	g_signal_connect ((gpointer) button_cancel, "clicked", G_CALLBACK (fileselect_on_button_cancel_clicked), (gpointer)Choice);
-	g_signal_connect ((gpointer) button_ok, "clicked", G_CALLBACK (Select[ Choice ].Call_Func), (gpointer)Choice);
-
-	/* Store pointers to all widgets, for use by lookup_widget().
-	*/
-	GLADE_HOOKUP_OBJECT_NO_REF (filechooserdialog, filechooserdialog, "filechooserdialog");
-	GLADE_HOOKUP_OBJECT_NO_REF (filechooserdialog, dialog_vbox1, "dialog_vbox1");
-	GLADE_HOOKUP_OBJECT_NO_REF (filechooserdialog, dialog_action_area1, "dialog_action_area1");
-	GLADE_HOOKUP_OBJECT (filechooserdialog, button_cancel, "button_cancel");
-	GLADE_HOOKUP_OBJECT (filechooserdialog, button_ok, "button_ok");
-
-	gtk_widget_grab_default (button_ok);
- 	gtk_widget_show (filechooserdialog);
+ 	
+ 	res = gtk_dialog_run (GTK_DIALOG (filechooserdialog));
+ 	if (res == GTK_RESPONSE_ACCEPT) {
+		Select[ Choice ].Call_Func( NULL, (gpointer)Choice );
+	}
+	else if(res == GTK_RESPONSE_CANCEL) {
+		fileselect_on_button_cancel_clicked( NULL, (gpointer)Choice );
+	}
 }

xcfa-4.2.8.tar.gz/src/fileselect.h -> xcfa-5.0.2.tar.gz/src/fileselect.h Changed

xcfa-4.2.8.tar.gz/src/get_info.c -> xcfa-5.0.2.tar.gz/src/get_info.c Changed

@@ -1,25 +1,25 @@
 /*
 * file : get_info.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
 *
 * This file is part of XCFA.
- * 
+ *
 * XCFA is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * at your option) any later version.
- * 
+ *
 * XCFA is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with XCFA. If not, see <http://www.gnu.org/licenses/>.
 */
@@ -30,11 +30,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <glib.h>
 #include <glib/gstdio.h>
@@ -99,8 +94,8 @@
 signal (SIGCHLD, GetInfo_sigchld);
 }
 }
-// 
-// 
+//
+//
 gint GetInfo_exec_with_output (gchar **args, pid_t *p, gint Streams)
 {
 	VarGet.signal_numchildren = 0;
@@ -133,7 +128,7 @@
 extern float roundf(float x);
 
 // RETOURNE, EN KiloOctet LA PLACE DISPONIBLE DU DOSSIER TEMPORAIRE
-// 
+//
 glong GetInfo_level_df (void)
 {
 	gint pos = 0;
@@ -144,7 +139,7 @@
 	gchar *Path = g_strdup_printf ("%s/", Config.PathnameTMP);
 	glong Size = 0;
 	gchar *Ptr = NULL;
-	
+
 	args[pos++] = "df";
 	args[pos++] = "--block-size=K";
 	args[pos++] = Path;
@@ -158,7 +153,7 @@
 		g_print ("args [ %02d ] = '%s'\n", pos, args [ pos ]);
 	g_print ("\n");
 	*/
-	
+
 	fd = GetInfo_exec_with_output (args, &VarGet.code_fork, STDOUT_FILENO);
 
 	do {
@@ -171,13 +166,13 @@
 				pos --;
 			}
 			size = read(fd, &buf[pos], 1);
-			
+
 		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
 		pos ++;
 		buf[ pos ] = '\0';
 
 		if (strstr (buf, "/dev/")) {
-			/* 
+			/*
 			buf=/dev/sda5 19686772K 4080996K 14605736K 22% /
 			*/
 			/* g_print("buf=%s\n", buf); */
@@ -192,7 +187,7 @@
 		}
 
 	} while (size != 0);
-	
+
 	g_free (Path);
 	Path = NULL;
 
@@ -200,14 +195,14 @@
 	VarGet.code_fork = -1;
 	return (Size);
 }
-// 
-// 
+//
+//
 gboolean GetInfo_level_bool_percent (void)
 {
 	return (VarGet.bool_percent);
 }
-// 
-// 
+//
+//
 gint GetInfo_level_get_from (TYPE_FILE_IS TypeFileIs, gchar *file)
 {
 	gint pos = 0;
@@ -216,7 +211,7 @@
 	gint size = -1;
 	gchar buf [ 1024 + 10 ];
 	gint arrondit = -1;
-	
+
 	if (TypeFileIs == FILE_IS_WAV || TypeFileIs == FILE_IS_MP3) {
 		/*
 		normalize-audio -n ./kill_bill.wav
@@ -244,7 +239,7 @@
 		g_print ("args [ %02d ] = '%s'\n", pos, args [ pos ]);
 	g_print ("\n");
 	*/
-	
+
 	fd = GetInfo_exec_with_output (args, &VarGet.code_fork, STDOUT_FILENO);
 
 	do {
@@ -257,25 +252,25 @@
 				pos --;
 			}
 			size = read(fd, &buf[pos], 1);
-			
+
 		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
 		pos ++;
 		buf[ pos ] = '\0';
 
 		VarGet.bool_percent = TRUE;
-		
+
 		if (strstr (buf, "dBFS")) {
 			arrondit = (gint)roundf(atof(buf));
 		}
-		
+
 	} while (size != 0);
 
 	close(fd);
 	VarGet.code_fork = -1;
 	return (arrondit);
 }
-// 
-// 
+//
+//
 GString *GetInfo_file (gchar *file)
 {
 	gint fd;
@@ -331,14 +326,14 @@
 	close(fd);
 	return (gstr);
 }
-// 
-// 
+//
+//
 gchar *GetInfo_cpu (void)
-{	
+{
 	gchar	 buf [ GET_MAX_CARS + 10 ];
 	FILE	*fp;
 	gchar	*Ptr = NULL;
-	
+
 	fp = fopen ("/proc/cpuinfo", "r");
 	while (fgets (buf, GET_MAX_CARS, fp) != NULL) {
 		// g_print("BUF = %s", buf);
@@ -353,10 +348,10 @@
 		 *(Ptr + 7) == 'a' &&
 		 *(Ptr + 8) == 'm' &&
 		 *(Ptr + 9) == 'e'
-		 
+
 		) {
 			// g_print("---------BUF = %s", buf);
-			
+
 			Ptr = buf;
 			while (*Ptr ++)
 				if (*Ptr == '\n') *Ptr = '\0';
@@ -364,7 +359,7 @@
 			Ptr ++;
 			while (*Ptr == ' ') Ptr ++;
 			// g_print("---------BUF = %s", Ptr);
-			
+
 			fclose (fp);
 			return (g_strdup (Ptr));
 		}
@@ -372,10 +367,10 @@
 	fclose (fp);
 	return (NULL);
 }
-// 
-// 
+//
+//
 gchar *GetInfo_cpu_str (void)
-{	
+{
 	struct	utsname utsname;
 	gchar	*ptruname = NULL;
 	gchar	*ModelName = NULL;
@@ -385,7 +380,7 @@
 	HostConf.NbCpu = sysconf(_SC_NPROCESSORS_ONLN);
 	HostConf.TypeCpu = 8 * sizeof(void*);
 	if (uname (&utsname) == 0) {
-		
+
 		strcpy (HostConf.Machine, utsname.machine);
 		if (strcmp (HostConf.Machine, "x86_64") == 0)
 			HostConf.BoolCpuIs64Bits = TRUE;
@@ -407,49 +402,53 @@
 	ModelName = NULL;
 	return (ptruname);
 }
-// 
-// 
+//
+//
 void GetInfo_cpu_print (void)
-{	
+{
 	struct	utsname utsname;
 	gchar	*ptruname = NULL;
 	gchar	*ModelName = NULL;
 
 	ModelName = GetInfo_cpu ();
-
 	HostConf.NbCpu = sysconf(_SC_NPROCESSORS_ONLN);
 	// g_print ("_SC_NPROCESSORS_CONF : Le nombre de processeurs configure = %d\n", (gint)sysconf(_SC_NPROCESSORS_CONF));
 	// g_print ("_SC_NPROCESSORS_ONLN : Le nombre de processeurs actuellement en ligne (disponibles) = %d\n", (gint)sysconf(_SC_NPROCESSORS_ONLN));
 	HostConf.TypeCpu = 8 * sizeof(void*);
 	if (uname (&utsname) == 0) {
-		
+
 		strcpy (HostConf.Machine, utsname.machine);
 		if (strcmp (HostConf.Machine, "x86_64") == 0)
 			HostConf.BoolCpuIs64Bits = TRUE;
 		else	HostConf.BoolCpuIs64Bits = FALSE;
-		
+
 		ptruname = g_strdup_printf (
 				"\nINFORMATIONS MACHINE:\n\n"
-				"sysname\t\t= %s\n"
-				"nodename\t= %s\n"
-				"release\t\t= %s\n"
-				"version\t\t= %s\n"
-				"machine\t\t= %s\n"
-				" \t\t= %d CPU (%d bits)\n"
-				" \t\t= %s\n",
+				"sysname\t\t = %s\n"
+				"nodename\t = %s\n"
+				"release\t\t = %s\n"
+				"version\t\t = %s\n"
+				"machine\t\t = %s\n"
+				" \t\t = %d CPU (%d bits)\n"
+				" \t\t = %s\n",
 			utsname.sysname, utsname.nodename, utsname.release, utsname.version, utsname.machine,
 			HostConf.NbCpu, HostConf.TypeCpu,
 			ModelName);
-		if( TRUE == OptionsCommandLine.BoolVerboseMode )
+		if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
 			g_print("%s",ptruname);
+			g_print ("HostConf.NbCpu = %d CPU\n", HostConf.NbCpu);
+			g_print ("HostConf.TypeCpu = %d Bits\n", HostConf.TypeCpu);
+			g_print ("HostConf.Machine = %s\n", HostConf.Machine);
+			g_print ("\n");
+		}
 	}
 	g_free (ModelName);
 	ModelName = NULL;
 	g_free (ptruname);
 	ptruname = NULL;
 }
-// 
-// 
+//
+//
 GString *GetInfo_faad (gchar *file)
 {
 	gint fd;
@@ -502,8 +501,8 @@
 	close(fd);
 	return (gstr);
 }
-// 
-// 
+//
+//
 GString *GetInfo_checkmp3 (gchar *file)
 {
 	gint fd;
@@ -512,7 +511,7 @@
 	gchar buf [ GET_MAX_CARS + 10 ];
 	gint size = 0;
 	GString *gstr = NULL;
-	
+
 	if (FALSE == PrgInit.bool_checkmp3) {
 		PRINT_FUNC_LF();
 		g_print ("\tPrgInit.bool_checkmp3 = %s\n", PrgInit.bool_checkmp3 ? "TRUE" : "FALSE");
@@ -525,7 +524,7 @@
 	args[pos++] = prginit_get_name (NMR_checkmp3);
 	args[pos++] = "-a";
 	args[pos++] = "-v";
-	
+
 	// TODO: @Tetsumaki
 	// http://forum.ubuntu-fr.org/viewtopic.php?pid=3889239#p3889239
 	// OPTION -i n'existe pas sous ARCHLINUX !!!
@@ -566,8 +565,8 @@
 	close(fd);
 	return (gstr);
 }
-// 
-// 
+//
+//
 GString *GetInfo_ogginfo (gchar *file)
 {
 	gint fd;
@@ -613,8 +612,8 @@
 	close(fd);
 	return (gstr);
 }
-// 
-// 
+//
+//
 GString *GetInfo_mediainfo (gchar *file)
 {
 	gint fd;
@@ -636,8 +635,10 @@
 		g_print ("args [ %02d ] = '%s'\n", pos, args [ pos ]);
 	g_print ("\n");
 	*/
-
-	fd = GetInfo_exec_with_output (args, &VarGet.code_fork, STDOUT_FILENO);
+	// STDIN_FILENO
+	// STDOUT_FILENO
+	// STDERR_FILENO
+	fd = GetInfo_exec_with_output( args, &VarGet.code_fork, STDOUT_FILENO );
 	do {
 		pos = -1;
 		do {
@@ -660,8 +661,8 @@
 	close(fd);
 	return (gstr);
 }
-// 
-// 
+//
+//
 GString *GetInfo_cdplay (gchar *file)
 {
 	gint fd;
@@ -709,8 +710,8 @@
 	close(fd);
 	return (gstr);
 }
-// 
-// 
+//
+//
 GString *GetInfo_which (gchar *file)
 {
 	gint fd;
@@ -756,8 +757,8 @@
 	close(fd);
 	return (gstr);
 }
-// 
-// 
+//
+//
 void GetInfo_eject (gchar *StrDevice)
 {
 	gint fd;
@@ -770,7 +771,7 @@
 	// args[pos++] = "--cdrom";
 	args[pos++] = StrDevice;
 	args[pos++] = NULL;
-	
+
 	/*
 	g_print ("!-----------------------------------!\n");
 	g_print ("! E J E C T !\n");
@@ -797,8 +798,8 @@
 
 	close(fd);
 }
-// 
-// 
+//
+//
 GString *GetInfo_cdparanoia( gchar *p_device )
 {
 	gint fd;
@@ -844,8 +845,8 @@
 	close(fd);
 	return (gstr);
 }
-// 
-// 
+//
+//
 GString *GetInfo_metaflac (gchar *file)
 {
 	gint fd;
@@ -893,8 +894,8 @@
 	close(fd);
 	return (gstr);
 }
-// 
-// 
+//
+//
 gboolean GetInfo_wget (void)
 {
 	gint fd;
@@ -905,14 +906,14 @@
 	gboolean bool_access_ok = TRUE;
 
 	// PRINT_FUNC_LF();
-	
+
 	args[pos++] = "wget";
 	args[pos++] = "--user-agent=\"Mozilla 22.0\"";
 	args[pos++] = "--directory-prefix=/tmp/";
 	args[pos++] = "http://www.google.fr/index.html";
 	args[pos++] = NULL;
 	args[pos++] = NULL;
-	
+
 	/*
 	g_print ("!-----------------------------------!\n");
 	g_print ("! W G E T !\n");
@@ -921,7 +922,7 @@
 		g_print ("args [ %02d ] = '%s'\n", pos, args [ pos ]);
 	g_print ("\n");
 	*/
-	
+
 	fd = GetInfo_exec_with_output (args, &VarGet.code_fork, STDERR_FILENO);
 	do {
 		pos = -1;
@@ -935,15 +936,15 @@
 			size = read(fd, &buf[pos], 1);
 
 		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
-		
+
 		if (NULL != strstr (buf, "Not Found")) {
 			bool_access_ok = FALSE;
 		}
-		
+
 	} while (size != 0);
-	
+
 	close(fd);
-	
+
 	if( TRUE == libutils_test_file_exist( "/tmp/index.html" )) {
 		g_unlink ("/tmp/index.html");
 		bool_access_ok = TRUE;
@@ -953,8 +954,8 @@
 	}
 	return (bool_access_ok);
 }
-// 
-// 
+//
+//
 SHNTAG *GetInfo_free_shntool (SHNTAG *ShnTag)
 {
 	if (NULL != ShnTag) {
@@ -1012,12 +1013,12 @@
 		}
 	} while( size != 0 );
 	close( fd );
-	
+
 	if( '\0' != *gstr->str )
 		StrCdDiscId = g_strdup( gstr->str );
 	g_string_free( gstr, TRUE );
 	gstr = NULL;
-		
+
 	return( StrCdDiscId );
 }
 
@@ -1104,7 +1105,7 @@
 
 	return ((SHNTAG *)ShnTag);
 }
-// 
+//
 // RECONNAISSANCE ENTETE FICHIER:
 // 	FILE_IS_M4A
 // 	FILE_IS_VID_M4A
@@ -1124,12 +1125,12 @@
 // SI COMMANDE file IS OK TEST DE:
 // 	FILE_IS_AAC
 // 	FILE_IS_WMA
-// 
+//
 TYPE_FILE_IS GetInfo_file_is( gchar *PathName )
 {
 	GString		*gstr = NULL;
 	TYPE_FILE_IS	TypeFileRet = FILE_IS_NONE;
-	
+
 	gstr = GetInfo_file (PathName);
 	// g_print( "gstr =\n%s\n", gstr->str );
 	// ABANDON SI LA COMMANDE file NE TROUVE PAS LE TYPE DE FICHIER
@@ -1140,6 +1141,8 @@
 	// UNE PETITE CHANCE SE PRESENTE ICI POUR AAC
 	else {
 		// FILE_IS_AAC
+		// 19 Waka Waka (This Time for Africa).m4a: ISO Media, MPEG v4 system, iTunes AAC-LC
+		// 4 Non Blondes - Whats Going On.m4a: ISO Media, MPEG v4 system, version 2
 		if( TRUE == FileIs_vidm4a( PathName )) {
 			TypeFileRet = FILE_IS_VID_M4A;
 		}
@@ -1152,12 +1155,12 @@
 		}
 		// FILE_IS_VID_M4A
 		// WCC_RADIO_EP042.m4a:			ISO Media, MPEG v4 system, iTunes AAC-LC
-		// 
+		//
 		// FILE_IS_M4A
 		// 21 The Academy.m4a:			ISO Media, MPEG v4 system, version 2
 		// 4 Non Blondes - Whats Going On.m4a:	ISO Media, MPEG v4 system, version 2
 		// audio.m4a:				ISO Media, MPEG v4 system, version 2
-		// 
+		//
 		// FILE_IS_AAC
 		// 01_King_Porter_Stomp.aac:		MPEG ADTS, AAC, v4 LC, 22.05 kHz, stereo
 		// aif.aac:				MPEG ADTS, AAC, v4 LC, 22.05 kHz, stereo
@@ -1231,10 +1234,10 @@
 	else if( strstr (gstr->str, "MPEG ADTS, layer III" )) {
 		TypeFileRet = FILE_IS_MP3;
 	}
-	
+
 	g_string_free (gstr, TRUE);
 	gstr = NULL;
-	
+
 	return( TypeFileRet );
 }

xcfa-4.2.8.tar.gz/src/get_info.h -> xcfa-5.0.2.tar.gz/src/get_info.h Changed

xcfa-4.2.8.tar.gz/src/global.h -> xcfa-5.0.2.tar.gz/src/global.h Changed

@@ -1,9 +1,9 @@
 /*
 * file : global.h
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -41,46 +41,53 @@
 extern	GtkWidget	*WindMain;
 extern	GtkWidget	*AdrLabelStatusbarGlobal;
 
+#ifdef ENABLE_NLS
+	#include <libintl.h>
+	#define gettext_noop(x) (x)
+	#define _(String) gettext (String)
+#endif
 
 #define GLADE_GET_OBJECT(OBJ) gtk_builder_get_object (GtkXcfaProjet, OBJ)
 
+GtkBuilder *Builder_open( gchar *p_name_glade, GtkBuilder *p_GtkBuilder );
+
 // 
 // ---------------------------------------------------------------------------
 // NOTEBOOK
 // ---------------------------------------------------------------------------
 // 
 // notebook_general
-#define NOTEBOOK_DVD_AUDIO	0
-#define NOTEBOOK_CD_AUDIO	1
+#define NOTEBOOK_DVD_AUDIO		0
+#define NOTEBOOK_CD_AUDIO		1
 	// notebook_expander_cd
-	#define NOTEBOOK_CD_AUDIO_TAGS		0
-	#define NOTEBOOK_CD_AUDIO_TITRE_CD	1
-	#define NOTEBOOK_CD_AUDIO_CUE		2
-#define NOTEBOOK_FICHIERS	2
+	#define NOTEBOOK_CD_AUDIO_TAGS			0
+	#define NOTEBOOK_CD_AUDIO_TITRE_CD		1
+	#define NOTEBOOK_CD_AUDIO_CUE			2
+#define NOTEBOOK_FICHIERS		2
 	// notebook_in_file
 	#define NOTEBOOK_FICHIERS_CONVERSION	0
-	#define NOTEBOOK_FICHIERS_WAV		1
-	#define NOTEBOOK_FICHIERS_MP3OGG	2	
-	#define NOTEBOOK_FICHIERS_TAGS		3
-#define NOTEBOOK_SPLIT		3
-#define NOTEBOOK_POCHETTE	4
-#define NOTEBOOK_OPTIONS	5
+	#define NOTEBOOK_FICHIERS_WAV			1
+	#define NOTEBOOK_FICHIERS_MP3OGG		2	
+	#define NOTEBOOK_FICHIERS_TAGS			3
+#define NOTEBOOK_SPLIT			3
+#define NOTEBOOK_POCHETTE		4
+#define NOTEBOOK_OPTIONS		5
 	// notebook_options
-	#define NOTEBOOK_OPTIONS_GENERAL	0
-	#define NOTEBOOK_OPTIONS_CD_AUDIO	1
-	#define NOTEBOOK_OPTIONS_LAME		2
-	#define NOTEBOOK_OPTIONS_OGGENC		3
-	#define NOTEBOOK_OPTIONS_FLAC		4
-	#define NOTEBOOK_OPTIONS_MAC		5
-	#define NOTEBOOK_OPTIONS_WAVPACK	6
-	#define NOTEBOOK_OPTIONS_MUSEPACK	7
-	#define NOTEBOOK_OPTIONS_FAAC		8
-	#define NOTEBOOK_OPTIONS_AACPLUSENC	9
+	#define NOTEBOOK_OPTIONS_GENERAL		0
+	#define NOTEBOOK_OPTIONS_CD_AUDIO		1
+	#define NOTEBOOK_OPTIONS_LAME			2
+	#define NOTEBOOK_OPTIONS_OGGENC			3
+	#define NOTEBOOK_OPTIONS_FLAC			4
+	#define NOTEBOOK_OPTIONS_MAC			5
+	#define NOTEBOOK_OPTIONS_WAVPACK		6
+	#define NOTEBOOK_OPTIONS_MUSEPACK		7
+	#define NOTEBOOK_OPTIONS_FAAC			8
+	#define NOTEBOOK_OPTIONS_AACPLUSENC		9
 	#define NOTEBOOK_OPTIONS_EXPORT_TAGS	10
 #define NOTEBOOK_PRGEXTERNES	6
 	// notebook_app_externes
 	#define NOTEBOOK_OPTIONS_PRGEXTERNES	0
-	#define NOTEBOOK_OPTIONS_EXTRA		1
+	#define NOTEBOOK_OPTIONS_EXTRA			1
 
 // 
 // ---------------------------------------------------------------------------
@@ -100,8 +107,8 @@
 // 
 #ifndef GLADE_HOOKUP_OBJECT
 #define GLADE_HOOKUP_OBJECT(component,widget,name) \
- g_object_set_data_full (G_OBJECT (component), name, \
- gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref)
+ g_object_set_data_full(G_OBJECT(component), name, \
+ g_object_ref(widget), (GDestroyNotify) g_object_unref)
 #endif
 
 #ifndef GLADE_HOOKUP_OBJECT_NO_REF
@@ -120,10 +127,10 @@
 
 // /usr/include/gtk-2.0/gdk/gdkkeysyms.h
 typedef struct {
-	gboolean	BoolGDKPress;		//
+	gboolean	BoolGDKPress;			//
 	gboolean	BoolGDK_Control_L_R;	// 
-	gboolean	BoolGDK_Control_A;	// 
-	guint		keyval;			// 
+	gboolean	BoolGDK_Control_A;		// 
+	guint		keyval;					// 
 } KEYS;
 
 extern KEYS keys;

xcfa-4.2.8.tar.gz/src/main.c -> xcfa-5.0.2.tar.gz/src/main.c Changed

@@ -1,25 +1,25 @@
 /*
 * file : main.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
 *
 * This file is part of XCFA.
- * 
+ *
 * XCFA is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * at your option) any later version.
- * 
+ *
 * XCFA is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with XCFA. If not, see <http://www.gnu.org/licenses/>.
 */
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 // /usr/include/gtk-2.0/gdk/gdkkeysyms.h
 #include <gdk/gdkkeysyms.h>
@@ -44,11 +39,13 @@
 #include <getopt.h>
 #include <unistd.h>
 #include <sys/types.h>
+#include <locale.h>
 
 #ifdef ENABLE_STATIC_LIBRARY
 	#include "../lib/lib.h"
 #endif
 
+#include "global.h"
 #include "options.h"
 #include "configuser.h"
 #include "file.h"
@@ -59,18 +56,15 @@
 #include "dvd.h"
 #include "web.h"
 #include "poche.h"
-#include "treeview.h"
+#include "win_treeview.h"
 #include "get_info.h"
 #include "mplayer.h"
 #include "win_about.h"
-#include "process.h"
 #include "split.h"
 #include "alsa_play.h"
 #include "win_info.h"
-#include "popup_systray.h"
 #include "statusbar.h"
 #include "cd_curl.h"
-#include "global.h"
 
 // FIXME
 // TODO
@@ -83,51 +77,52 @@
 
 KEYS keys = {
 	FALSE,		// gboolean	BoolGDKPress
-	FALSE,		// gboolean	BoolGDK_Control_L_R
+	FALSE,		// gboolean	BoolGDK_KEY_Control_L_R
 	FALSE,		// gboolean	BoolGDK_Control_A
 	0,		// guint	keyval
 };
 
 
-// 
-// 
+//
+//
 void on_label_statusbar_global_realize (GtkWidget *widget, gpointer user_data)
 {
 	AdrLabelStatusbarGlobal = widget;
 }
 // -RECUPERATION DES DATAS
 // -SAUVEGARDE DES DATAS
-// 
+//
 void remove_memory_apply (void)
 {
 	static gboolean BoolDoEnterRemove = FALSE;
-	
+
 	if (TRUE == BoolDoEnterRemove) return;
 	BoolDoEnterRemove = TRUE;
-	
+
 	VERBOSE ("\n--------------------------------------------------\n");
 	PRINT_FUNC_LF();
 	VERBOSE ("--------------------------------------------------\n");
-	
+
 	VERBOSE("AlsaPlay_stop ()\n")
 	AlsaPlay_stop ();
-	
+
 	VERBOSE ("split_set_stop ()\n");
 	split_set_stop ();
-	
+
 	VERBOSE ("Recuperation position et taille de la fenetre\n");
-	gdk_window_get_root_origin (WindMain->window, &Config.WinPos_X, &Config.WinPos_Y);
-	gdk_window_get_size (WindMain->window, &Config.WinWidth, &Config.WinHeight);	
-	
+	gdk_window_get_root_origin( gtk_widget_get_window(WindMain), &Config.WinPos_X, &Config.WinPos_Y );
+	Config.WinWidth = gdk_window_get_width( gtk_widget_get_window(WindMain) );
+	Config.WinHeight = gdk_window_get_height( gtk_widget_get_window(WindMain) ) ;
+
 	VERBOSE ("Sauvegarde l'etat de l'expander CD\n");
 	Config.BoolEtatExpanderCd = gtk_expander_get_expanded (GTK_EXPANDER (var_cd.Adr_Expander));
-	
+
 	VERBOSE ("Sauvegarde de la configuration\n");
 	config_save ();
-	
+
 	VERBOSE ("config_remove ()\n");
 	config_remove ();
-	
+
 	VERBOSE ("fileanalyze_remove_entetefile ()\n");
 	fileanalyze_remove_entetefile ();
 
@@ -141,46 +136,38 @@
 
 	VERBOSE ("NotifySend_remove ()\n");
 	NotifySend_remove ();
-	
+
 	VERBOSE ("Parse_remove (PARSE_TYPE_STOCKAGE_CD)\n");
 	Parse_remove (PARSE_TYPE_STOCKAGE_CD, TRUE);
 	VERBOSE ("Parse_remove (PARSE_TYPE_TITLE_CD)\n");
 	Parse_remove (PARSE_TYPE_TITLE_CD, TRUE);
-	
+
 	VERBOSE ("poche_remove_view()\n");
 	poche_remove_view();
-	
+
 	VERBOSE ("poche_remove_ListImage()\n");
 	poche_remove_ListImage();
 
-	VERBOSE ("libcombo_remove ()\n");
-	libcombo_remove ();
-
 	VERBOSE ("scan_remove_glist_media ()\n");
 	scan_remove_glist_media ();
 
 	VERBOSE ("web_remove_temporary_rep ()\n");
 	web_remove_temporary_rep ();
-	
+
 	VERBOSE ("CdCurl_remove_struct_all ()\n");
 	CdCurl_remove_struct_all();
-	
+
 	VERBOSE ("mplayer_remove_list_args ()\n");
 	mplayer_remove_list_args ();
-	
+
 	VERBOSE ("SplitSpectre_remove ()\n");
 	SplitSpectre_remove ();
-	
+
 	VERBOSE ("AlsaPlay_remove ()\n");
 	AlsaPlay_remove ();
-		
-	if (TRUE == libutils_test_file_exist (XCFA_FILE_LOAD)) {
-		if( TRUE == OptionsCommandLine.BoolVerboseMode ) 
-			g_print ("g_unlink (%s)\n", XCFA_FILE_LOAD);
-		g_unlink (XCFA_FILE_LOAD);
-	}
+
 	if (TRUE == libutils_test_file_exist (SPLIT_FILE_TMP_WAV)) {
-		if( TRUE == OptionsCommandLine.BoolVerboseMode ) 
+		if( TRUE == OptionsCommandLine.BoolVerboseMode )
 			g_print ("g_unlink (%s)\n", SPLIT_FILE_TMP_WAV);
 		g_unlink (SPLIT_FILE_TMP_WAV);
 	}
@@ -188,7 +175,7 @@
 	StatusBar_remove();
 
 	Config.PathPochette = libutils_remove_temporary_rep( Config.PathPochette );
-	
+
 	if( NULL != Config.PathLoadImg ) {
 		g_free( Config.PathLoadImg );
 		Config.PathLoadImg = NULL;
@@ -200,13 +187,13 @@
 
 	g_print ("\n");
 }
-// 
-// 
-void on_notebook_general_switch_page (GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, gpointer user_data)
+//
+//
+void on_notebook_general_switch_page( GtkNotebook *notebook, gpointer page, guint page_num, gpointer user_data )
 {
 	if (TRUE == Config.BoolConfigOk) {
 		Config.NotebookGeneral = page_num;
-		
+
 		if (NOTEBOOK_SPLIT == Config.NotebookGeneral) {
 			split_set_name_file ();
 		}
@@ -215,38 +202,38 @@
 		}
 	}
 }
-// 
-// 
-void on_notebook_expander_cd_switch_page (GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, gpointer user_data)
+//
+//
+void on_notebook_expander_cd_switch_page( GtkNotebook *notebook, gpointer page, guint page_num, gpointer user_data )
 {
 	if (TRUE == Config.BoolConfigOk)
 		Config.NotebookExpanderCd = page_num;
 }
-// 
-// 
-void on_notebook_in_file_switch_page (GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, gpointer user_data)
+//
+//
+void on_notebook_in_file_switch_page( GtkNotebook *notebook, gpointer page, guint page_num, gpointer user_data )
 {
 	if (TRUE == Config.BoolConfigOk) {
 		Config.NotebookFile = page_num;
 		switch (Config.NotebookFile) {
 		case NOTEBOOK_FICHIERS_CONVERSION :
-			gtk_combo_box_remove_text (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), 2);
-			gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), Config.PathDestinationFileAll);
+			gtk_combo_box_text_remove( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_DestFile), 2 );
+			gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_DestFile), Config.PathDestinationFileAll);
 			gtk_combo_box_set_active (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), Config.TabIndiceComboDestFile[ NOTEBOOK_FICHIERS_CONVERSION ]);
 			break;
 		case NOTEBOOK_FICHIERS_WAV :
-			gtk_combo_box_remove_text (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), 2);
-			gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), Config.PathDestinationFileWav);
+			gtk_combo_box_text_remove( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_DestFile), 2 );
+			gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_DestFile), Config.PathDestinationFileWav);
 			gtk_combo_box_set_active (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), Config.TabIndiceComboDestFile[ NOTEBOOK_FICHIERS_WAV ]);
 			break;
 		case NOTEBOOK_FICHIERS_MP3OGG :
-			gtk_combo_box_remove_text (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), 2);
-			gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), Config.PathDestinationFileMp3Ogg);
+			gtk_combo_box_text_remove( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_DestFile), 2 );
+			gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_DestFile), Config.PathDestinationFileMp3Ogg);
 			gtk_combo_box_set_active (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), Config.TabIndiceComboDestFile[ NOTEBOOK_FICHIERS_MP3OGG ]);
 			break;
 		case NOTEBOOK_FICHIERS_TAGS :
-			gtk_combo_box_remove_text (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), 2);
-			gtk_combo_box_append_text (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), Config.PathDestinationFileTags);
+			gtk_combo_box_text_remove( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_DestFile), 2 );
+			gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_file.Adr_combobox_DestFile), Config.PathDestinationFileTags);
 			gtk_combo_box_set_active (GTK_COMBO_BOX (var_file.Adr_combobox_DestFile), Config.TabIndiceComboDestFile[ NOTEBOOK_FICHIERS_TAGS ]);
 			break;
 		}
@@ -254,49 +241,49 @@
 		StatusBar_puts();
 	}
 }
-// 
-// 
-void on_notebook_options_switch_page (GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, gpointer user_data)
+//
+//
+void on_notebook_options_switch_page( GtkNotebook *notebook, gpointer page, guint page_num, gpointer user_data )
 {
 	if (TRUE == Config.BoolConfigOk)
 		Config.NotebookOptions = page_num;
 }
-// 
-// 
-void on_notebook_app_externes_switch_page (GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, gpointer user_data)
+//
+//
+void on_notebook_app_externes_switch_page( GtkNotebook *notebook, gpointer page, guint page_num, gpointer user_data )
 {
 	if (TRUE == Config.BoolConfigOk)
 		Config.NotebookAppExterns = page_num;
 }
-// 
-// 
+//
+//
 gboolean on_wind_main_key_press_event( GtkWidget *widget, GdkEventKey *kevent, gpointer user_data )
 {
 	keys.BoolGDKPress = TRUE;
 	keys.keyval = kevent->keyval;
-	
-	if( kevent->keyval == GDK_Control_L || kevent->keyval == GDK_Control_R ) {
+
+	if( kevent->keyval == GDK_KEY_Control_L || kevent->keyval == GDK_KEY_Control_R ) {
 		keys.BoolGDK_Control_L_R = TRUE;
-	}		
+	}
 	else if( kevent->state == 20 || kevent->state == 21 ) {
 		if( kevent->keyval == 65 || kevent->keyval == 97 ) {
 			keys.BoolGDK_Control_A = TRUE;
 		}
 	}
-	
+
 	if( NOTEBOOK_POCHETTE == Config.NotebookGeneral ) {
 		if( TRUE == keys.BoolGDK_Control_L_R ) {
 			pochedir_set_ctrl( TRUE );
 		}
-		else if( kevent->keyval == GDK_Delete) {
+		else if( kevent->keyval == GDK_KEY_Delete) {
 			// poche_remove_image();
 		}
 	}
 	else if( NOTEBOOK_SPLIT == Config.NotebookGeneral ) {
-		if( kevent->keyval == GDK_Delete ) {
+		if( kevent->keyval == GDK_KEY_Delete ) {
 			SplitSelector_cut ();
 		}
-		else if( kevent->keyval == GDK_space ) {
+		else if( kevent->keyval == GDK_KEY_space ) {
 			// Une action sur la barre espace agit sur sur le play/pause
 			split_play ();
 		}
@@ -304,58 +291,80 @@
 
 	return FALSE;
 }
-// 
-// 
+//
+//
 gboolean on_wind_main_key_release_event( GtkWidget *widget, GdkEventKey *kevent, gpointer user_data )
 {
 	keys.BoolGDKPress = FALSE;
 	keys.BoolGDK_Control_L_R = FALSE;
 	keys.BoolGDK_Control_A = FALSE;
 	keys.keyval = 0;
-	
+
 	if( NOTEBOOK_POCHETTE == Config.NotebookGeneral ) {
 		pochedir_set_ctrl( FALSE );
 	}
-	
+
 	return FALSE;
 }
-// 
-// 
+
+gboolean on_wind_main_window_state_event( GtkWidget *widget, GdkEventWindowState *event, gpointer ser_data )
+{
+	/*
+	typedef enum
+	{
+	 GDK_WINDOW_STATE_WITHDRAWN = 1 << 0,
+	 GDK_WINDOW_STATE_ICONIFIED = 1 << 1,
+	 GDK_WINDOW_STATE_MAXIMIZED = 1 << 2,
+	 GDK_WINDOW_STATE_STICKY = 1 << 3,
+	 GDK_WINDOW_STATE_FULLSCREEN = 1 << 4,
+	 GDK_WINDOW_STATE_ABOVE = 1 << 5,
+	 GDK_WINDOW_STATE_BELOW = 1 << 6
+	} GdkWindowState;
+	*/
+	if( GDK_WINDOW_STATE_MAXIMIZED == event->new_window_state ) {
+		gdk_window_maximize( gtk_widget_get_window(WindMain) );
+	}
+	return FALSE;
+}
+
+//
+//
 gboolean on_wind_main_delete_event (GtkWidget *widget, GdkEvent *event, gpointer user_data)
 {
 	remove_memory_apply ();
 	gtk_main_quit ();
 	return FALSE;
 }
-// 
-// 
+//
+//
 gboolean on_wind_main_destroy_event (GtkWidget *widget, GdkEvent *event, gpointer user_data)
 {
 	remove_memory_apply ();
 	gtk_main_quit ();
 	return FALSE;
 }
-// 
-// 
+//
+//
 void on_quitter1_activate (GtkMenuItem *menuitem, gpointer user_data)
 {
 	remove_memory_apply ();
 	gtk_main_quit ();
 }
-// 
-// 
+//
+//
 void on_a_propos1_activate (GtkMenuItem *menuitem, gpointer user_data)
 {
 	gchar	*StrAboutXcfa = g_strdup_printf ("About XCFA - %s", VERSION);
-	WinAbout_open (StrAboutXcfa);
+	// WinAbout_open (StrAboutXcfa);
+	wind_about_init( WindMain );
 	g_free (StrAboutXcfa);
 	StrAboutXcfa = NULL;
 }
-// 
-// 
+//
+//
 void on_show_fields_activate (GtkMenuItem *menuitem, gpointer user_data)
 {
-	treeview_open_window ();
+	wintreeview_init( WindMain );
 }
 /* Install un 'handler' sur une mauvaise allocation memoire
 * --
@@ -364,32 +373,30 @@
 */
 void segfault_handler(int sig)
 {
-	g_unlink (XCFA_FILE_LOAD);
 	remove_memory_apply ();
-	
+
 	g_print ("\n=========================================================\n");
 	g_print ("= Segmentation fault\n");
-	g_print (_("= Adressage memoire invalide\n"));
+	g_print ("= Adressage memoire invalide\n");
 	g_print ("=-------------------------------------------------------=\n");
 	g_print ("= You've probably found a bug in XCFA\n");
-	g_print (_("= Vous avez probablement trouve un bug dans XCFA\n"));
+	g_print ("= Vous avez probablement trouve un bug dans XCFA\n");
 	g_print ("=========================================================\n\n");
-		
+
 	exit (EXIT_FAILURE);
 }
-// 
-// 
-void AnalyseCommandLine_set_argv (int argc, gchar *argv[])
+
+//
+//
+void AnalyseCommandLine_set_argv( gint argc, gchar *argv[] )
 {
 	gint	 i;
-	gchar	*str_current_dir = NULL;
-	FILE	*fp = NULL;
-		
+
 	if( optind < argc ) {
-		
+
 		for( i = optind; i < argc; i++ ) {
 			// VERBOSE MODE
-			if( 0 == strcmp( argv[i], "-verbose" )) {
+			if( 0 == strcmp( argv[i], "--verbose" )) {
 				OptionsCommandLine.BoolVerboseMode = TRUE;
 				// g_print( "\nVERBOSE MODE:\n");
 				// g_print( "	argv[ %d ] = %s\n", i, argv[ i ] );
@@ -397,7 +404,7 @@
 				// g_print( "\n" );
 			}
 			// VERSION MODE
-			else if( 0 == strcmp( argv[i], "-version" )) {
+			else if( 0 == strcmp( argv[i], "--version" )) {
 				OptionsCommandLine.BoolVersionMode = TRUE;
 				// g_print( "\nVERSION MODE:\n");
 				// g_print( "	argv[ %d ] = %s\n", i, argv[ i ] );
@@ -405,33 +412,10 @@
 				// g_print( "\n" );
 			}
 			// HELP MODE
-			else if( 0 == strcmp( argv[i], "-help" ) || 0 == strcmp( argv[i], "-h" )) {
+			else if( 0 == strcmp( argv[i], "--help" ) || 0 == strcmp( argv[i], "-h" )) {
 				OptionsCommandLine.BoolHelpMode = TRUE;
 			}
 		}
-		if( FALSE == OptionsCommandLine.BoolVerboseMode && FALSE == OptionsCommandLine.BoolVersionMode ) {
-			str_current_dir = g_get_current_dir();
-			fp = fopen( XCFA_FILE_LOAD, "a" );
-			for( i = optind; i < argc; i++ )
-			{
-				// FROM DESKTOP
-				if( argv[i][0] == '/' ) {
-
-					fprintf( fp, "%s\n", argv[ i ] );
-				}
-				else {
-					gchar *str = NULL;
-				
-					str = g_strdup_printf( "%s/%s", str_current_dir, argv[i] );
-					fprintf( fp, "%s\n", str );
-					g_free( str );
-					str = NULL;
-				}
-			}
-			fclose( fp );
-			g_free( str_current_dir );
-			str_current_dir = NULL;
-		}
 	}
 }
 /* gint main (gint argc, gchar *argv[], gchar **envp)
@@ -449,20 +433,11 @@
 	gchar	*Path = NULL;
 	gchar	*PackageVersion = NULL;
 
-	if (TRUE == process_exist_file ()) {
-		AnalyseCommandLine_set_argv (argc, &argv[0]);		// Get and save param-file
-		return (EXIT_SUCCESS);					// Quit process with success
-	}
-	else {
-		g_unlink (XCFA_FILE_LOAD);				// Del paramter file if exist
-		AnalyseCommandLine_set_argv (argc, &argv[0]);		// Get and save param-file
-		
-		// PLACER CET APPEL JUSTE AVANT: gtk_main ();
-		// 
-		// process_goto_timeout ();
-	}
-	
-	g_print ("%s :: %s (line = %d)\n", __FILE__, __FUNCTION__, __LINE__);
+	/* Init type system as soon as possible */
+	// g_type_init ();
+	g_set_prgname ("xcfa");
+
+	PRINT_FUNC_LF();
 	g_print ("\n");
 	g_print ("***************************\n");
 	g_print ("%s %s\n", PACKAGE, VERSION);
@@ -473,16 +448,18 @@
 	g_print ("Gtk version = %d.%d.%d\n", GTK_MAJOR_VERSION, GTK_MICRO_VERSION, GTK_MINOR_VERSION);
 	g_print ("Glib version = %d.%d.%d\n", GLIB_MAJOR_VERSION, GLIB_MICRO_VERSION, GLIB_MINOR_VERSION);
 	g_print ("***************************\n\n");
-	
+
+	// ANALYSE UNIQUEMENT LES OPTIONS
+	AnalyseCommandLine_set_argv( argc, &argv[0] );
+
 	if( TRUE == OptionsCommandLine.BoolVersionMode || TRUE == OptionsCommandLine.BoolHelpMode ) {
 		if( TRUE == OptionsCommandLine.BoolHelpMode ) {
 			g_print( "HELP MODE:\n");
-			g_print( "	-help -h	Displays this help section and exits\n" );
-			g_print( "	-version	Displays the version of the program and exits\n" );
-			g_print( "	-verbose	Activate verbose mode\n" );
+			g_print( "	--help -h	Displays this help section and exits\n" );
+			g_print( "	--version	Displays the version of the program and exits\n" );
+			g_print( "	--verbose	Activate verbose mode\n" );
 		}
 		g_print( "\n" );
-		g_unlink( XCFA_FILE_LOAD );
 		g_unlink( SPLIT_FILE_TMP_WAV );
 		return( EXIT_SUCCESS );
 	}
@@ -491,33 +468,27 @@
 	if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
 		g_print ("ENABLE_NLS OK\n");
 		g_print ("\tGETTEXT_PACKAGE = %s\n", GETTEXT_PACKAGE);
-		g_print ("\tLOCALE_DIR = %s\n", LOCALE_DIR);	
+		g_print ("\tLOCALE_DIR = %s\n", LOCALE_DIR);
 	}
-	setlocale (LC_ALL, "");
+
+	setlocale( LC_ALL, "" );
 	bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 #else
 	// g_error ("ENABLE_NLS IS NOT OK\n\n");
 #endif
+
 	GetInfo_cpu_print ();
-	if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
-		g_print ("\n");
-		g_print ("HostConf.NbCpu = %d CPU\n", HostConf.NbCpu);
-		g_print ("HostConf.TypeCpu = %d Bits\n", HostConf.TypeCpu);
-		g_print ("HostConf.Machine = %s\n", HostConf.Machine);
-		g_print ("\n");
-	}
-	
-	/* IF Segmentation fault */
+
+	// IF Segmentation fault
 	signal (SIGSEGV, segfault_handler);
-	
+
 	config_read();
-	
-	gtk_set_locale ();
-	gtk_init (&argc, &argv);
-	gdk_threads_enter ();
-	
+
+	setlocale( LC_ALL, "" );
+	gtk_init( &argc, &argv );
+
 	if (NULL == (GtkXcfaProjet = gtk_builder_new ())) {
 		return (EXIT_FAILURE);
 	}
@@ -529,20 +500,21 @@
 	// PathShareProjet = g_strdup_printf ("%s/%s/glade/%s", DATA_DIR, PACKAGE_NAME, PACKAGE_NAME_GLADE);
 	PathShareProjet = xdg_search_data_xdg( PACKAGE_NAME_GLADE );
 
+	if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
+		g_print("\n");
+		g_print("!---\n");
+		g_print("! File XML: [ %s ] %s\n", PathCurrentDir != NULL ? PathCurrentDir : PACKAGE_NAME_GLADE, g_file_test (PathCurrentDir, G_FILE_TEST_EXISTS) ? "Found" : "Not Found !!!" );
+		g_print("!---\n");
+		g_print("! File XML: [ %s ] %s\n", PathShareProjet != NULL ? PathShareProjet : PACKAGE_NAME_GLADE, g_file_test (PathShareProjet, G_FILE_TEST_EXISTS) ? "Found" : "Not Found !!!" );
+		g_print("!---\n");
+	}
+
 	if (FALSE == g_file_test (PathCurrentDir, G_FILE_TEST_EXISTS) && FALSE == g_file_test (PathShareProjet, G_FILE_TEST_EXISTS)) {
-		if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
-			g_print("!---------------------------------------------------------------------------------------------------\n");
-			g_print("! LE FICHIER XML: [ %s ] N'EXISTE PAS !!!\n", PathCurrentDir);
-			g_print("!---------------------------------------------------------------------------------------------------\n");
-			g_print("! LE FICHIER XML: [ %s ] N'EXISTE PAS !!!\n", PathShareProjet);
-			g_print("!---------------------------------------------------------------------------------------------------\n");
-		}
 		g_free (PathCurrentDir);
 		PathCurrentDir = NULL;
 		g_free (PathShareProjet);
 		PathShareProjet = NULL;
 
-		gdk_threads_leave ();
 		return (EXIT_FAILURE);
 	}
 	else if (TRUE == g_file_test (PathCurrentDir, G_FILE_TEST_EXISTS)) {
@@ -565,7 +537,6 @@
 		PathShareProjet = NULL;
 		Path = NULL;
 
-		gdk_threads_leave ();
 		return (EXIT_FAILURE);
 	}
 	g_free (PathCurrentDir);
@@ -574,32 +545,29 @@
 	PathShareProjet = NULL;
 	Path = NULL;
 
-	gtk_builder_set_translation_domain (GtkXcfaProjet, gtk_set_locale ());
+	gtk_builder_set_translation_domain (GtkXcfaProjet, setlocale( LC_ALL, "" ) );
 	gtk_builder_connect_signals (GtkXcfaProjet, NULL);
 	WindMain = GTK_WIDGET (GLADE_GET_OBJECT("wind_main"));
-	
+
 	// REDIMENSIONNER LA FENETRE
 	gtk_window_resize(GTK_WINDOW(WindMain), Config.WinWidth, Config.WinHeight);
 	// PLACER LA FENETRE
 	gtk_window_move(GTK_WINDOW(WindMain), Config.WinPos_X, Config.WinPos_Y);
-	
+
 	PackageVersion = g_strdup_printf ("X Convert File Audio - %s", VERSION);
 	gtk_window_set_title (GTK_WINDOW (WindMain), PackageVersion);
 	g_free (PackageVersion);
 	PackageVersion = NULL;
-	
+
 	libutils_set_default_icone_to_win (WindMain);
-	
-	// SYSTRAY: CREATION DE L'ICONE DE STATUS + INFO-BULLE
-	PopupSystray_init ();
-	
+
 	gtk_widget_show (WindMain);
-	
+
 	// NOTEBOOK
 	gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_general")), NOTEBOOK_PRGEXTERNES);
 		gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_app_externes")), NOTEBOOK_OPTIONS_EXTRA);
 		gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_app_externes")), NOTEBOOK_OPTIONS_PRGEXTERNES);
-		
+
 	// OPTIONS
 	gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_general")), NOTEBOOK_OPTIONS);
 		gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_options")), NOTEBOOK_OPTIONS_EXPORT_TAGS);
@@ -635,13 +603,13 @@
 
 	// DVD-AUDIO
 	gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_general")), NOTEBOOK_DVD_AUDIO);
-	
+
 	var_options.ColorLineCommand = COLOR_INIT;
 	options_set_all_interne ();
 	var_options.ColorLineCommand = COLOR_NONE;
-	
+
 	Config.BoolConfigOk = TRUE;
-	
+
 	gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_general")), Config.NotebookGeneral);
 	gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_expander_cd")), Config.NotebookExpanderCd);
 	gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_in_file")), Config.NotebookFile);
@@ -650,7 +618,7 @@
 	if (NOTEBOOK_SPLIT == Config.NotebookGeneral) {
 		split_set_name_file ();
 	}
-	
+
 	cdaudio_set_flag_buttons ();
 	file_set_flag_buttons ();
 	FileWav_set_flag_buttons ();
@@ -658,35 +626,34 @@
 	FileTags_set_flag_buttons ();
 	gtk_widget_set_sensitive (GTK_WIDGET (var_file_tags.Adr_table_tag), FALSE);
 	gtk_widget_set_sensitive (GTK_WIDGET (GLADE_GET_OBJECT("button_tag_appliquer")), FALSE);
-	
+
 	gtk_widget_hide( GTK_WIDGET (GLADE_GET_OBJECT("frame_discid")));
 	
-	treeview_set_etat_fields ();
-	treeview_radiobutton_set_PosFieldsName ();
-	
-	filetrash_test_trash_is_ok ();
+	// TODO: re-encoding unit [ poche_web.c ] function [ void pocheweb_analyze_file_html( void ) ] -> OK
+	// gtk_widget_hide( GTK_WIDGET (GLADE_GET_OBJECT("frame_import_img_web")));
+
+	wintreeview_set_etat_fields ();
+	wintreeview_radiobutton_set_PosFieldsName ();
+
 	poche_set_flag_buttons();
-	
-	// SI CHARGEMENT DE FICHIERS DEPUIS LE BUREAU AVEC LE MENU CONTEXTUEL
-	process_goto_timeout ();
-	
+
 	// ADMINISTRATOR MODE ?
 	if( 0 == getuid() ) {
-		wininfo_create (
-			_("MODE ADMINISTRATEUR"),
+		wind_info_init (
+			WindMain,
+			_("ADMINISTRATOR MODE"),
 			 "\n",
-			_(" Vous ne devriez pas utiliser "),
+			_(" You should not use "),
 			 "\n",
-			_(" XCFA sous ROOT !"),
+			_(" XCFA under ROOT !"),
 			 "\n",
 			"");
 	}
-	
+
 	xdg_print_list_config_path();
 	xdg_print_list_data_path();
-	
+
 	gtk_main ();
-	gdk_threads_leave ();
 
 	exit(EXIT_SUCCESS);
 }

xcfa-4.2.8.tar.gz/src/mplayer.c -> xcfa-5.0.2.tar.gz/src/mplayer.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : mplayer.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <glib.h>
 #include <glib/gstdio.h>
@@ -289,7 +284,7 @@
 	PRINT("DEBUT THREAD");
 	VarMplayer.BoolThreadActivate = TRUE;
 
-	fd = mplayer_call_exec (VarMplayer.PlayerArgs, &VarMplayer.CodeFork, STDOUT_FILENO); // STDERR_FILENO
+	fd = mplayer_call_exec (VarMplayer.PlayerArgs, &VarMplayer.CodeFork, STDOUT_FILENO); // STDERR_FILENO STDOUT_FILENO
 	// 
 	// mplayer -input cmdlist
 	// 
@@ -473,7 +468,7 @@
 	}
 	else if (VarMplayer.BoolThreadActivate == FALSE) {
 		
-		gtk_timeout_remove (VarMplayer.HandlerTimeout);
+		g_source_remove (VarMplayer.HandlerTimeout);
 
 		// Widget de l'onglet dvd, cd ou fichiers sur ATTENTE
 		switch (VarMplayer.ListPlayFrom) {
@@ -609,7 +604,7 @@
 	if (FALSE == VarMplayer.BoolTimeoutActivate) {
 		VarMplayer.BoolTimeoutActivate = TRUE;
 		PRINT("DEBUT TIMEOUT");
-		VarMplayer.HandlerTimeout = gtk_timeout_add (100, mplayer_timeout, 0);
+		VarMplayer.HandlerTimeout = g_timeout_add (100, mplayer_timeout, 0);
 	}
 }

xcfa-4.2.8.tar.gz/src/mplayer.h -> xcfa-5.0.2.tar.gz/src/mplayer.h Changed

xcfa-4.2.8.tar.gz/src/normalise.c -> xcfa-5.0.2.tar.gz/src/normalise.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : normalise.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib.h>
@@ -264,6 +259,7 @@
 	GList		*List = NULL;
 	INDI_FIX	*IndiFix = NULL;
 	gint		pos;
+	gchar		**PtrTabArgs = NULL;
 
 	List = g_list_first (normalise.ListFixWav);
 	while (FALSE == normalise.bool_set_end_of_user && List) {
@@ -277,17 +273,18 @@
 
 			// Normalisation du Wav
 			// 
-			pos = filelc_get_command_line_nice ();
-			conv.ArgConv [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
-			conv.ArgConv [ pos++ ] = g_strdup ("-a");
-			conv.ArgConv [ pos++ ] = g_strdup_printf ("%s,0000dB", IndiFix->StrDBFS);
-			conv.ArgConv [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
-			conv.ArgConv [ pos++ ] = NULL;
+			PtrTabArgs = filelc_AllocTabArgs();
+			pos = 3;
+			PtrTabArgs [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
+			PtrTabArgs [ pos++ ] = g_strdup ("-a");
+			PtrTabArgs [ pos++ ] = g_strdup_printf ("%s,0000dB", IndiFix->StrDBFS);
+			PtrTabArgs [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
+			PtrTabArgs [ pos++ ] = NULL;
 
 			normalise_set_mess ("Normalise Wav -> Fix");
 
-			conv_to_convert (FALSE, NORMALISE_EXEC, "NORMALISE_EXEC Wav -> Fix");
-			filelc_get_command_line_remove ();
+			conv_to_convert( PtrTabArgs, FALSE, NORMALISE_EXEC, "NORMALISE_EXEC Wav -> Fix");
+			PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 			
 			normalise.ElementActif ++;
 
@@ -322,6 +319,7 @@
 	INDI_FIX	*IndiFix = NULL;
 	PARAM_FILELC	 param_filelc;
 	gint		 pos;
+	gchar		**PtrTabArgs = NULL;
 
 	List = g_list_first (normalise.ListFixOgg);
 	while (FALSE == normalise.bool_set_end_of_user && List) {
@@ -332,20 +330,21 @@
 
 			normalise_set_mess ("Conversion Ogg vers Wav");
 
-			pos = filelc_get_command_line_nice ();
-			conv.ArgConv [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
-			conv.ArgConv [ pos++ ] = g_strdup ("mplayer");
-			conv.ArgConv [ pos++ ] = g_strdup ("-nojoystick");
-			conv.ArgConv [ pos++ ] = g_strdup ("-nolirc");
-			conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-			conv.ArgConv [ pos++ ] = g_strdup ("pcm");
-			conv.ArgConv [ pos++ ] = g_strdup (IndiFix->NameFile);
-			conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-			conv.ArgConv [ pos++ ] = g_strdup_printf ("pcm:file=%s", IndiFix->NameFileCopieWav);
-			conv.ArgConv [ pos++ ] = NULL;
-
-			conv_to_convert (FALSE, MPLAYER_OGG_TO_WAV, "MPLAYER_OGG_TO_WAV");
-			filelc_get_command_line_remove ();
+			PtrTabArgs = filelc_AllocTabArgs();
+			pos = 3;
+			PtrTabArgs [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
+			PtrTabArgs [ pos++ ] = g_strdup ("mplayer");
+			PtrTabArgs [ pos++ ] = g_strdup ("-nojoystick");
+			PtrTabArgs [ pos++ ] = g_strdup ("-nolirc");
+			PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+			PtrTabArgs [ pos++ ] = g_strdup ("pcm");
+			PtrTabArgs [ pos++ ] = g_strdup (IndiFix->NameFile);
+			PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+			PtrTabArgs [ pos++ ] = g_strdup_printf ("pcm:file=%s", IndiFix->NameFileCopieWav);
+			PtrTabArgs [ pos++ ] = NULL;
+
+			conv_to_convert( PtrTabArgs, FALSE, MPLAYER_OGG_TO_WAV, "MPLAYER_OGG_TO_WAV");
+			PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 			
 			normalise.ElementActif ++;
 
@@ -354,15 +353,16 @@
 
 			normalise_set_mess ("Normalise Wav -> Fix");
 
-			pos = filelc_get_command_line_nice ();
-			conv.ArgConv [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
-			conv.ArgConv [ pos++ ] = g_strdup ("-a");
-			conv.ArgConv [ pos++ ] = g_strdup_printf ("%s,0000dB", IndiFix->StrDBFS);
-			conv.ArgConv [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
-			conv.ArgConv [ pos++ ] = NULL;
+			PtrTabArgs = filelc_AllocTabArgs();
+			pos = 3;
+			PtrTabArgs [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
+			PtrTabArgs [ pos++ ] = g_strdup ("-a");
+			PtrTabArgs [ pos++ ] = g_strdup_printf ("%s,0000dB", IndiFix->StrDBFS);
+			PtrTabArgs [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
+			PtrTabArgs [ pos++ ] = NULL;
 			
-			conv_to_convert (FALSE, NORMALISE_EXEC, "NORMALISE_EXEC NORMALISATION du Wav");
-			filelc_get_command_line_remove ();
+			conv_to_convert( PtrTabArgs, FALSE, NORMALISE_EXEC, "NORMALISE_EXEC NORMALISATION du Wav");
+			PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 
 			normalise.ElementActif ++;
 
@@ -386,9 +386,9 @@
 				param_filelc.num_track = NULL;
 				param_filelc.PtrStrBitrate = NULL;
 
-				filelc_get_command_line (&param_filelc);
-				conv_to_convert (FALSE, OGGENC_WAV_TO_OGG, "OGGENC_WAV_TO_OGG");
-				filelc_get_command_line_remove ();
+				PtrTabArgs = filelc_get_command_line (&param_filelc);
+				conv_to_convert( PtrTabArgs, FALSE, OGGENC_WAV_TO_OGG, "OGGENC_WAV_TO_OGG");
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 
 				g_unlink (IndiFix->NameFileCopieWav);
 								
@@ -408,6 +408,7 @@
 	INDI_FIX	*IndiFix = NULL;
 	PARAM_FILELC	param_filelc;
 	gint		pos;
+	gchar		**PtrTabArgs = NULL;
 
 	List = g_list_first (normalise.ListFixMp3);
 	while (FALSE == normalise.bool_set_end_of_user && List) {
@@ -417,25 +418,25 @@
 
 			normalise_set_mess ("Conversion Mp3 vers Wav");
 
-			pos = filelc_get_command_line_nice ();
-			conv.ArgConv [ pos++ ] = g_strdup ("mplayer");
-			conv.ArgConv [ pos++ ] = g_strdup ("-nojoystick");
-			conv.ArgConv [ pos++ ] = g_strdup ("-nolirc");
-			conv.ArgConv [ pos++ ] = g_strdup (IndiFix->NameFile);
-			conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-			conv.ArgConv [ pos++ ] = g_strdup ("pcm");
-			conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-			conv.ArgConv [ pos++ ] = g_strdup_printf ("pcm:file=%s",IndiFix->NameFileCopieWav);
-			conv.ArgConv [ pos++ ] = g_strdup ("-af");
-			conv.ArgConv [ pos++ ] = g_strdup ("channels=2");
-			conv.ArgConv [ pos++ ] = g_strdup ("-srate");
-			conv.ArgConv [ pos++ ] = g_strdup ("44100");
-			conv.ArgConv [ pos++ ] = NULL;
+			PtrTabArgs = filelc_AllocTabArgs();
+			pos = 3;
+			PtrTabArgs [ pos++ ] = g_strdup ("mplayer");
+			PtrTabArgs [ pos++ ] = g_strdup ("-nojoystick");
+			PtrTabArgs [ pos++ ] = g_strdup ("-nolirc");
+			PtrTabArgs [ pos++ ] = g_strdup (IndiFix->NameFile);
+			PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+			PtrTabArgs [ pos++ ] = g_strdup ("pcm");
+			PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+			PtrTabArgs [ pos++ ] = g_strdup_printf ("pcm:file=%s",IndiFix->NameFileCopieWav);
+			PtrTabArgs [ pos++ ] = g_strdup ("-af");
+			PtrTabArgs [ pos++ ] = g_strdup ("channels=2");
+			PtrTabArgs [ pos++ ] = g_strdup ("-srate");
+			PtrTabArgs [ pos++ ] = g_strdup ("44100");
+			PtrTabArgs [ pos++ ] = NULL;
 			
-			conv_to_convert (FALSE, MPLAYER_MP3_TO_WAV, "MPLAYER_MP3_TO_WAV");
-			filelc_get_command_line_remove ();
+			conv_to_convert( PtrTabArgs, FALSE, MPLAYER_MP3_TO_WAV, "MPLAYER_MP3_TO_WAV");
+			PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 
-			
 			normalise.ElementActif ++;
 
 			/* Normalisation du Wav
@@ -443,15 +444,16 @@
 
 			normalise_set_mess ("Normalise Wav -> Fix");
 
-			pos = filelc_get_command_line_nice ();
-			conv.ArgConv [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
-			conv.ArgConv [ pos++ ] = g_strdup ("-a");
-			conv.ArgConv [ pos++ ] = g_strdup_printf ("%s,0000dB", IndiFix->StrDBFS);
-			conv.ArgConv [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
-			conv.ArgConv [ pos++ ] = NULL;
+			PtrTabArgs = filelc_AllocTabArgs();
+			pos = 3;
+			PtrTabArgs [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
+			PtrTabArgs [ pos++ ] = g_strdup ("-a");
+			PtrTabArgs [ pos++ ] = g_strdup_printf ("%s,0000dB", IndiFix->StrDBFS);
+			PtrTabArgs [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
+			PtrTabArgs [ pos++ ] = NULL;
 			
-			conv_to_convert (FALSE, NORMALISE_EXEC, "NORMALISE_EXEC NORMALISATION du Wav");
-			filelc_get_command_line_remove ();
+			conv_to_convert( PtrTabArgs, FALSE, NORMALISE_EXEC, "NORMALISE_EXEC NORMALISATION du Wav");
+			PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 			
 			normalise.ElementActif ++;
 
@@ -475,9 +477,9 @@
 				param_filelc.num_track = NULL;
 				param_filelc.PtrStrBitrate = NULL;
 
-				filelc_get_command_line (&param_filelc);
-				conv_to_convert (FALSE, LAME_WAV_TO_MP3, "LAME_WAV_TO_MP3");
-				filelc_get_command_line_remove ();
+				PtrTabArgs = filelc_get_command_line (&param_filelc);
+				conv_to_convert( PtrTabArgs, FALSE, LAME_WAV_TO_MP3, "LAME_WAV_TO_MP3");
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 				
 				g_unlink (IndiFix->NameFileCopieWav);
 				
@@ -497,6 +499,7 @@
 	GList		*List = NULL;
 	INDI_FIX	*IndiFix = NULL;
 	gint		pos;
+	gchar		**PtrTabArgs = NULL;
 	
 	List = g_list_first (normalise.ListPeakWav);
 	while (FALSE == normalise.bool_set_end_of_user && List) {
@@ -516,17 +519,18 @@
 
 			normalise_set_mess ("Normalise Wav -> Peak");
 
-			pos = filelc_get_command_line_nice ();
-			conv.ArgConv [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
-			conv.ArgConv [ pos++ ] = g_strdup ("--peak");
-			conv.ArgConv [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
-			conv.ArgConv [ pos++ ] = g_strdup ("--");
-			conv.ArgConv [ pos++ ] = NULL;
+			PtrTabArgs = filelc_AllocTabArgs();
+			pos = 3;
+			PtrTabArgs [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
+			PtrTabArgs [ pos++ ] = g_strdup ("--peak");
+			PtrTabArgs [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
+			PtrTabArgs [ pos++ ] = g_strdup ("--");
+			PtrTabArgs [ pos++ ] = NULL;
 
 			if (*IndiFix->EtatTrash == FILE_TRASH_OK) *IndiFix->EtatTrash = FILE_TRASH_VERIF_OK;
 
-			conv_to_convert (FALSE, NORMALISE_EXEC, "NORMALISE_EXEC Wav -> Peak");
-			filelc_get_command_line_remove ();
+			conv_to_convert( PtrTabArgs, FALSE, NORMALISE_EXEC, "NORMALISE_EXEC Wav -> Peak");
+			PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 			
 			normalise.ElementActif ++;
 
@@ -559,6 +563,7 @@
 	INDI_FIX	*IndiFix = NULL;
 	PARAM_FILELC	param_filelc;
 	gint		pos;
+	gchar		**PtrTabArgs = NULL;
 
 	List = g_list_first (normalise.ListPeakOgg);
 	while (FALSE == normalise.bool_set_end_of_user && List) {
@@ -568,17 +573,18 @@
 			*/
 			normalise_set_mess ("Conversion Ogg vers Wav");
 
-			pos = filelc_get_command_line_nice ();
-			conv.ArgConv [ pos++ ] = g_strdup ("ogg123");
-			conv.ArgConv [ pos++ ] = g_strdup ("-d");
-			conv.ArgConv [ pos++ ] = g_strdup ("wav");
-			conv.ArgConv [ pos++ ] = g_strdup ("-f");
-			conv.ArgConv [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
-			conv.ArgConv [ pos++ ] = g_strdup (IndiFix->NameFile);
-			conv.ArgConv [ pos++ ] = NULL;
+			PtrTabArgs = filelc_AllocTabArgs();
+			pos = 3;
+			PtrTabArgs [ pos++ ] = g_strdup ("ogg123");
+			PtrTabArgs [ pos++ ] = g_strdup ("-d");
+			PtrTabArgs [ pos++ ] = g_strdup ("wav");
+			PtrTabArgs [ pos++ ] = g_strdup ("-f");
+			PtrTabArgs [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
+			PtrTabArgs [ pos++ ] = g_strdup (IndiFix->NameFile);
+			PtrTabArgs [ pos++ ] = NULL;
 
-			conv_to_convert (FALSE, OGG123_OGG_TO_WAV, "OGG123_OGG_TO_WAV CONVERSION Ogg vers Wav");
-			filelc_get_command_line_remove ();
+			conv_to_convert( PtrTabArgs, FALSE, OGG123_OGG_TO_WAV, "OGG123_OGG_TO_WAV CONVERSION Ogg vers Wav");
+			PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 
 			normalise.ElementActif ++;
 		
@@ -586,16 +592,17 @@
 			*/
 			normalise_set_mess ("Normalise Wav -> Fix");
 
-			pos = filelc_get_command_line_nice ();
-			conv.ArgConv [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
-			conv.ArgConv [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
-			conv.ArgConv [ pos++ ] = g_strdup ("--peak");
-			conv.ArgConv [ pos++ ] = NULL;
+			PtrTabArgs = filelc_AllocTabArgs();
+			pos = 3;
+			PtrTabArgs [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
+			PtrTabArgs [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
+			PtrTabArgs [ pos++ ] = g_strdup ("--peak");
+			PtrTabArgs [ pos++ ] = NULL;
 			
 			if (*IndiFix->EtatTrash == FILE_TRASH_OK) *IndiFix->EtatTrash = FILE_TRASH_VERIF_OK;
 
-			conv_to_convert (FALSE, NORMALISE_EXEC, "NORMALISE_EXEC Wav -> Peak");
-			filelc_get_command_line_remove ();
+			conv_to_convert( PtrTabArgs, FALSE, NORMALISE_EXEC, "NORMALISE_EXEC Wav -> Peak");
+			PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 
 			normalise.ElementActif ++;
 		
@@ -619,9 +626,9 @@
 				param_filelc.num_track = NULL;
 				param_filelc.PtrStrBitrate = NULL;
 
-				filelc_get_command_line (&param_filelc);
-				conv_to_convert (FALSE, OGGENC_WAV_TO_OGG, "OGGENC_WAV_TO_OGG");
-				filelc_get_command_line_remove ();
+				PtrTabArgs = filelc_get_command_line (&param_filelc);
+				conv_to_convert( PtrTabArgs, FALSE, OGGENC_WAV_TO_OGG, "OGGENC_WAV_TO_OGG");
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 				
 				g_unlink (IndiFix->NameFileCopieWav);
 				
@@ -640,6 +647,7 @@
 	INDI_FIX	*IndiFix = NULL;
 	PARAM_FILELC	param_filelc;
 	gint		pos;
+	gchar		**PtrTabArgs = NULL;
 
 	List = g_list_first (normalise.ListPeakMp3);
 	while (FALSE == normalise.bool_set_end_of_user && List) {
@@ -649,23 +657,24 @@
 			*/
 			normalise_set_mess ("Conversion Mp3 vers Wav");
 
-			pos = filelc_get_command_line_nice ();
-			conv.ArgConv [ pos++ ] = g_strdup ("mplayer");
-			conv.ArgConv [ pos++ ] = g_strdup ("-nojoystick");
-			conv.ArgConv [ pos++ ] = g_strdup ("-nolirc");
-			conv.ArgConv [ pos++ ] = g_strdup (IndiFix->NameFile);
-			conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-			conv.ArgConv [ pos++ ] = g_strdup ("pcm");
-			conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-			conv.ArgConv [ pos++ ] = g_strdup_printf ("pcm:file=%s",IndiFix->NameFileCopieWav);
-			conv.ArgConv [ pos++ ] = g_strdup ("-af");
-			conv.ArgConv [ pos++ ] = g_strdup ("channels=2");
-			conv.ArgConv [ pos++ ] = g_strdup ("-srate");
-			conv.ArgConv [ pos++ ] = g_strdup ("44100");
-			conv.ArgConv [ pos++ ] = NULL;
+			PtrTabArgs = filelc_AllocTabArgs();
+			pos = 3;
+			PtrTabArgs [ pos++ ] = g_strdup ("mplayer");
+			PtrTabArgs [ pos++ ] = g_strdup ("-nojoystick");
+			PtrTabArgs [ pos++ ] = g_strdup ("-nolirc");
+			PtrTabArgs [ pos++ ] = g_strdup (IndiFix->NameFile);
+			PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+			PtrTabArgs [ pos++ ] = g_strdup ("pcm");
+			PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+			PtrTabArgs [ pos++ ] = g_strdup_printf ("pcm:file=%s",IndiFix->NameFileCopieWav);
+			PtrTabArgs [ pos++ ] = g_strdup ("-af");
+			PtrTabArgs [ pos++ ] = g_strdup ("channels=2");
+			PtrTabArgs [ pos++ ] = g_strdup ("-srate");
+			PtrTabArgs [ pos++ ] = g_strdup ("44100");
+			PtrTabArgs [ pos++ ] = NULL;
 			
-			conv_to_convert (FALSE, MPLAYER_MP3_TO_WAV, "MPLAYER_MP3_TO_WAV");
-			filelc_get_command_line_remove ();
+			conv_to_convert( PtrTabArgs, FALSE, MPLAYER_MP3_TO_WAV, "MPLAYER_MP3_TO_WAV");
+			PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 			
 			normalise.ElementActif ++;
 
@@ -673,14 +682,15 @@
 			*/
 			normalise_set_mess ("Normalise Wav -> Peak");
 
-			pos = filelc_get_command_line_nice ();
-			conv.ArgConv [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
-			conv.ArgConv [ pos++ ] = g_strdup ("--peak");
-			conv.ArgConv [ pos++ ] = g_strdup (IndiFix->NameFileCopieMp3);
-			conv.ArgConv [ pos++ ] = NULL;
+			PtrTabArgs = filelc_AllocTabArgs();
+			pos = 3;
+			PtrTabArgs [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
+			PtrTabArgs [ pos++ ] = g_strdup ("--peak");
+			PtrTabArgs [ pos++ ] = g_strdup (IndiFix->NameFileCopieMp3);
+			PtrTabArgs [ pos++ ] = NULL;
 			
-			conv_to_convert (FALSE, NORMALISE_EXEC, "NORMALISE_EXEC Wav -> Peak");
-			filelc_get_command_line_remove ();
+			conv_to_convert( PtrTabArgs, FALSE, NORMALISE_EXEC, "NORMALISE_EXEC Wav -> Peak");
+			PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 
 			normalise.ElementActif ++;
 
@@ -704,9 +714,9 @@
 				param_filelc.num_track = NULL;
 				param_filelc.PtrStrBitrate = NULL;
 
-				filelc_get_command_line (&param_filelc);
-				conv_to_convert (FALSE, LAME_WAV_TO_MP3, "LAME_WAV_TO_MP3");
-				filelc_get_command_line_remove ();
+				PtrTabArgs = filelc_get_command_line (&param_filelc);
+				conv_to_convert( PtrTabArgs, FALSE, LAME_WAV_TO_MP3, "LAME_WAV_TO_MP3");
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 				
 				g_unlink (IndiFix->NameFileCopieWav);
 								
@@ -727,6 +737,7 @@
 	INDI_FIX	*IndiFix = NULL;
 	PARAM_FILELC	param_filelc;
 	gint		pos;
+	gchar		**PtrTabArgs = NULL;
 
 	PRINT_FUNC_LF();
 
@@ -748,17 +759,18 @@
 		while (List) {
 			if ((IndiFix = (INDI_FIX *)List->data)) {
 				
-				pos = filelc_get_command_line_nice ();
-				conv.ArgConv [ pos++ ] = g_strdup ("ogg123");
-				conv.ArgConv [ pos++ ] = g_strdup ("-d");
-				conv.ArgConv [ pos++ ] = g_strdup ("wav");
-				conv.ArgConv [ pos++ ] = g_strdup ("-f");
-				conv.ArgConv [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
-				conv.ArgConv [ pos++ ] = g_strdup (IndiFix->NameFile);
-				conv.ArgConv [ pos++ ] = NULL;
-
-				conv_to_convert (FALSE, OGG123_OGG_TO_WAV, "OGG123_OGG_TO_WAV CONVERSION Ogg vers Wav");
-				filelc_get_command_line_remove ();
+				PtrTabArgs = filelc_AllocTabArgs();
+				pos = 3;
+				PtrTabArgs [ pos++ ] = g_strdup ("ogg123");
+				PtrTabArgs [ pos++ ] = g_strdup ("-d");
+				PtrTabArgs [ pos++ ] = g_strdup ("wav");
+				PtrTabArgs [ pos++ ] = g_strdup ("-f");
+				PtrTabArgs [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
+				PtrTabArgs [ pos++ ] = g_strdup (IndiFix->NameFile);
+				PtrTabArgs [ pos++ ] = NULL;
+
+				conv_to_convert( PtrTabArgs, FALSE, OGG123_OGG_TO_WAV, "OGG123_OGG_TO_WAV CONVERSION Ogg vers Wav");
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 
 				normalise.ElementActif ++;
 			}
@@ -774,24 +786,25 @@
 		while (List) {
 			if ((IndiFix = (INDI_FIX *)List->data)) {
 				
-				pos = filelc_get_command_line_nice ();
-				conv.ArgConv [ pos++ ] = g_strdup ("mplayer");
-				conv.ArgConv [ pos++ ] = g_strdup ("-nojoystick");
-				conv.ArgConv [ pos++ ] = g_strdup ("-nolirc");
-				conv.ArgConv [ pos++ ] = g_strdup (IndiFix->NameFile);
-				conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-				conv.ArgConv [ pos++ ] = g_strdup ("pcm");
-				conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-				conv.ArgConv [ pos++ ] = g_strdup_printf ("pcm:file=%s",IndiFix->NameFileCopieWav);
-				conv.ArgConv [ pos++ ] = g_strdup ("-af");
-				conv.ArgConv [ pos++ ] = g_strdup ("channels=2");
-				conv.ArgConv [ pos++ ] = g_strdup ("-srate");
-				conv.ArgConv [ pos++ ] = g_strdup ("44100");
-				conv.ArgConv [ pos++ ] = NULL;
-
-				conv_to_convert (FALSE, MPLAYER_MP3_TO_WAV, "MPLAYER_MP3_TO_WAV");
-				filelc_get_command_line_remove ();
-				
+				PtrTabArgs = filelc_AllocTabArgs();
+				pos = 3;
+				PtrTabArgs [ pos++ ] = g_strdup ("mplayer");
+				PtrTabArgs [ pos++ ] = g_strdup ("-nojoystick");
+				PtrTabArgs [ pos++ ] = g_strdup ("-nolirc");
+				PtrTabArgs [ pos++ ] = g_strdup (IndiFix->NameFile);
+				PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+				PtrTabArgs [ pos++ ] = g_strdup ("pcm");
+				PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+				PtrTabArgs [ pos++ ] = g_strdup_printf ("pcm:file=%s",IndiFix->NameFileCopieWav);
+				PtrTabArgs [ pos++ ] = g_strdup ("-af");
+				PtrTabArgs [ pos++ ] = g_strdup ("channels=2");
+				PtrTabArgs [ pos++ ] = g_strdup ("-srate");
+				PtrTabArgs [ pos++ ] = g_strdup ("44100");
+				PtrTabArgs [ pos++ ] = NULL;
+
+				conv_to_convert( PtrTabArgs, FALSE, MPLAYER_MP3_TO_WAV, "MPLAYER_MP3_TO_WAV");
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
+
 				normalise.ElementActif ++;
 			}
 			List = g_list_next(List);
@@ -804,16 +817,17 @@
 
 		normalise_set_mess ("(MIX)RMS/GROUPE: Normalise Wav");
 		
-		pos = filelc_get_command_line_nice ();
-		conv.ArgConv [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
-		conv.ArgConv [ pos++ ] = g_strdup ("-a");
-		conv.ArgConv [ pos++ ] = g_strdup_printf ("%d,0000dB", normalise.LevelMix);
-		conv.ArgConv [ pos++ ] = g_strdup ("--batch");
+		PtrTabArgs = filelc_AllocTabArgs();
+		pos = 3;
+		PtrTabArgs [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
+		PtrTabArgs [ pos++ ] = g_strdup ("-a");
+		PtrTabArgs [ pos++ ] = g_strdup_printf ("%d,0000dB", normalise.LevelMix);
+		PtrTabArgs [ pos++ ] = g_strdup ("--batch");
 		/* Creation liste WAV */
 		List = g_list_first (normalise.ListMixGroupWav);
 		while (List) {
 			if (NULL != (IndiFix = (INDI_FIX *)List->data)) {
-				conv.ArgConv [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
+				PtrTabArgs [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
 				if (*IndiFix->EtatTrash == FILE_TRASH_OK) *IndiFix->EtatTrash = FILE_TRASH_VERIF_OK;
 			}
 			List = g_list_next(List);
@@ -822,7 +836,7 @@
 		List = g_list_first (normalise.ListMixGroupOgg);
 		while (List) {
 			if (NULL != (IndiFix = (INDI_FIX *)List->data)) {
-				conv.ArgConv [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
+				PtrTabArgs [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
 				if (*IndiFix->EtatTrash == FILE_TRASH_OK) *IndiFix->EtatTrash = FILE_TRASH_VERIF_OK;
 			}
 			List = g_list_next(List);
@@ -831,16 +845,16 @@
 		List = g_list_first (normalise.ListMixGroupMp3);
 		while (List) {
 			if (NULL != (IndiFix = (INDI_FIX *)List->data)) {
-				conv.ArgConv [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
+				PtrTabArgs [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
 				if (*IndiFix->EtatTrash == FILE_TRASH_OK) *IndiFix->EtatTrash = FILE_TRASH_VERIF_OK;
 			}
 			List = g_list_next(List);
 		}
-		conv.ArgConv [ pos++ ] = NULL;
+		PtrTabArgs [ pos++ ] = NULL;
 		
 		/* Normalisation */
-		conv_to_convert (FALSE, NORMALISE_EXEC, "NORMALISE_EXEC Wav -> (MIX)RMS/GROUPE");
-		filelc_get_command_line_remove ();
+		conv_to_convert( PtrTabArgs, FALSE, NORMALISE_EXEC, "NORMALISE_EXEC Wav -> (MIX)RMS/GROUPE");
+		PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 
 		normalise.ElementActif ++;
 	}
@@ -881,9 +895,9 @@
 					param_filelc.num_track = NULL;
 					param_filelc.PtrStrBitrate = NULL;
 
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (FALSE, OGGENC_WAV_TO_OGG, "OGGENC_WAV_TO_OGG");
-					filelc_get_command_line_remove ();
+					PtrTabArgs = filelc_get_command_line (&param_filelc);
+					conv_to_convert( PtrTabArgs, FALSE, OGGENC_WAV_TO_OGG, "OGGENC_WAV_TO_OGG");
+					PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 				
 					g_unlink (IndiFix->NameFileCopieWav);
 
@@ -909,9 +923,9 @@
 					param_filelc.num_track = NULL;
 					param_filelc.PtrStrBitrate = NULL;
 
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (FALSE, LAME_WAV_TO_MP3, "LAME_WAV_TO_MP3");
-					filelc_get_command_line_remove ();
+					PtrTabArgs = filelc_get_command_line (&param_filelc);
+					conv_to_convert( PtrTabArgs,FALSE, LAME_WAV_TO_MP3, "LAME_WAV_TO_MP3");
+					PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 
 					g_unlink (IndiFix->NameFileCopieWav);
 
@@ -930,6 +944,7 @@
 	INDI_FIX	*IndiFix = NULL;
 	PARAM_FILELC	param_filelc;
 	gint		pos;
+	gchar		**PtrTabArgs = NULL;
 	
 	/* COPIE WAV OGG MP3
 	*/
@@ -947,17 +962,19 @@
 		List = g_list_first (normalise.ListPeakGroupOgg);
 		while (List) {
 			if (NULL != (IndiFix = (INDI_FIX *)List->data)) {
-				pos = filelc_get_command_line_nice ();
-				conv.ArgConv [ pos++ ] = g_strdup ("ogg123");
-				conv.ArgConv [ pos++ ] = g_strdup ("-d");
-				conv.ArgConv [ pos++ ] = g_strdup ("wav");
-				conv.ArgConv [ pos++ ] = g_strdup ("-f");
-				conv.ArgConv [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
-				conv.ArgConv [ pos++ ] = g_strdup (IndiFix->NameFile);
-				conv.ArgConv [ pos++ ] = NULL;
-
-				conv_to_convert (FALSE, OGG123_OGG_TO_WAV, "OGG123_OGG_TO_WAV CONVERSION Ogg vers Wav");
-				filelc_get_command_line_remove ();
+				
+				PtrTabArgs = filelc_AllocTabArgs();
+				pos = 3;
+				PtrTabArgs [ pos++ ] = g_strdup ("ogg123");
+				PtrTabArgs [ pos++ ] = g_strdup ("-d");
+				PtrTabArgs [ pos++ ] = g_strdup ("wav");
+				PtrTabArgs [ pos++ ] = g_strdup ("-f");
+				PtrTabArgs [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
+				PtrTabArgs [ pos++ ] = g_strdup (IndiFix->NameFile);
+				PtrTabArgs [ pos++ ] = NULL;
+
+				conv_to_convert( PtrTabArgs, FALSE, OGG123_OGG_TO_WAV, "OGG123_OGG_TO_WAV CONVERSION Ogg vers Wav");
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 
 				normalise.ElementActif ++;
 			}
@@ -973,23 +990,24 @@
 		while (List) {
 			if (NULL != (IndiFix = (INDI_FIX *)List->data)) {
 				
-				pos = filelc_get_command_line_nice ();
-				conv.ArgConv [ pos++ ] = g_strdup ("mplayer");
-				conv.ArgConv [ pos++ ] = g_strdup ("-nojoystick");
-				conv.ArgConv [ pos++ ] = g_strdup ("-nolirc");
-				conv.ArgConv [ pos++ ] = g_strdup (IndiFix->NameFile);
-				conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-				conv.ArgConv [ pos++ ] = g_strdup ("pcm");
-				conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-				conv.ArgConv [ pos++ ] = g_strdup_printf ("pcm:file=%s",IndiFix->NameFileCopieWav);
-				conv.ArgConv [ pos++ ] = g_strdup ("-af");
-				conv.ArgConv [ pos++ ] = g_strdup ("channels=2");
-				conv.ArgConv [ pos++ ] = g_strdup ("-srate");
-				conv.ArgConv [ pos++ ] = g_strdup ("44100");
-				conv.ArgConv [ pos++ ] = NULL;
-
-				conv_to_convert (FALSE, MPLAYER_MP3_TO_WAV, "MPLAYER_MP3_TO_WAV");
-				filelc_get_command_line_remove ();
+				PtrTabArgs = filelc_AllocTabArgs();
+				pos = 3;
+				PtrTabArgs [ pos++ ] = g_strdup ("mplayer");
+				PtrTabArgs [ pos++ ] = g_strdup ("-nojoystick");
+				PtrTabArgs [ pos++ ] = g_strdup ("-nolirc");
+				PtrTabArgs [ pos++ ] = g_strdup (IndiFix->NameFile);
+				PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+				PtrTabArgs [ pos++ ] = g_strdup ("pcm");
+				PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+				PtrTabArgs [ pos++ ] = g_strdup_printf ("pcm:file=%s",IndiFix->NameFileCopieWav);
+				PtrTabArgs [ pos++ ] = g_strdup ("-af");
+				PtrTabArgs [ pos++ ] = g_strdup ("channels=2");
+				PtrTabArgs [ pos++ ] = g_strdup ("-srate");
+				PtrTabArgs [ pos++ ] = g_strdup ("44100");
+				PtrTabArgs [ pos++ ] = NULL;
+
+				conv_to_convert( PtrTabArgs, FALSE, MPLAYER_MP3_TO_WAV, "MPLAYER_MP3_TO_WAV");
+				PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 				
 				normalise.ElementActif ++;
 			}
@@ -1004,15 +1022,16 @@
 		normalise_set_mess ("PEAK/GROUPE: Chercher la moyenne Peak");
 		
 		/* CHERCHER LA MOYENNE PEAK */
-		pos = filelc_get_command_line_nice ();
-		conv.ArgConv [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
-		conv.ArgConv [ pos++ ] = g_strdup ("-n");
+		PtrTabArgs = filelc_AllocTabArgs();
+		pos = 3;
+		PtrTabArgs [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
+		PtrTabArgs [ pos++ ] = g_strdup ("-n");
 
 		/* Creation liste WAV */
 		List = g_list_first (normalise.ListPeakGroupWav);
 		while (List) {
 			if ((IndiFix = (INDI_FIX *)List->data)) {
-				conv.ArgConv [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
+				PtrTabArgs [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
 			}
 			List = g_list_next(List);
 		}
@@ -1020,7 +1039,7 @@
 		List = g_list_first (normalise.ListPeakGroupOgg);
 		while (List) {
 			if ((IndiFix = (INDI_FIX *)List->data)) {
-				conv.ArgConv [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
+				PtrTabArgs [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
 			}
 			List = g_list_next(List);
 		}
@@ -1028,29 +1047,30 @@
 		List = g_list_first (normalise.ListPeakGroupMp3);
 		while (List) {
 			if ((IndiFix = (INDI_FIX *)List->data)) {
-				conv.ArgConv [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
+				PtrTabArgs [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
 			}
 			List = g_list_next(List);
 		}
-		conv.ArgConv [ pos++ ] = NULL;
+		PtrTabArgs [ pos++ ] = NULL;
 		
 		/* Chercher la moyenne PEAK */
-		conv_to_convert (FALSE, NORMALISE_GET_LEVEL, "NORMALISE_GET_LEVEL -> PEAK/GROUP");
-		filelc_get_command_line_remove ();
+		conv_to_convert( PtrTabArgs, FALSE, NORMALISE_GET_LEVEL, "NORMALISE_GET_LEVEL -> PEAK/GROUP");
+		PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 		
 		/* APPLIQUER LA MOYENNE PEAK */
 
 		normalise_set_mess ("PEAK/GROUPE: Normalise Wav");
 		
-		pos = filelc_get_command_line_nice ();
-		conv.ArgConv [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
-		conv.ArgConv [ pos++ ] = g_strdup_printf ("--gain=%fdB", conv.value_PEAK_RMS_GROUP_ARGS);
+		PtrTabArgs = filelc_AllocTabArgs();
+		pos = 3;
+		PtrTabArgs [ pos++ ] = g_strdup (prginit_get_name (NMR_normalize));
+		PtrTabArgs [ pos++ ] = g_strdup_printf ("--gain=%fdB", conv.value_PEAK_RMS_GROUP_ARGS);
 		
 		/* Creation liste WAV */
 		List = g_list_first (normalise.ListPeakGroupWav);
 		while (List) {
 			if ((IndiFix = (INDI_FIX *)List->data)) {
-				conv.ArgConv [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
+				PtrTabArgs [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
 				if (*IndiFix->EtatTrash == FILE_TRASH_OK) *IndiFix->EtatTrash = FILE_TRASH_VERIF_OK;
 			}
 			List = g_list_next(List);
@@ -1059,7 +1079,7 @@
 		List = g_list_first (normalise.ListPeakGroupOgg);
 		while (List) {
 			if ((IndiFix = (INDI_FIX *)List->data)) {
-				conv.ArgConv [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
+				PtrTabArgs [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
 				if (*IndiFix->EtatTrash == FILE_TRASH_OK) *IndiFix->EtatTrash = FILE_TRASH_VERIF_OK;
 			}
 			List = g_list_next(List);
@@ -1068,16 +1088,16 @@
 		List = g_list_first (normalise.ListPeakGroupMp3);
 		while (List) {
 			if ((IndiFix = (INDI_FIX *)List->data)) {
-				conv.ArgConv [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
+				PtrTabArgs [ pos++ ] = g_strdup (IndiFix->NameFileCopieWav);
 				if (*IndiFix->EtatTrash == FILE_TRASH_OK) *IndiFix->EtatTrash = FILE_TRASH_VERIF_OK;
 			}
 			List = g_list_next(List);
 		}
-		conv.ArgConv [ pos++ ] = NULL;
+		PtrTabArgs [ pos++ ] = NULL;
 		
 		/* Normalisation */
-		conv_to_convert (FALSE, NORMALISE_EXEC, "NORMALISE_EXEC Wav -> PEAK/GROUP");
-		filelc_get_command_line_remove ();
+		conv_to_convert( PtrTabArgs, FALSE, NORMALISE_EXEC, "NORMALISE_EXEC Wav -> PEAK/GROUP");
+		PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 
 		normalise.ElementActif ++;
 	}
@@ -1121,9 +1141,9 @@
 					param_filelc.num_track = NULL;
 					param_filelc.PtrStrBitrate = NULL;
 
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (FALSE, OGGENC_WAV_TO_OGG, "OGGENC_WAV_TO_OGG");
-					filelc_get_command_line_remove ();
+					PtrTabArgs = filelc_get_command_line (&param_filelc);
+					conv_to_convert( PtrTabArgs, FALSE, OGGENC_WAV_TO_OGG, "OGGENC_WAV_TO_OGG");
+					PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 
 					g_unlink (IndiFix->NameFileCopieWav);
 
@@ -1149,9 +1169,9 @@
 					param_filelc.num_track = NULL;
 					param_filelc.PtrStrBitrate = NULL;
 
-					filelc_get_command_line (&param_filelc);
-					conv_to_convert (FALSE, LAME_WAV_TO_MP3, "LAME_WAV_TO_MP3");
-					filelc_get_command_line_remove ();
+					PtrTabArgs = filelc_get_command_line (&param_filelc);
+					conv_to_convert( PtrTabArgs, FALSE, LAME_WAV_TO_MP3, "LAME_WAV_TO_MP3");
+					PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 
 					g_unlink (IndiFix->NameFileCopieWav);
 
@@ -1263,7 +1283,8 @@
 // 
 void normalise_get_NameFileCopie (INDI_FIX *p_IndiFix, gint pos)
 {
-	if (NULL == conv.TmpRep)
+	// Create tmp rep
+	if( NULL == conv.TmpRep )
 		conv.TmpRep = libutils_create_temporary_rep (Config.PathnameTMP, PATH_TMP_XCFA_AUDIOFILE);
 
 	p_IndiFix->NameFileCopieWav = g_strdup_printf ("%s/%d.wav", conv.TmpRep, pos);
@@ -1732,7 +1753,7 @@
 		normalise.ListPeakGroupOgg	= normalise_remove_glist_STRUCT (normalise.ListPeakGroupOgg);
 		normalise.ListPeakGroupMp3	= normalise_remove_glist_STRUCT (normalise.ListPeakGroupMp3);
 
-		gtk_timeout_remove (normalise.Handler_Timeout);
+		g_source_remove (normalise.Handler_Timeout);
 		file_pixbuf_update_glist ();
 		fileaction_set_end (TYPE_NORMALISE);
 	}
@@ -1745,7 +1766,12 @@
 {
 	// PRINT_FUNC_LF();
 	
-	WindScan_open ("Normalisation", WINDSCAN_PULSE);
+	// WindScan_open ("Normalisation", WINDSCAN_PULSE);
+	wind_scan_init(
+		WindMain,
+		"Normalisation",
+		WINDSCAN_PULSE
+		);
 	WindScan_set_label ("Normalisation des fichiers ...");
 	normalise.bool_thread_end = FALSE;
 	normalise.bool_set_end_of_user = FALSE;
@@ -1757,7 +1783,7 @@
 	normalise.ElementActif = 0;
 	conv_reset_struct (WindScan_close_request);
 	pthread_create (&normalise.nmr_tid, NULL ,(void *)normalise_struct_lists, (void *)NULL);
-	normalise.Handler_Timeout = gtk_timeout_add (100, normalise_timeout, 0);
+	normalise.Handler_Timeout = g_timeout_add (100, normalise_timeout, 0);
 
 }

xcfa-4.2.8.tar.gz/src/normalise.h -> xcfa-5.0.2.tar.gz/src/normalise.h Changed

xcfa-4.2.8.tar.gz/src/notify_send.c -> xcfa-5.0.2.tar.gz/src/notify_send.c Changed

xcfa-4.2.8.tar.gz/src/notify_send.h -> xcfa-5.0.2.tar.gz/src/notify_send.h Changed

xcfa-4.2.8.tar.gz/src/options.c -> xcfa-5.0.2.tar.gz/src/options.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : options.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <string.h>
 #include <stdlib.h>
@@ -134,11 +129,9 @@
 	gint i;
 	gchar *Ptr = NULL;
 
-	// libcombo_alloc (GTK_COMBO_BOX (widget));
-	
 	for (i = 0; i < 20; i++) {
 		Ptr = g_strdup_printf ("%d", i);
-		gtk_combo_box_append_text (GTK_COMBO_BOX (widget), Ptr);
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), Ptr );
 		g_free (Ptr);
 		Ptr = NULL;
 	}
@@ -171,9 +164,10 @@
 		gtk_button_set_label (GTK_BUTTON (var_options.Adr_path_temp), Config.PathnameTMP);
 	}
 	else {
-		wininfo_create (
-			_("ERREUR: Lieu de stockage non autorise !"),
-			_("Veuillez recommencer."),
+		wind_info_init (
+			WindMain,
+			_("ERROR : storage location not permitted !"),
+			_("Please start again."),
 			 "");
 	}
 }
@@ -197,13 +191,13 @@
 }
 // 
 //
-gchar *options_get_params (TYPE_CONV TypeConv, DETAIL *detail)
+gchar *options_get_params( TYPE_CONV TypeConv )
 {
 	if (TypeConv == LAME_WAV_TO_MP3) {
-		return ((gchar *)optionsLame_get_param (detail));
+		return( (gchar *)optionsLame_get_param() );
 	}
 	else if (TypeConv == OGGENC_WAV_TO_OGG || TypeConv == OGGENC_FLAC_TO_OGG) {
-		return ((gchar *)optionsOggenc_get_param (detail));
+		return ((gchar *)optionsOggenc_get_param() );
 	}
 	return ((gchar *)NULL);
 }

xcfa-4.2.8.tar.gz/src/options.h -> xcfa-5.0.2.tar.gz/src/options.h Changed

@@ -1,9 +1,9 @@
  /*
  *  file      : options.h
  *  project   : xcfa
- *  with      : Gtk-2
+ *  with      : Gtk-3
  *
- *  copyright : (C) 2003 - 2012 by Claude Bulin
+ *  copyright : (C) 2003 - 2015 by Claude Bulin
  *
  *  xcfa - GTK+ implementation of the GNU shell command
  *  GNU General Public License
@@ -30,99 +30,100 @@
 
 
 typedef enum {
-	COLOR_INIT = 0,								// 
-	COLOR_NONE,								// 
-	COLOR_LAME_DEBIT,							// 
-	COLOR_LAME_MODE,							// 
-	COLOR_OGGENC_DEBIT,							// 
-	COLOR_OGGENC_MANAGED,							// 
-	COLOR_OGGENC_DOWNMIX,							// 
-	COLOR_FLAC_TAUX_COMPRESSION,						// 
-	COLOR_MAC_QUALITE,							// 
-	COLOR_WAVPACK_MODE_HYBRIDE,						// 
-	COLOR_WAVPACK_COMPRESSION,						// 
-	COLOR_WAVPACK_SOUND,							// 
-	COLOR_WAVPACK_FICHIER_CORRECTION,					// 
-	COLOR_WAVPACK_COMPRESSION_MAXIMUM,					// 
-	COLOR_WAVPACK_SIGNATURE_MD5,						// 
-	COLOR_WAVPACK_EXTRA_ENCODING,						// 
-	COLOR_MUSEPACK_QUALITE,							// 
-	COLOR_FAAC_CONTENEUR,							// 
-	COLOR_FAAC_SET_CHOICE_VBR_ABR,						// 
-	COLOR_TAG_ARTIST,							// 
-	COLOR_TAG_TITLE,							// 
-	COLOR_TAG_ALBUM,							// 
-	COLOR_TAG_NUMERATE,							// 
-	COLOR_TAG_GENRE,							// 
-	COLOR_TAG_YEAR,								// 
-	COLOR_TAG_COMMENT							// 
+	COLOR_INIT = 0,												// 
+	COLOR_NONE,													// 
+	COLOR_LAME_DEBIT,											// 
+	COLOR_LAME_MODE,											// 
+	COLOR_OGGENC_DEBIT,											// 
+	COLOR_OGGENC_MANAGED,										// 
+	COLOR_OGGENC_DOWNMIX,										// 
+	COLOR_FLAC_TAUX_COMPRESSION,								// 
+	COLOR_MAC_QUALITE,											// 
+	COLOR_WAVPACK_MODE_HYBRIDE,									// 
+	COLOR_WAVPACK_COMPRESSION,									// 
+	COLOR_WAVPACK_SOUND,										// 
+	COLOR_WAVPACK_FICHIER_CORRECTION,							// 
+	COLOR_WAVPACK_COMPRESSION_MAXIMUM,							// 
+	COLOR_WAVPACK_SIGNATURE_MD5,								// 
+	COLOR_WAVPACK_EXTRA_ENCODING,								// 
+	COLOR_MUSEPACK_QUALITE,										// 
+	COLOR_FAAC_CONTENEUR,										// 
+	COLOR_FAAC_SET_CHOICE_VBR_ABR,								// 
+	COLOR_TAG_ARTIST,											// 
+	COLOR_TAG_TITLE,											// 
+	COLOR_TAG_ALBUM,											// 
+	COLOR_TAG_NUMERATE,											// 
+	COLOR_TAG_GENRE,											// 
+	COLOR_TAG_YEAR,												// 
+	COLOR_TAG_COMMENT											// 
 } COLOR_LINE_COMMAND;
 
 typedef enum {
-	_NONE_ = 0,								// 
-	_DEBIAN_,								// 
-	_TGZ_,									// 
-	_RPM_,									// 
-	_FPM_,									// 
-	_ARCHLINUX_,								// 
-	_PACKAGE_NOT_FOUND_							// 
+	_NONE_ = 0,													// 
+	_DEBIAN_,													// 
+	_TGZ_,														// 
+	_RPM_,														// 
+	_FPM_,														// 
+	_ARCHLINUX_,												// 
+	_PACKAGE_NOT_FOUND_											// 
 } TYPE_PACKAGE;
 
 typedef struct {
 	GtkWidget		*Adr_button_music_file_end_of_convert;		// 
-	GtkWidget		*Adr_checkbutton_end_of_convert;		// 
-	GtkComboBox		*Adr_Widget_Nice;				// 
-	GtkComboBox		*Adr_Widget_Lame_bitrate;			// 
-	GtkComboBox		*Adr_Widget_Lame_abr_cbr_vbr;			// 
-	GtkComboBox		*Adr_Widget_Lame_Mode;				// 
-	GtkComboBox		*Adr_Widget_Oggenc_bitrate;			// 
-	GtkComboBox		*Adr_Widget_Oggenc_managed;			// 
-	GtkComboBox		*Adr_Widget_Oggenc_downmix;			// 
-	GtkComboBox		*Adr_Widget_Mppenc;				// 
-	GtkComboBox		*Adr_Widget_wavpack;				// 
-	GtkComboBox		*Adr_Widget_wavpack_sound;			// 
-	GtkComboBox		*Adr_Widget_wavpack_mode_hybride;		// 
+	GtkWidget		*Adr_checkbutton_end_of_convert;			// 
+	GtkComboBox		*Adr_Widget_Nice;							// 
+	GtkComboBox		*Adr_Widget_Lame_bitrate;					// 
+	GtkComboBox		*Adr_Widget_Lame_abr_cbr_vbr;				// 
+	GtkComboBox		*Adr_Widget_Lame_Mode;						// 
+	GtkComboBox		*Adr_Widget_Oggenc_bitrate;					// 
+	GtkComboBox		*Adr_Widget_Oggenc_managed;					// 
+	GtkComboBox		*Adr_Widget_Oggenc_downmix;					// 
+	GtkComboBox		*Adr_Widget_Mppenc;							// 
+	GtkComboBox		*Adr_Widget_wavpack;						// 
+	GtkComboBox		*Adr_Widget_wavpack_sound;					// 
+	GtkComboBox		*Adr_Widget_wavpack_mode_hybride;			// 
 	GtkComboBox		*Adr_Widget_wavpack_correction_file;		// 
 	GtkComboBox		*Adr_Widget_wavpack_maximum_compression;	// 
-	GtkComboBox		*Adr_Widget_wavpack_signature_md5;		// 
-	GtkComboBox		*Adr_Widget_wavpack_extra_encoding;		// 
-	GtkComboBox		*Adr_Widget_flac_compression;			// 
-	GtkComboBox		*Adr_Widget_ape_compression;			// 
-	GtkWidget		*Adr_radiobutton_cdparanoia;			// 
-	GtkWidget		*Adr_radiobutton_libcddb;			// 
+	GtkComboBox		*Adr_Widget_wavpack_signature_md5;			// 
+	GtkComboBox		*Adr_Widget_wavpack_extra_encoding;			// 
+	GtkComboBox		*Adr_Widget_flac_compression;				// 
+	GtkComboBox		*Adr_Widget_ape_compression;				// 
+	GtkWidget		*Adr_radiobutton_cdparanoia;				// 
+	GtkWidget		*Adr_radiobutton_libcddb;					// 
 	GtkWidget		*Adr_radiobutton_extract_with_cdparanoia;	// 
-	GtkWidget		*Adr_radiobutton_extract_with_cdda2wav;		// 
+	GtkWidget		*Adr_radiobutton_cdparanoia_mode_2;			// 
 	GtkWidget		*Adr_radiobutton_cdparanoia_mode_expert;	// 
-	GtkWidget		*Adr_label_type_paquege;			// 
-	TYPE_PACKAGE		Type_Package;					// _NONE_ = 0, _DEBIAN_, _TGZ_, _RPM_, _FPM_, _PACKAGE_NOT_FOUND_
-	GtkWidget		*Adr_entry_lame_mp3;				// 
-	GtkWidget		*Adr_label_lame_mp3;				// 
-	GtkWidget		*Adr_entry_oggenc_ogg;				// 
-	GtkWidget		*Adr_label_oggenc_ogg;				// 
-	GtkWidget		*Adr_entry_flac_flac;				// 
-	GtkWidget		*Adr_label_flac_flac;				// 
-	GtkWidget		*Adr_entry_mac_ape;				// 
-	GtkWidget		*Adr_label_mac_ape;				// 
-	GtkWidget		*Adr_entry_wavpack_wv;				// 
-	GtkWidget		*Adr_label_wavpack_wv;				// 
-	GtkWidget		*Adr_entry_musepack_mpc;			// 
-	GtkWidget		*Adr_label_musepack_mpc;			// 
-	GtkWidget		*Adr_entry_faac_m4a;				// 
-	GtkWidget		*Adr_label_faac_m4a;				// 
-	GtkWidget		*Adr_checkbutton_artist_tag;			// 
-	GtkWidget		*Adr_checkbutton_title_tag;			// 
-	GtkWidget		*Adr_checkbutton_album_tag;			// 
-	GtkWidget		*Adr_checkbutton_numerate_tag;			// 
-	GtkWidget		*Adr_checkbutton_genre_tag;			// 
-	GtkWidget		*Adr_checkbutton_year_tag;			// 
-	GtkWidget		*Adr_checkbutton_comment_tag;			// 
-	COLOR_LINE_COMMAND	ColorLineCommand;				// 
-	GtkWidget		*Adr_path_temp;					// 
-	GtkComboBox		*Adr_Widget_faac_conteneur;			// 
-	GtkComboBox		*Adr_Widget_faac_choice_vbr_abr;		// 
+	GtkWidget		*Adr_radiobutton_extract_with_cdda2wav;		// 
+	GtkWidget		*Adr_label_type_paquege;					// 
+	TYPE_PACKAGE		Type_Package;							// _NONE_ = 0, _DEBIAN_, _TGZ_, _RPM_, _FPM_, _PACKAGE_NOT_FOUND_
+	GtkWidget		*Adr_entry_lame_mp3;						// 
+	GtkWidget		*Adr_label_lame_mp3;						// 
+	GtkWidget		*Adr_entry_oggenc_ogg;						// 
+	GtkWidget		*Adr_label_oggenc_ogg;						// 
+	GtkWidget		*Adr_entry_flac_flac;						// 
+	GtkWidget		*Adr_label_flac_flac;						// 
+	GtkWidget		*Adr_entry_mac_ape;							// 
+	GtkWidget		*Adr_label_mac_ape;							// 
+	GtkWidget		*Adr_entry_wavpack_wv;						// 
+	GtkWidget		*Adr_label_wavpack_wv;						// 
+	GtkWidget		*Adr_entry_musepack_mpc;					// 
+	GtkWidget		*Adr_label_musepack_mpc;					// 
+	GtkWidget		*Adr_entry_faac_m4a;						// 
+	GtkWidget		*Adr_label_faac_m4a;						// 
+	GtkWidget		*Adr_checkbutton_artist_tag;				// 
+	GtkWidget		*Adr_checkbutton_title_tag;					// 
+	GtkWidget		*Adr_checkbutton_album_tag;					// 
+	GtkWidget		*Adr_checkbutton_numerate_tag;				// 
+	GtkWidget		*Adr_checkbutton_genre_tag;					// 
+	GtkWidget		*Adr_checkbutton_year_tag;					// 
+	GtkWidget		*Adr_checkbutton_comment_tag;				// 
+	COLOR_LINE_COMMAND	ColorLineCommand;						// 
+	GtkWidget		*Adr_path_temp;								// 
+	GtkComboBox		*Adr_Widget_faac_conteneur;					// 
+	GtkComboBox		*Adr_Widget_faac_choice_vbr_abr;			// 
 	GtkComboBox		*Adr_Widget_faac_set_choice_vbr_abr;		// 
-	GtkComboBox		*Adr_Widget_aacplusenc_mono;			// 
-	GtkComboBox		*Adr_Widget_aacplusenc_stereo;			// 
+	GtkComboBox		*Adr_Widget_aacplusenc_mono;				// 
+	GtkComboBox		*Adr_Widget_aacplusenc_stereo;				// 
 } VAR_OPTIONS;
 
 // 
@@ -142,14 +143,15 @@
 // 
 void		options_set_all_interne (void);
 gboolean	options_get_entry_is_valid (TYPE_CONV p_verif_conv);
-gchar          *options_get_params (TYPE_CONV TypeConv, DETAIL *detail);
+gchar          *options_get_params( TYPE_CONV TypeConv );
 
 // 
 // ---------------------------------------------------------------------------
 //  OPTIONS_CD.C
 // ---------------------------------------------------------------------------
 // 
-void	OptionsCd_set_entry_and_label( void );
+void		OptionsCd_set_entry_and_label( void );
+gboolean	OptionsCd_get_save_log_mode_expert( void );
 
 
 // 
@@ -167,7 +169,7 @@
 // 
 gchar		*optionsLame_get_str_val_bitrate_abr_vbr_lame (void);
 gchar		*optionsLame_get_str_val_mode_lame (void);
-gchar		*optionsLame_get_param (DETAIL *detail);
+gchar		*optionsLame_get_param( void );
 
 // 
 // ---------------------------------------------------------------------------
@@ -186,7 +188,7 @@
 gchar		*optionsOggenc_get_val_bitrate_oggenc (void);
 gboolean	optionsOggenc_get_bool_managed_oggenc (void);
 gboolean	optionsOggenc_get_bool_downmix_oggenc (void);
-gchar		*optionsOggenc_get_param (DETAIL *detail);
+gchar		*optionsOggenc_get_param( void );
 
 // 
 // ---------------------------------------------------------------------------

xcfa-4.2.8.tar.gz/src/options_aacplusenc.c -> xcfa-5.0.2.tar.gz/src/options_aacplusenc.c Changed

@@ -3,7 +3,7 @@
 * project : xcfa
 * with : Gtk-2
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <string.h>
 #include <stdlib.h>
@@ -68,15 +63,14 @@
 // 
 void on_combobox_accplusenc_mono_realize (GtkWidget *widget, gpointer user_data)
 {
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "10");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "12");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "14");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "18");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "20");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "24");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "32");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "40");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "10");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "12");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "14");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "18");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "20");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "24");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "32");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "40");
 	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), Config.ChoiceMonoAacplusenc);
 	var_options.Adr_Widget_aacplusenc_mono = GTK_COMBO_BOX (widget);
 }
@@ -94,12 +88,11 @@
 // 
 void on_combobox_accplusenc_stereo_realize (GtkWidget *widget, gpointer user_data)
 {
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "18");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "24");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "32");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "40");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "48");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "18");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "24");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "32");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "40");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "48");
 	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), Config.ChoiceStereoAacplusenc);
 	var_options.Adr_Widget_aacplusenc_stereo = GTK_COMBO_BOX (widget);
 }

xcfa-4.2.8.tar.gz/src/options_cd.c -> xcfa-5.0.2.tar.gz/src/options_cd.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : options_cd.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <string.h>
 #include <stdlib.h>
@@ -58,6 +53,7 @@
 	if (GTK_BUTTON (var_options.Adr_radiobutton_cdparanoia_mode_expert) == button)		Config.ExtractCdWith = EXTRACT_WITH_CDPARANOIA_EXPERT;
 	else if (GTK_BUTTON (var_options.Adr_radiobutton_extract_with_cdda2wav) == button)	Config.ExtractCdWith = EXTRACT_WITH_CDDA2WAV;
 	else if (GTK_BUTTON (var_options.Adr_radiobutton_extract_with_cdparanoia) == button)	Config.ExtractCdWith = EXTRACT_WITH_CDPARANOIA;
+	else if (GTK_BUTTON (var_options.Adr_radiobutton_cdparanoia_mode_2) == button)		Config.ExtractCdWith = EXTRACT_WITH_CDPARANOIA_MODE_2;
 }
 void on_radiobutton_extract_with_cdparanoia_realize (GtkWidget *widget, gpointer user_data)
 {
@@ -77,6 +73,12 @@
 	if (Config.ExtractCdWith == EXTRACT_WITH_CDPARANOIA_EXPERT)
 		gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON (var_options.Adr_radiobutton_cdparanoia_mode_expert), TRUE);
 }
+void on_radiobutton_cdparanoia_mode_2_realize (GtkWidget *widget, gpointer user_data)
+{
+	var_options.Adr_radiobutton_cdparanoia_mode_2 = widget;
+	if (Config.ExtractCdWith == EXTRACT_WITH_CDPARANOIA_MODE_2)
+		gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON (var_options.Adr_radiobutton_cdparanoia_mode_2), TRUE);
+}
 // 
 // 
 void OptionsCd_set_entry_and_label( void )
@@ -117,7 +119,7 @@
 				Ptr
 				);
 		g_string_append_printf (gstr,
-				_("Pour evaluer les templates, vous devez activer une lecture de cdaudio")
+				_("To assess the templates, you must enable a reading cdaudio")
 				);
 		g_string_append_printf (gstr,
 				""
@@ -200,12 +202,25 @@
 }
 
 
-
-
-
-
-
-
+// 
+// 
+void on_checkbutton_log_cdparanoia_mode_expert_realize( GtkWidget *widget, gpointer user_data )
+{
+	var_cd.Adr_checkbutton_log_cdparanoia_mode_expert = widget;
+	gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON(widget), Config.BoolLogCdparanoiaModeExpert );
+}
+// 
+// 
+void on_checkbutton_log_cdparanoia_mode_expert_clicked( GtkButton *button, gpointer user_data )
+{
+	Config.BoolLogCdparanoiaModeExpert = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(var_cd.Adr_checkbutton_log_cdparanoia_mode_expert)) ? TRUE : FALSE;
+}
+// 
+// 
+gboolean OptionsCd_get_save_log_mode_expert( void )
+{
+	return( Config.BoolLogCdparanoiaModeExpert );
+}

xcfa-4.2.8.tar.gz/src/options_faac.c -> xcfa-5.0.2.tar.gz/src/options_faac.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : options_faac.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <string.h>
 #include <stdlib.h>
@@ -96,10 +91,8 @@
 
 void on_combobox_faac_conteneur_realize (GtkWidget *widget, gpointer user_data)
 {
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Transport Stream (ADTS) - Extension .aac"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("MPEG-4 File Format (MP4) - Extension .m4a"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("Transport Stream (ADTS) - Extension .aac"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("MPEG-4 File Format (MP4) - Extension .m4a"));
 	
 	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), Config.ConteneurFacc);
 	var_options.Adr_Widget_faac_conteneur = GTK_COMBO_BOX (widget);
@@ -121,10 +114,9 @@
 
 void on_combobox_faac_choice_vbr_abr_realize (GtkWidget *widget, gpointer user_data)
 {
-	libcombo_alloc (GTK_COMBO_BOX (widget));
 	var_options.Adr_Widget_faac_choice_vbr_abr = GTK_COMBO_BOX (widget);
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "VBR");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "ABR");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "VBR");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "ABR");
 	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), Config.AbrVbrFacc);
 }
 void on_combobox_faac_choice_vbr_abr_changed (GtkComboBox *combobox, gpointer user_data)
@@ -137,28 +129,26 @@
 	if (var_options.Adr_Widget_faac_choice_vbr_abr == NULL) return;
 	if (var_options.Adr_Widget_faac_set_choice_vbr_abr == NULL) return;
 	
-	libcombo_alloc (GTK_COMBO_BOX (var_options.Adr_Widget_faac_set_choice_vbr_abr));
-	
 	switch (gtk_combo_box_get_active (var_options.Adr_Widget_faac_choice_vbr_abr)) {
 	
 	/* VBR
 	 * 10, 30, 50, 70, 80, 90, 100, 120, 150, 200, 250, 300, 400, 500
 	 */
 	case 0 :
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_faac_set_choice_vbr_abr), "10");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_faac_set_choice_vbr_abr), "30");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_faac_set_choice_vbr_abr), "50");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_faac_set_choice_vbr_abr), "70");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_faac_set_choice_vbr_abr), "80");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_faac_set_choice_vbr_abr), "90");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_faac_set_choice_vbr_abr), "100");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_faac_set_choice_vbr_abr), "120");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_faac_set_choice_vbr_abr), "150");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_faac_set_choice_vbr_abr), "200");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_faac_set_choice_vbr_abr), "250");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_faac_set_choice_vbr_abr), "300");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_faac_set_choice_vbr_abr), "400");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_faac_set_choice_vbr_abr), "500");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_faac_set_choice_vbr_abr), "10");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_faac_set_choice_vbr_abr), "30");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_faac_set_choice_vbr_abr), "50");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_faac_set_choice_vbr_abr), "70");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_faac_set_choice_vbr_abr), "80");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_faac_set_choice_vbr_abr), "90");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_faac_set_choice_vbr_abr), "100");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_faac_set_choice_vbr_abr), "120");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_faac_set_choice_vbr_abr), "150");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_faac_set_choice_vbr_abr), "200");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_faac_set_choice_vbr_abr), "250");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_faac_set_choice_vbr_abr), "300");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_faac_set_choice_vbr_abr), "400");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_faac_set_choice_vbr_abr), "500");
 		
 		gtk_combo_box_set_active (GTK_COMBO_BOX (var_options.Adr_Widget_faac_set_choice_vbr_abr), Config.VbrFaccIndice);
 		break;
@@ -167,12 +157,12 @@
 	 * 56, 64, 80, 96, 128, 152
 	 */
 	case 1 :
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_faac_set_choice_vbr_abr), "56");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_faac_set_choice_vbr_abr), "64");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_faac_set_choice_vbr_abr), "80");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_faac_set_choice_vbr_abr), "96");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_faac_set_choice_vbr_abr), "128");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_faac_set_choice_vbr_abr), "152");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_faac_set_choice_vbr_abr), "56");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_faac_set_choice_vbr_abr), "64");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_faac_set_choice_vbr_abr), "80");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_faac_set_choice_vbr_abr), "96");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_faac_set_choice_vbr_abr), "128");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_faac_set_choice_vbr_abr), "152");
 		
 		gtk_combo_box_set_active (GTK_COMBO_BOX (var_options.Adr_Widget_faac_set_choice_vbr_abr), Config.AbrFaccIndice);
 		break;
@@ -184,7 +174,6 @@
 
 void on_combobox_faac_set_choice_vbr_abr_realize (GtkWidget *widget, gpointer user_data)
 {
-	// libcombo_alloc (GTK_COMBO_BOX (widget));
 	var_options.Adr_Widget_faac_set_choice_vbr_abr = GTK_COMBO_BOX (widget);
 	on_combobox_faac_choice_vbr_abr_changed (NULL,NULL);
 }

xcfa-4.2.8.tar.gz/src/options_flac.c -> xcfa-5.0.2.tar.gz/src/options_flac.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : options_flac.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <string.h>
 #include <stdlib.h>
@@ -63,21 +58,19 @@
 
 
 
-void on_options_combobox_flac_compression_realize (GtkWidget *widget, gpointer user_data)
+void on_combobox_flac_compression_realize (GtkWidget *widget, gpointer user_data)
 {
 	var_options.Adr_Widget_flac_compression = GTK_COMBO_BOX (widget);
 
-	// libcombo_alloc (GTK_COMBO_BOX (widget));
-	
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("0 (Rapide)"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "1");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "2");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "3");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "4");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "5");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "6");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "7");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("8 (Lent)"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("0 (Fast)"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "1");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "2");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "3");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "4");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "5");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "6");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "7");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("8 (Low)"));
 
 	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), Config.CompressionLevelFlac);
 }

xcfa-4.2.8.tar.gz/src/options_internal.c -> xcfa-5.0.2.tar.gz/src/options_internal.c Changed

xcfa-4.2.8.tar.gz/src/options_mac.c -> xcfa-5.0.2.tar.gz/src/options_mac.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : options_mac.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <string.h>
 #include <stdlib.h>
@@ -62,13 +57,11 @@
 {
 	var_options.Adr_Widget_ape_compression = GTK_COMBO_BOX (widget);
 
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-	
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Compress (fast): '-c1000'");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Compress (normal): '-c2000'");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Compress (high): '-c3000'");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Compress (extra high): '-c4000'");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Compress (insane): '-c5000'");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Compress (fast): '-c1000'");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Compress (normal): '-c2000'");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Compress (high): '-c3000'");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Compress (extra high): '-c4000'");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Compress (insane): '-c5000'");
 
 	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), Config.CompressionLevelApeMac);
 }

xcfa-4.2.8.tar.gz/src/options_mp3.c -> xcfa-5.0.2.tar.gz/src/options_mp3.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : options_mp3.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <string.h>
 #include <stdlib.h>
@@ -135,45 +130,31 @@
 
 // 
 // 
-/*
-	Config.BitrateLameIndice;		// abr .. vbr_new
-	Config.TabBitrateLame[4];		// [ abr | cbr | vbr | vbr_new ]
-	Config.TabModeLame[4];			// [ ModeAbr | ModeCbr | ModeVbr | ModeVbrNew ]
-*/
-gchar *optionsLame_get_param (DETAIL *detail)
+gchar *optionsLame_get_param( void )
 {
 	gchar StrLame[ 1000 ];
 	
 	StrLame [ 0 ] = '\0';
-	
+
 	switch (Config.BitrateLameIndice) {
 	case 0 :
-		if (NULL == detail)
-			strcpy (StrLame, str_abr [ Config.TabBitrateLame[ Config.BitrateLameIndice ] ]);		
-		else	strcpy (StrLame, str_abr [ detail->TypeMp3Ogg.debit [ detail->TypeMp3Ogg.type ] ]);
+		strcpy (StrLame, str_abr [ Config.TabBitrateLame[ Config.BitrateLameIndice ] ]);		
 		break;
 	case 1 :
-		if (NULL == detail)
-			strcpy (StrLame, str_cbr [ Config.TabBitrateLame[ Config.BitrateLameIndice ] ]);
-		else	strcpy (StrLame, str_cbr [ detail->TypeMp3Ogg.debit [ detail->TypeMp3Ogg.type ] ]);
+		strcpy (StrLame, str_cbr [ Config.TabBitrateLame[ Config.BitrateLameIndice ] ]);
 		break;
 	case 2 :
-		if (NULL == detail)
-			strcpy (StrLame, str_vbr [ Config.TabBitrateLame[ Config.BitrateLameIndice ] ]);
-		else	strcpy (StrLame, str_vbr [ detail->TypeMp3Ogg.debit [ detail->TypeMp3Ogg.type ] ]);
+		strcpy (StrLame, str_vbr [ Config.TabBitrateLame[ Config.BitrateLameIndice ] ]);
 		break;
 	case 3 :
-		if (NULL == detail)
-			strcpy (StrLame, str_vbr_new [ Config.TabBitrateLame[ Config.BitrateLameIndice ] ]);
-		else	strcpy (StrLame, str_vbr_new [ detail->TypeMp3Ogg.debit [ detail->TypeMp3Ogg.type ] ]);
+		strcpy (StrLame, str_vbr_new [ Config.TabBitrateLame[ Config.BitrateLameIndice ] ]);
 		break;
 	}
 	if (Config.TabModeLame[ Config.BitrateLameIndice ] > 0) {
 		if (*StrLame != '\0') strcat (StrLame, " ");
-		if (NULL == detail)
-			strcat (StrLame, str_val_mode [ Config.TabModeLame[ Config.BitrateLameIndice ] ] );
-		else	strcat (StrLame, str_val_mode [ detail->TypeMp3Ogg.mode [ detail->TypeMp3Ogg.type ] ] );
+		strcat (StrLame, str_val_mode [ Config.TabModeLame[ Config.BitrateLameIndice ] ] );
 	}
+	if( *StrLame == '\0' ) return( (gchar *)NULL );
 	return ((gchar *)strdup (StrLame));
 }	
 
@@ -227,12 +208,10 @@
 
 void on_combobox_lame_abr_cbr_vbr_realize (GtkWidget *widget, gpointer user_data)
 {
-	// libcombo_alloc (GTK_COMBO_BOX (widget));
-	
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "ABR");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "CBR");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "VBR");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "VBR-NEW");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "ABR");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "CBR");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "VBR");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "VBR-NEW");
 	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), Config.BitrateLameIndice);
 	var_options.Adr_Widget_Lame_abr_cbr_vbr = GTK_COMBO_BOX (widget);
 }
@@ -245,7 +224,6 @@
 	if (NULL == var_options.Adr_Widget_Lame_bitrate) return;
 	if ((ind = gtk_combo_box_get_active (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_abr_cbr_vbr))) < 0) return;
 	Config.BitrateLameIndice = ind;
-	// libcombo_alloc (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate));
 	bool_do_enter_options_mp3 = FALSE;
 	libcombo_remove_options (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate));
 	
@@ -253,78 +231,78 @@
 	
 	/* ABR 0 .. 13 */
 	case 0 :
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), " 32");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), " 40");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), " 48");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), " 56");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), " 64");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), " 80");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), " 96");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "112");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "128");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "160");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "192");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "224");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "256");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "320");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), " 32");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), " 40");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), " 48");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), " 56");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), " 64");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), " 80");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), " 96");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "112");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "128");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "160");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "192");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "224");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "256");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "320");
 		break;
 	
 	/* CBR 0 .. 14 */
 	case 1 :
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), " 32");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), " 40");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), " 48");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), " 56");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), " 64");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), " 80");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), " 96");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "112");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "128");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "160");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "192");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "224");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "256");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "320");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "preset insane");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), " 32");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), " 40");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), " 48");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), " 56");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), " 64");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), " 80");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), " 96");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "112");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "128");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "160");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "192");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "224");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "256");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "320");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "preset insane");
 		break;
 	
 	/* VBR 0 .. 14 */
 	case 2 :
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "preset medium");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "preset standard");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "preset extreme");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "preset fast standard");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "preset fast extreme");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), _("V0 (meilleure qualite)"));
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "V1");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "V2");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "V3");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "V4");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "V5");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "V6");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "V7");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "V8");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), _("V9 (moins bonne qualite)"));
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "preset medium");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "preset standard");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "preset extreme");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "preset fast standard");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "preset fast extreme");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), _("V0 (Best quality)"));
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "V1");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "V2");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "V3");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "V4");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "V5");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "V6");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "V7");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "V8");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), _("V9 (Poor quality)"));
 		break;
 	
 	/* VBR_NEW 0 .. 15 */
 	case 3 :
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), " ");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "preset medium");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "preset standard");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "preset extreme");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "preset fast standard");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "preset fast extreme");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "V0");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "V1");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "V2");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "V3");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "V4");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "V5");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "V6");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "V7");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "V8");
-		gtk_combo_box_append_text (GTK_COMBO_BOX (var_options.Adr_Widget_Lame_bitrate), "V9");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), " ");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "preset medium");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "preset standard");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "preset extreme");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "preset fast standard");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "preset fast extreme");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "V0");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "V1");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "V2");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "V3");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "V4");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "V5");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "V6");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "V7");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "V8");
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(var_options.Adr_Widget_Lame_bitrate), "V9");
 		break;
 	}
 	bool_do_enter_options_mp3 = TRUE;
@@ -353,14 +331,12 @@
 
 void on_combobox_lame_mode_realize (GtkWidget *widget, gpointer user_data)
 {
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Defaut");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Stereo");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Join Stereo");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Forced Join Stereo");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Duo Channels");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Mono");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Defaut");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Stereo");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Join Stereo");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Forced Join Stereo");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Duo Channels");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Mono");
 	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), Config.TabModeLame[ Config.BitrateLameIndice ]);
 	var_options.Adr_Widget_Lame_Mode = GTK_COMBO_BOX (widget);
 	on_combobox_lame_abr_cbr_vbr_changed (NULL, NULL);

xcfa-4.2.8.tar.gz/src/options_musepack.c -> xcfa-5.0.2.tar.gz/src/options_musepack.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : options_musepack.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <string.h>
 #include <stdlib.h>
@@ -70,15 +65,13 @@
 {
 	var_options.Adr_Widget_Mppenc = GTK_COMBO_BOX (widget);
 
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-	
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("telephone: lowest quality : 32 .. 48 kbit/s"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("thumb : low quality/internet : 58 .. 86 kbit/s"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("radio : medium (MP3) quality : 112 .. 152 kbit/s"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("standard : high quality (dflt) : 142 .. 184 kbit/s"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("xtreme : extreme high quality : 168 .. 212 kbit/s"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("insane : extreme high quality : 232 .. 268 kbit/s"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("braindead : extreme high quality : 232 .. 278 kbit/s"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("telephone: lowest quality : 32 .. 48 kbit/s"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("thumb : low quality/internet : 58 .. 86 kbit/s"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("radio : medium (MP3) quality : 112 .. 152 kbit/s"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("standard : high quality (dflt) : 142 .. 184 kbit/s"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("xtreme : extreme high quality : 168 .. 212 kbit/s"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("insane : extreme high quality : 232 .. 268 kbit/s"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("braindead : extreme high quality : 232 .. 278 kbit/s"));
 	
 	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), Config.QualityMppenc);
 }

xcfa-4.2.8.tar.gz/src/options_oggenc.c -> xcfa-5.0.2.tar.gz/src/options_oggenc.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : options_oggenc.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <string.h>
 #include <stdlib.h>
@@ -76,20 +71,15 @@
 	"--quality=9",
 	"--quality=10"
 	};
+
+
 // 
 // 
-/*
-	Config.BitrateOggenc
-	Config.ManagedOggenc
-	Config.DownmixOggenc
-*/
-gchar *optionsOggenc_get_param (DETAIL *detail)
+gchar *optionsOggenc_get_param( void )
 {
 	gchar StrOggenc[ 1000 ];
 	
-	if (NULL == detail)
-		strcpy (StrOggenc, val_bitrate_ogg [ Config.BitrateOggenc ]);
-	else	strcpy (StrOggenc, val_bitrate_ogg [ detail->TypeMp3Ogg.type ]);
+	strcpy (StrOggenc, val_bitrate_ogg [ Config.BitrateOggenc ]);
 	
 	if (Config.BitrateOggenc < 11 && Config.ManagedOggenc == 0) {
 		if (*StrOggenc != '\0') strcat (StrOggenc, " ");
@@ -112,7 +102,7 @@
 // 
 gboolean optionsOggenc_get_bool_managed_oggenc (void)
 {
-	if (GTK_WIDGET_IS_SENSITIVE(GTK_WIDGET (GLADE_GET_OBJECT("eventbox_combobox_oggenc_managed"))) == TRUE) {
+	if( gtk_widget_is_sensitive(GTK_WIDGET (GLADE_GET_OBJECT("eventbox_combobox_oggenc_managed"))) == TRUE) {
 		if (gtk_combo_box_get_active (GTK_COMBO_BOX (var_options.Adr_Widget_Oggenc_managed)) == 0) return (TRUE);
 	}
 	return (FALSE);
@@ -121,7 +111,7 @@
 // 
 gboolean optionsOggenc_get_bool_downmix_oggenc (void)
 {
-	if (GTK_WIDGET_IS_SENSITIVE(GTK_WIDGET (GLADE_GET_OBJECT("eventbox_combobox_oggenc_downmix"))) == TRUE) {
+	if (gtk_widget_is_sensitive(GTK_WIDGET (GLADE_GET_OBJECT("eventbox_combobox_oggenc_downmix"))) == TRUE) {
 		if (gtk_combo_box_get_active (GTK_COMBO_BOX (var_options.Adr_Widget_Oggenc_downmix)) == 0) return (TRUE);
 	}
 	return (FALSE);
@@ -131,32 +121,31 @@
 void on_combobox_oggenc_bitrate_realize (GtkWidget *widget, gpointer user_data)
 {
 	var_options.Adr_Widget_Oggenc_bitrate = GTK_COMBO_BOX (widget);
-	// libcombo_alloc (GTK_COMBO_BOX (widget));
-
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), " 45 kbit/s");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), " 64 kbit/s");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), " 80 kbit/s");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), " 96 kbit/s");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "112 kbit/s");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "128 kbit/s");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "160 kbit/s");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "192 kbit/s");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "224 kbit/s");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "256 kbit/s");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "320 kbit/s");
-
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Qualite -1 (Moins bonne qualite)"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Qualite 0"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Qualite 1"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Qualite 2"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Qualite 3"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Qualite 4"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Qualite 5"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Qualite 6"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Qualite 7"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Qualite 8"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Qualite 9"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Qualite 10 (Meilleure qualite)"));
+
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), " 45 kbit/s");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), " 64 kbit/s");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), " 80 kbit/s");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), " 96 kbit/s");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "112 kbit/s");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "128 kbit/s");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "160 kbit/s");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "192 kbit/s");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "224 kbit/s");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "256 kbit/s");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "320 kbit/s");
+
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("Quality -1 (Poor quality)"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("Quality 0"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("Quality 1"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("Quality 2"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("Quality 3"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("Quality 4"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("Quality 5"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("Quality 6"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("Quality 7"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("Quality 8"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("Quality 9"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("Quality 10 (Best quality)"));
 
 	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), Config.BitrateOggenc);
 }
@@ -184,10 +173,8 @@
 // 
 void on_combobox_oggenc_managed_realize (GtkWidget *widget, gpointer user_data)
 {
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-	
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Oui"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Non"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("Yes"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("No"));
 
 	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), Config.ManagedOggenc);
 
@@ -206,10 +193,8 @@
 // 
 void on_combobox_oggenc_downmix_realize (GtkWidget *widget, gpointer user_data)
 {
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-	
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Mono force"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Stereo"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("Force mono"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("Stereo"));
 
 	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), Config.DownmixOggenc);

xcfa-4.2.8.tar.gz/src/options_tags.c -> xcfa-5.0.2.tar.gz/src/options_tags.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : options_tags.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,13 +29,7 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
-
 #include <string.h>
 #include <stdlib.h>
 #include <glib.h>
@@ -98,30 +92,30 @@
 
 void on_checkbutton_tag_clicked (GtkButton *button, gpointer user_data)
 {
-	COLOR_LINE_COMMAND ColorLineCommand = COLOR_NONE;
+	// COLOR_LINE_COMMAND ColorLineCommand = COLOR_NONE;
 	
-	/*PRINT_FUNC_LF();*/
+	// PRINT_FUNC_LF();
 
 	if (GTK_TOGGLE_BUTTON (button) == GTK_TOGGLE_BUTTON (GLADE_GET_OBJECT("checkbutton_artist_tag"))) {
-		ColorLineCommand = COLOR_TAG_ARTIST;
+		// ColorLineCommand = COLOR_TAG_ARTIST;
 		Config.BoolArtistTag = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (var_options.Adr_checkbutton_artist_tag));
 	} else if (GTK_TOGGLE_BUTTON (button) == GTK_TOGGLE_BUTTON (GLADE_GET_OBJECT("checkbutton_title_tag"))) {
-		ColorLineCommand = COLOR_TAG_TITLE;
+		// ColorLineCommand = COLOR_TAG_TITLE;
 		Config.BoolTitleTag = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (var_options.Adr_checkbutton_title_tag));
 	} else if (GTK_TOGGLE_BUTTON (button) == GTK_TOGGLE_BUTTON (GLADE_GET_OBJECT("checkbutton_album_tag"))) {
-		ColorLineCommand = COLOR_TAG_ALBUM;
+		// ColorLineCommand = COLOR_TAG_ALBUM;
 		Config.BoolAlbumTag = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (var_options.Adr_checkbutton_album_tag));
 	} else if (GTK_TOGGLE_BUTTON (button) == GTK_TOGGLE_BUTTON (GLADE_GET_OBJECT("checkbutton_numerate_tag"))) {
-		ColorLineCommand = COLOR_TAG_NUMERATE;
+		// ColorLineCommand = COLOR_TAG_NUMERATE;
 		Config.BoolNumerateTag = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (var_options.Adr_checkbutton_numerate_tag));
 	} else if (GTK_TOGGLE_BUTTON (button) == GTK_TOGGLE_BUTTON (GLADE_GET_OBJECT("checkbutton_genre_tag"))) {
-		ColorLineCommand = COLOR_TAG_GENRE;
+		// ColorLineCommand = COLOR_TAG_GENRE;
 		Config.BoolGenreTag = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (var_options.Adr_checkbutton_genre_tag));
 	} else if (GTK_TOGGLE_BUTTON (button) == GTK_TOGGLE_BUTTON (GLADE_GET_OBJECT("checkbutton_year_tag"))) {
-		ColorLineCommand = COLOR_TAG_YEAR;
+		// ColorLineCommand = COLOR_TAG_YEAR;
 		Config.BoolYearTag = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (var_options.Adr_checkbutton_year_tag));
 	} else if (GTK_TOGGLE_BUTTON (button) == GTK_TOGGLE_BUTTON (GLADE_GET_OBJECT("checkbutton_comment_tag"))) {
-		ColorLineCommand = COLOR_TAG_COMMENT;
+		// ColorLineCommand = COLOR_TAG_COMMENT;
 		Config.BoolCommentTag = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (var_options.Adr_checkbutton_comment_tag));
 	}

xcfa-4.2.8.tar.gz/src/options_wavpack.c -> xcfa-5.0.2.tar.gz/src/options_wavpack.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : options_wavpack.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <string.h>
 #include <stdlib.h>
@@ -95,17 +90,15 @@
 {
 	var_options.Adr_Widget_wavpack = GTK_COMBO_BOX (widget);
 
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-	
 	/*
 	-f Mode rapide de compression
 	-h Ume bonne qualite de compression dans tous les modes mais plus lent
 	-hh La meilleure qualite de compression dans tous les modes mais la plus lente
 	*/
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Mode normal"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Mode rapide de compression"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Bonne qualite de compression"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Meilleure qualite de compression"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("Standard"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("Fast (Faster encode and decode)"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("High quality (Better compression ratio)"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("Very high quality (Best compression but slowest)"));
 	
 	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), Config.CompressionWavpack);
 }
@@ -123,16 +116,14 @@
 {
 	var_options.Adr_Widget_wavpack_sound = GTK_COMBO_BOX (widget);
 
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-	
 	/*
 	-jn Joint-stereo override (0 = left/right, 1 = mid/side)
 	----------------------
 	-j0 Joint-stereo override (0 = left/right)
 	-j1 Joint-stereo override (1 = mid/side)
 	*/
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("stereo left/right"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("stereo mid/side"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("stereo left/right"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("stereo mid/side"));
 	
 	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), Config.SoundWavpack);
 }
@@ -148,12 +139,10 @@
 }
 void on_combobox_wavpack_mode_hybride_realize (GtkWidget *widget, gpointer user_data)
 {
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-	
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Non"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "320 kbit/s");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "384 kbit/s");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "448 kbit/s");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("No"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "320 kbit/s");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "384 kbit/s");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "448 kbit/s");
 	
 	var_options.Adr_Widget_wavpack_mode_hybride = GTK_COMBO_BOX (widget);
 	
@@ -180,10 +169,8 @@
 {
 	var_options.Adr_Widget_wavpack_correction_file = GTK_COMBO_BOX (widget);
 
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-	
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Non"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Oui"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("No"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("Yes"));
 	
 	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), Config.CorrectionFileWavpack);
 	
@@ -203,10 +190,8 @@
 {
 	var_options.Adr_Widget_wavpack_maximum_compression = GTK_COMBO_BOX (widget);
 
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-	
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Non"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Oui"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("No"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("Yes"));
 	
 	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), Config.CompressionMaximumWavpack);
 	
@@ -226,10 +211,8 @@
 {
 	var_options.Adr_Widget_wavpack_signature_md5 = GTK_COMBO_BOX (widget);
 
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-	
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Non"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Oui"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("No"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("Yes"));
 	
 	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), Config.SignatureMd5Wavpack);
 }
@@ -247,15 +230,13 @@
 {
 	var_options.Adr_Widget_wavpack_extra_encoding = GTK_COMBO_BOX (widget);
 
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-	
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("Non"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("1 (fast / rapide)"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "2");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "3");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "4");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "5");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), _("6 (very slow / tres lent)"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("No"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("1 (fast / rapide)"));
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "2");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "3");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "4");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "5");
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), _("6 (very slow / tres lent)"));
 	
 	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), Config.ExtraEncodingWavpack);
 }

xcfa-4.2.8.tar.gz/src/parse.c -> xcfa-5.0.2.tar.gz/src/parse.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : parse.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -53,11 +53,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <string.h>
 #include <stdlib.h>
@@ -169,6 +164,7 @@
 	}
 }
 */
+
 // 
 // SUPRESSION DES STRUCTURES ET DES GLIST
 //
@@ -176,7 +172,6 @@
 {
 	GList		*list = NULL;
 	PARSE		*Parse = NULL;
-	gboolean	BoolDestroy = FALSE;
 
 	if( p_ParseType == PARSE_TYPE_STOCKAGE_CD ) {
 		list = g_list_first (VarParse.ListParseStockCd);
@@ -217,8 +212,6 @@
 			g_free (Parse);
 			Parse = NULL;
 			list->data = NULL;
-			
-			BoolDestroy = TRUE;
 		}
 		list = g_list_next (list);
 	}
@@ -338,7 +331,7 @@
 	gboolean	 BoolTagOk = FALSE;
 	gboolean	 BoolSet = FALSE;
 	
-	PRINT_FUNC_LF();
+	// PRINT_FUNC_LF();
 	
 	// QUELLE LIGNE ANALYSER ?
 	if( p_ParseType == PARSE_TYPE_STOCKAGE_CD ) {
@@ -576,7 +569,12 @@
 	
 	if( BoolTagOk == FALSE ) {
 		// SI LISTE VIDE -> CREATION D'UN MINIMUM AVEC LE TITRE
-		Parse_allocate (p_ParseType, CD_TAG_TITLE, NULL);
+		// 
+		// Fwd: Bug#673641: xcfa: Wrong file directory
+		// http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673641
+		// SOLVED
+		
+		// Parse_allocate (p_ParseType, CD_TAG_TITLE, NULL);
 	}
 	
 	if( TRUE == BoolSet ) {

xcfa-4.2.8.tar.gz/src/parse.h -> xcfa-5.0.2.tar.gz/src/parse.h Changed

xcfa-4.2.8.tar.gz/src/play_file.c -> xcfa-5.0.2.tar.gz/src/play_file.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : play_file.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -30,11 +30,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ -107,10 +102,10 @@
 	PRINT_FUNC_LF();
 	
 	if (FALSE == extra_get_lecteur_audio_is_ok ()) {
-		PRINT("VEUILLEZ SAISIR UN LECTEUR AUDIO");
-		wininfo_create (
-			_("PAS de lecteur audio present"),
-			_("Veuillez installez un lecteur audio."),
+		wind_info_init (
+			WindMain,
+			_("NO audio player present"),
+			_("Please install an audio player."),
 			 "");
 		return;
 	}
@@ -128,9 +123,11 @@
 	PlayFile.Playeur = g_strdup (extra_get_name_lecteur_audio ());
 	PlayFile.Param = g_strdup (extra_get_param_name_lecteur_audio ());
 	PlayFile.PathNameFile = g_strdup (PathNameFile);
-	g_print ("\tFILE : %s\n", PathNameFile);
-	g_print ("\tPLAYEUR : %s\n", PlayFile.Playeur);
-	g_print ("\tPARAM : %s\n", PlayFile.Param);
+	if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
+		g_print ("\tFILE : %s\n", PathNameFile);
+		g_print ("\tPLAYEUR : %s\n", PlayFile.Playeur);
+		g_print ("\tPARAM : %s\n", PlayFile.Param);
+	}
 	pthread_create (&PlayFile.nmr_tid, NULL ,(void *)PlayFile_thread, (void *)NULL);
 }

xcfa-4.2.8.tar.gz/src/play_file.h -> xcfa-5.0.2.tar.gz/src/play_file.h Changed

xcfa-4.2.8.tar.gz/src/poche.c -> xcfa-5.0.2.tar.gz/src/poche.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : poche.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -30,11 +30,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib.h>
@@ -66,38 +61,38 @@
 
 
 VIEW view = {
-	FALSE,			// BoolAccessChanged;			// COMBOBOX changed is TRUE
+	FALSE,			// BoolAccessChanged;				// COMBOBOX changed is TRUE
 	
-	NULL,			// *AdrComboBoxChoice;			// 
+	NULL,			// *AdrComboBoxChoice;				// 
 	
-	NULL,			// *AdrEntrySearchImgWeb;		// Adresse saisie image web
-	NULL,			// *AdrEntryNameFileSave;		// Adresse saisie nom fichier image
-	NULL,			// *AdrEntryTitleCD;			// Adresse saisie titre du CD
+	NULL,			// *AdrEntrySearchImgWeb;			// Adresse saisie image web
+	NULL,			// *AdrEntryNameFileSave;			// Adresse saisie nom fichier image
+	NULL,			// *AdrEntryTitleCD;				// Adresse saisie titre du CD
 	
-	NULL,			// *TitleCD;				// 
-	NULL,			// *Buffer_none;			// 
-	NULL,			// *Buffer_title;			// 
-	NULL,			// *Buffer_title_time;			// 
+	NULL,			// *TitleCD;						// 
+	NULL,			// *Buffer_none;					// 
+	NULL,			// *Buffer_title;					// 
+	NULL,			// *Buffer_title_time;				// 
 	NULL,			// *Buffer_artist_title_time;		// 
 	
-	NULL,			// *AdrDrawingarea;			// Adresse de la surface
-	FALSE,			// BoolScaleAdjust;			// TRUE = ajustement de l'echelle avec la surface de la fentre
-	NULL,			// *image;				// Adresse de l'image
-	1.0,			// scale;				// Pourcentage de surface de l'image
-	0.0,			// x0;					// Pos X
-	0.0,			// y0;					// Pos Y
-	0,			// image_width;				// Width
-	0,			// image_height;			// Height
-	NULL,			// *ListImage;				// Pointeur de structure IMAGE pour AdrDrawingarea
-	FALSE,			// BoolEventButtonPress;		// TRUE == BOUTON SOURIS PRESSED
-	NULL,			// *GetImage;				// Adresse de l'image en selection
-	IMG_NONE,		// ImgCorner;				// See IMG_CORNER
+	NULL,			// *AdrDrawingarea;					// Adresse de la surface
+	FALSE,			// BoolScaleAdjust;					// TRUE = ajustement de l'echelle avec la surface de la fentre
+	NULL,			// *image;							// Adresse de l'image
+	1.0,			// scale;							// Pourcentage de surface de l'image
+	0.0,			// x0;								// Pos X
+	0.0,			// y0;								// Pos Y
+	0,				// image_width;						// Width
+	0,				// image_height;					// Height
+	NULL,			// *ListImage;						// Pointeur de structure IMAGE pour AdrDrawingarea
+	FALSE,			// BoolEventButtonPress;			// TRUE == BOUTON SOURIS PRESSED
+	NULL,			// *GetImage;						// Adresse de l'image en selection
+	IMG_NONE,		// ImgCorner;						// See IMG_CORNER
 	NULL,			// *Adr_viewport_image_preview;		// Adresse viewport
-	NULL,			// *Adr_table;				// Adresse table contenu dans le viewport
-	NULL,			// *glist;				// Contient les structures GLIST_POCHETTE
-	NULL,			// *AdrTextview;			// Adresse textview
-	FALSE,			// BoolSaveToFile;			// TRUE si sauvegarde vers fichier
-				// HandleMove;				// Les coordonnees de saisie de l'image
+	NULL,			// *Adr_table;						// Adresse table contenu dans le viewport
+	NULL,			// *glist;							// Contient les structures GLIST_POCHETTE
+	NULL,			// *AdrTextview;					// Adresse textview
+	FALSE,			// BoolSaveToFile;					// TRUE si sauvegarde vers fichier
+					// HandleMove;						// Les coordonnees de saisie de l'image
 	};
 
 
@@ -106,6 +101,67 @@
 
 
 
+void draw_queue( void )
+{
+	/**
+	void
+	gtk_widget_queue_draw_area( GtkWidget *widget,
+								gint x,
+								gint y,
+								gint width,
+								gint height);
+	GtkAllocation	allocation;
+	gtk_widget_get_allocation( view.AdrDrawingarea, &allocation );
+
+	GtkAllocation	allocation;
+	
+	
+	
+	gtk_widget_get_allocation( GTK_WIDGET(GLADE_GET_OBJECT("viewport1")), &allocation );
+
+	gtk_widget_queue_draw_area(
+						// view.AdrDrawingarea,
+						GTK_WIDGET(GLADE_GET_OBJECT("viewport1")),
+						0,
+						0,
+						// view.image_width,
+						// view.image_height
+						// allocation.width,
+						// allocation.height
+						// gtk_widget_get_allocated_width( view.AdrDrawingarea ) ,
+						// gtk_widget_get_allocated_height( view.AdrDrawingarea ) 
+						gtk_widget_get_allocated_width( GTK_WIDGET(GLADE_GET_OBJECT("viewport1")) ) ,
+						gtk_widget_get_allocated_height( GTK_WIDGET(GLADE_GET_OBJECT("viewport1")) ) 
+						);
+	printf("1) 0, 0, %d %d \n", view.image_width, view.image_height );
+	printf("2) 0, 0, %d %d \n", allocation.width, allocation.height );
+	
+	
+	gtk_widget_queue_draw_area(
+						view.AdrDrawingarea,
+						0,
+						0,
+						view.image_width,
+						view.image_height
+						);
+
+	gtk_widget_queue_draw(
+						view.AdrDrawingarea
+						);
+	
+
+	gtk_widget_queue_draw_area(
+						view.AdrDrawingarea,
+						0,
+						0,
+						view.image_width,
+						view.image_height
+						);
+	*/
+	gtk_widget_queue_draw(
+						view.AdrDrawingarea
+						);
+}
 // 
 // 
 void poche_remove_view (void)
@@ -174,8 +230,8 @@
 gboolean poche_is_erase_active( void )
 {
 	GList	*List = NULL;
- IMAGE	*Image = NULL;
- gboolean	BoolEraseActive = FALSE;
+	IMAGE	*Image = NULL;
+	gboolean	BoolEraseActive = FALSE;
 
 	List = g_list_first( view.ListImage );
 	while( List ) {
@@ -199,13 +255,15 @@
 	gtk_widget_set_sensitive( GTK_WIDGET(GLADE_GET_OBJECT("button_normal")), TRUE );
 	gtk_widget_set_sensitive( GTK_WIDGET(GLADE_GET_OBJECT("button_plus")), TRUE );
 	gtk_widget_set_sensitive( GTK_WIDGET(GLADE_GET_OBJECT("button_ajuster")), TRUE );
-	gtk_widget_set_sensitive( GTK_WIDGET(GLADE_GET_OBJECT("button_change_font")), poche_get_struct_selected_is_txt() == NULL ? FALSE : TRUE );
-	gtk_widget_set_sensitive( GTK_WIDGET(GLADE_GET_OBJECT("togglebutton_font_bold")), poche_get_struct_selected_is_txt() == NULL ? FALSE : TRUE );
-	gtk_widget_set_sensitive( GTK_WIDGET(GLADE_GET_OBJECT("togglebutton_font_italic")), poche_get_struct_selected_is_txt() == NULL ? FALSE : TRUE );
+	gtk_widget_set_sensitive( GTK_WIDGET(GLADE_GET_OBJECT("button_change_font")), Image && Image->BoolIsSelected ? TRUE : FALSE );
+	gtk_widget_set_sensitive( GTK_WIDGET(GLADE_GET_OBJECT("togglebutton_font_bold")), Image && Image->BoolIsSelected ? TRUE : FALSE );
+	gtk_widget_set_sensitive( GTK_WIDGET(GLADE_GET_OBJECT("togglebutton_font_italic")), Image && Image->BoolIsSelected ? TRUE : FALSE );
 	gtk_widget_set_sensitive( GTK_WIDGET(GLADE_GET_OBJECT("button_import_img_web")), *pochetxt_get_ptr_entry_img_web() == '\0' ? FALSE : TRUE );
-	gtk_widget_set_sensitive( GTK_WIDGET(GLADE_GET_OBJECT("combobox_choice_get_cd")), (NULL != view.Buffer_none && NULL != Image) ? TRUE : FALSE );
+	gtk_widget_set_sensitive( GTK_WIDGET(GLADE_GET_OBJECT("combobox_choice_get_cd")), Image && Image->BoolIsSelected ? TRUE : FALSE );
 	gtk_widget_set_sensitive( GTK_WIDGET(GLADE_GET_OBJECT("frame_texte_poche")), (NULL != Image) ? TRUE : FALSE );
-	gtk_widget_set_sensitive( GTK_WIDGET(GLADE_GET_OBJECT("button_import_title_cd")), (NULL != view.Buffer_none) ? TRUE : FALSE );
+
+	// For 'button_import_title_cd' see: void cdaudio_set_flag_buttons (void)
+
 	
 	if( NULL != Image ) {
 		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(GLADE_GET_OBJECT("togglebutton_font_bold")), Image->BoolFontBold );
@@ -232,30 +290,52 @@
 // 
 void poche_set_size_request( void )
 {
-	gtk_widget_set_size_request( view.AdrDrawingarea, (gint)((gdouble)view.image_width * view.scale), (gint)((gdouble)view.image_height * view.scale) );
+	gtk_widget_set_size_request(
+					view.AdrDrawingarea,
+					(gint)((gdouble)view.image_width * view.scale),
+					(gint)((gdouble)view.image_height * view.scale)
+					// view.image_width * view.scale,
+					// view.image_height * view.scale
+					);
 }
 // 
 // 
+gboolean on_drawingareamain_draw( GtkWidget *widget, cairo_t *p_cr, gpointer user_data )
+{
+	pochedraw_paint( NULL, p_cr );
+	// poche_set_flag_buttons();
+	return( FALSE );
+}
+/*
 gboolean on_drawingareamain_expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
 {
-	pochedraw_paint( NULL );
+	pochedraw_paint( NULL, p_cr );
 	poche_set_flag_buttons();
 	return( FALSE );
 }
+*/
+gboolean on_scrolledwindow_poche_draw( GtkWidget *widget, cairo_t *p_cr, gpointer user_data )
+{
+	pochedraw_paint( NULL, p_cr );
+	// poche_set_flag_buttons();
+	return( FALSE );
+}
+
 // 
 // 
 IMAGE *poche_get_is_move( gdouble x, gdouble y )
 {
 	cairo_t	*cr;
 	GdkRectangle	zone;
-	GdkRegion	*region = NULL;
+	// GdkRegion	*region = NULL;
+	cairo_region_t *region = NULL;
 	IMAGE		*Image = NULL;
 	GList		*List = NULL;
 	gboolean	BoolInZone = FALSE;
 	
-	cr = gdk_cairo_create( view.AdrDrawingarea->window );
- cairo_scale (cr, view.scale, view.scale);
- cairo_translate (cr, view.x0, view.y0);
+	cr = gdk_cairo_create( gtk_widget_get_window(view.AdrDrawingarea) );
+	cairo_scale (cr, view.scale, view.scale);
+	cairo_translate (cr, view.x0, view.y0);
 	List = g_list_last( view.ListImage );
 	while( List ) {
 		if( NULL != (Image = (IMAGE *)List->data ) && FALSE == Image->BoolStructRemove ) {
@@ -267,13 +347,14 @@
 			zone.y = Image->y0;
 			zone.width = Image->image_width;
 			zone.height = Image->image_height;
-			region = gdk_region_rectangle (&zone);
-			if( gdk_region_point_in( region, x, y )) {
+			region = cairo_region_create_rectangle (&zone);
+			if( cairo_region_contains_point( region, x, y )) {
+			// if( gdk_region_point_in( region, x, y )) {
 				BoolInZone = TRUE;
 				Image->XPointer = x;
 				Image->YPointer = y;
 			}
-			gdk_region_destroy (region);
+			cairo_region_destroy (region);
 			if( TRUE == BoolInZone ) {
 				cairo_destroy( cr );
 				return( Image );
@@ -289,15 +370,16 @@
 IMAGE *poche_get( gdouble x, gdouble y )
 {
 	cairo_t	*cr;
-	GdkRegion	*region = NULL;
+	// GdkRegion	*region = NULL;
+	cairo_region_t *region = NULL;
 	IMAGE		*Image = NULL;
 	GList		*List = NULL;
 	gboolean	BoolInZone = FALSE;
 	gint		CptImgCorner;
-	
-	cr = gdk_cairo_create( view.AdrDrawingarea->window );
- cairo_scale (cr, view.scale, view.scale);
- cairo_translate (cr, view.x0, view.y0);
+		
+	cr = gdk_cairo_create( gtk_widget_get_window(view.AdrDrawingarea) );
+	cairo_scale (cr, view.scale, view.scale);
+	cairo_translate (cr, view.x0, view.y0);
 	List = g_list_last( view.ListImage );
 	while( List ) {
 		if( NULL != (Image = (IMAGE *)List->data ) && FALSE == Image->BoolStructRemove ) {
@@ -311,13 +393,14 @@
 			
 			pochedraw_get_handle_move( Image, TRUE );
 			for( CptImgCorner = 0; CptImgCorner < IMG_SIZE; CptImgCorner ++ ) {
-				region = gdk_region_rectangle( &view.HandleMove.zone [ CptImgCorner ] );
-				if( gdk_region_point_in( region, x, y )) {
+				region = cairo_region_create_rectangle( &view.HandleMove.zone [ CptImgCorner ] );
+				// if( gdk_region_point_in( region, x, y )) {
+				if( cairo_region_contains_point( region, x, y )) {
 					BoolInZone = TRUE;
 					Image->XPointer = x;
 					Image->YPointer = y;
 				}
-				gdk_region_destroy (region);
+				cairo_region_destroy (region);
 				if( TRUE == BoolInZone ) {
 					cairo_destroy( cr );
 					view.ImgCorner = CptImgCorner;
@@ -385,7 +468,8 @@
 	if( NULL != List && NULL != ListLast ) {
 		ListLast->data = Image;
 		List->data = ImageLast;
-		gtk_widget_queue_draw( view.AdrDrawingarea );
+		// gtk_widget_queue_draw( view.AdrDrawingarea );
+		draw_queue();
 	}
 }
 void poche_set_selected_up_image( IMAGE *p_Image )
@@ -408,7 +492,8 @@
 						if( NULL != List && NULL != ListLast ) {
 							ListLast->data = Image;
 							List->data = ImageLast;
-							gtk_widget_queue_draw( view.AdrDrawingarea );
+							// gtk_widget_queue_draw( view.AdrDrawingarea );
+							draw_queue();
 						}
 					}
 				}
@@ -438,7 +523,8 @@
 						if( NULL != List && NULL != ListLast ) {
 							ListLast->data = Image;
 							List->data = ImageLast;
-							gtk_widget_queue_draw( view.AdrDrawingarea );
+							// gtk_widget_queue_draw( view.AdrDrawingarea );
+							draw_queue();
 						}
 					}
 				}
@@ -482,7 +568,8 @@
 	if( NULL != List && NULL != ListFisrt ) {
 		ListFisrt->data = Image;
 		List->data = ImageLast;
-		gtk_widget_queue_draw( view.AdrDrawingarea );
+		// gtk_widget_queue_draw( view.AdrDrawingarea );
+		draw_queue();
 	}
 }
 // 
@@ -497,12 +584,12 @@
 	GList		*List = NULL;
 	gboolean	bool_click_droit = (event->button == 3);	
 	
-	cr = gdk_cairo_create( view.AdrDrawingarea->window );
- cairo_scale (cr, view.scale, view.scale);
- cairo_translate (cr, view.x0, view.y0);
- x = event->x;
- y = event->y;
- cairo_device_to_user (cr, &x, &y);
+	cr = gdk_cairo_create( gtk_widget_get_window(view.AdrDrawingarea) );
+	cairo_scale (cr, view.scale, view.scale);
+	cairo_translate (cr, view.x0, view.y0);
+	x = event->x;
+	y = event->y;
+	cairo_device_to_user (cr, &x, &y);
 	
 	if( TRUE == bool_click_droit ) {
 		if( NULL != (Image = (IMAGE *)poche_get_is_move( x, y ))) {
@@ -541,7 +628,8 @@
 				view.ImgCorner = IMG_MOVE;
 				view.GetImage = Image;
 				cairo_destroy( cr );
-				gtk_widget_queue_draw( view.AdrDrawingarea );
+				// gtk_widget_queue_draw( view.AdrDrawingarea );
+				draw_queue();
 				view.BoolEventButtonPress = TRUE;
 				
 				pochetxt_set_text_to_textview( Image );
@@ -562,7 +650,8 @@
 		}
 		cursor_set_old();
 		cairo_destroy( cr );
-		gtk_widget_queue_draw( view.AdrDrawingarea );
+		// gtk_widget_queue_draw( view.AdrDrawingarea );
+		draw_queue();
 		view.BoolEventButtonPress = TRUE;
 		return( FALSE );
 	}
@@ -577,17 +666,20 @@
 gboolean on_drawingareamain_button_release_event( GtkWidget *widget, GdkEventButton *event, gpointer user_data )
 {
 	cairo_t	*cr;
- gdouble	x, y;
+	gdouble	x, y;
 
-	cr = gdk_cairo_create( view.AdrDrawingarea->window );
- cairo_scale (cr, view.scale, view.scale);
- cairo_translate (cr, view.x0, view.y0);
- x = event->x;
- y = event->y;
- cairo_device_to_user (cr, &x, &y);
+	cr = gdk_cairo_create( gtk_widget_get_window(view.AdrDrawingarea) );
+	cairo_scale (cr, view.scale, view.scale);
+	cairo_translate (cr, view.x0, view.y0);
+	x = event->x;
+	y = event->y;
+	cairo_device_to_user (cr, &x, &y);
 	view.BoolEventButtonPress = FALSE;
 	view.GetImage = NULL;
 	cairo_destroy( cr );	
+
+	poche_set_flag_buttons();
+
 	return( FALSE );
 }
 // 
@@ -595,15 +687,16 @@
 gboolean on_drawingareamain_motion_notify_event( GtkWidget *widget, GdkEventMotion *event, gpointer user_data )
 {
 	cairo_t		*cr;
- gdouble		x, y;
- gboolean	BoolRedraw = FALSE;
-	
-	cr = gdk_cairo_create( view.AdrDrawingarea->window );
- cairo_scale (cr, view.scale, view.scale);
- cairo_translate (cr, view.x0, view.y0);
- x = event->x;
- y = event->y;
- cairo_device_to_user (cr, &x, &y);
+	gdouble		x, y;
+	gboolean	BoolRedraw = FALSE;
+
+
+	cr = gdk_cairo_create( gtk_widget_get_window(view.AdrDrawingarea) );
+	cairo_scale (cr, view.scale, view.scale);
+	cairo_translate (cr, view.x0, view.y0);
+	x = event->x;
+	y = event->y;
+	cairo_device_to_user (cr, &x, &y);
 	
 	if (oldX == -1.0 || oldY == -1.0) {
 		oldX = x;
@@ -827,7 +920,10 @@
 	oldX = x;
 	oldY = y;
 	cairo_destroy( cr );
-	if( TRUE == BoolRedraw ) gtk_widget_queue_draw( view.AdrDrawingarea );	
+	if( TRUE == BoolRedraw ) {
+		// gtk_widget_queue_draw( view.AdrDrawingarea );	
+		draw_queue();
+	}
 	return( FALSE );
 }
 // 
@@ -838,7 +934,8 @@
 	view.scale -= 0.4;
 	if( view.scale < 0.4 ) view.scale = 0.4;
 	poche_set_size_request();
-	gtk_widget_queue_draw( view.AdrDrawingarea );
+	// gtk_widget_queue_draw( view.AdrDrawingarea );
+	draw_queue();
 }
 // 
 // 
@@ -847,7 +944,8 @@
 	view.BoolScaleAdjust = FALSE;
 	view.scale = 1.0;	
 	poche_set_size_request();
-	gtk_widget_queue_draw( view.AdrDrawingarea );
+	// gtk_widget_queue_draw( view.AdrDrawingarea );
+	draw_queue();
 }
 // 
 // 
@@ -857,14 +955,16 @@
 	view.scale += 0.4;
 	if( view.scale > 6.0 ) view.scale = 6.0;
 	poche_set_size_request();
-	gtk_widget_queue_draw( view.AdrDrawingarea );
+	// gtk_widget_queue_draw( view.AdrDrawingarea );
+	draw_queue();
 }
 // 
 // 
 void on_button_ajuster_clicked( GtkButton *button, gpointer user_data )
 {
 	view.BoolScaleAdjust = TRUE;
-	gtk_widget_queue_draw( view.AdrDrawingarea );
+	// gtk_widget_queue_draw( view.AdrDrawingarea );
+	draw_queue();
 }
 // 
 // 
@@ -1010,22 +1110,26 @@
 		}
 		Image->Texte = g_strdup( p_str );
 	}
-	gtk_widget_queue_draw( view.AdrDrawingarea );
+	// gtk_widget_queue_draw( view.AdrDrawingarea );
+	draw_queue();
 }
 // 
 // 
-static void poche_drag_data_received (GtkWidget	 *widget,
-				 GdkDragContext *drag_context,
-				 gint x,
-				 gint y,
-				 GtkSelectionData *data,
-				 guint info,
-				 guint time)
+static void poche_drag_data_received(
+					GtkWidget *widget,
+					GdkDragContext *context,
+					gint x,
+					gint y,
+					GtkSelectionData *data,
+					guint info,
+					guint time,
+					gpointer user_data)
 {
 	// PRINT("DND FROM DESKTOP TO DRAWING"); 
 	// Une copie ne peut aller vers elle meme !!!
-	if (gtk_drag_get_source_widget(drag_context) != widget) {
-		dragndrop_list_drag_data (widget, (gchar *)data->data);
+	if (gtk_drag_get_source_widget(context) != widget) {
+		// dragndrop_list_drag_data (widget, (gchar *)data->data);
+		dragndrop_list_drag_data( widget, (gchar*)gtk_selection_data_get_data( data ));
 	}
 }
 // 
@@ -1045,6 +1149,7 @@
 	
 	view.image_width = cairo_image_surface_get_width( view.image );
 	view.image_height = cairo_image_surface_get_height( view.image );
+		
 	poche_set_size_request();
 	
 	// Drag and drop support
@@ -1098,7 +1203,8 @@
 					pochetxt_set_text_to_textview( Image );
 
 				}
-				gtk_widget_queue_draw( view.AdrDrawingarea );
+				// gtk_widget_queue_draw( view.AdrDrawingarea );
+				draw_queue();
 				poche_set_flag_buttons();
 				// DEBUG CDDB_CURL
 				pochetxt_set_combobox_choice( 0 );
@@ -1117,15 +1223,18 @@
 }
 // 
 // 
-static void poche_drag_data_received_file (GtkWidget *widget,
-				 		GdkDragContext *drag_context,
-				 		gint x,
-				 		gint y,
-				 		GtkSelectionData *data,
-				 		guint info,
-				 		guint time)
+static void poche_drag_data_received_file(
+					GtkWidget *widget,
+					GdkDragContext *context,
+					gint x,
+					gint y,
+					GtkSelectionData *data,
+					guint info,
+					guint time,
+					gpointer user_data)
 {
-	dragndrop_list_drag_data (widget, (gchar *)data->data);
+	// dragndrop_list_drag_data (widget, (gchar *)data->data);
+	dragndrop_list_drag_data( widget, (gchar*)gtk_selection_data_get_data( data ));
 }
 // 
 // 
@@ -1135,7 +1244,8 @@
 		gtk_widget_destroy( view.Adr_table );
 		view.Adr_table = NULL;
 	}
-	view.Adr_table = gtk_table_new (4, 5, TRUE);
+	// view.Adr_table = gtk_grid_new (4, 5, TRUE);
+	view.Adr_table = gtk_grid_new();
 	gtk_container_add (GTK_CONTAINER (view.Adr_viewport_image_preview), view.Adr_table);
 	gtk_widget_show_all (view.Adr_table);
 }
@@ -1193,13 +1303,18 @@
 	
 	PRINT_FUNC_LF();
 	
-	gdk_window_get_pointer( view.AdrDrawingarea->window, &X, &Y, &state ); 	
-	cr = gdk_cairo_create( view.AdrDrawingarea->window );
- cairo_scale (cr, view.scale, view.scale);
- cairo_translate (cr, view.x0, view.y0);
- x = X;
- y = Y;
- cairo_device_to_user (cr, &x, &y);
+	/* Si pas de selection a cet endroit retour */
+	GdkDeviceManager *manager = gdk_display_get_device_manager( gdk_display_get_default() );
+	GdkDevice		 *device = gdk_device_manager_get_client_pointer( manager );
+	gdk_window_get_device_position( gtk_widget_get_window(view.AdrDrawingarea), device, &X, &Y, &state );
+	// gdk_window_get_pointer( view.AdrDrawingarea->window, &X, &Y, &state ); 
+		
+	cr = gdk_cairo_create( gtk_widget_get_window(view.AdrDrawingarea) );
+	cairo_scale (cr, view.scale, view.scale);
+	cairo_translate (cr, view.x0, view.y0);
+	x = X;
+	y = Y;
+	cairo_device_to_user (cr, &x, &y);
 	cairo_destroy( cr );
 	
 	while (gs_List) {
@@ -1208,7 +1323,8 @@
 			if( TRUE == FileIs_image( Ptr )) {
 				Image = poche_add_to_glist( Ptr, x, y, TRUE, _TYPE_IMAGE_ );
 				poche_set_selected_flag_image( Image );
-				gtk_widget_queue_draw( view.AdrDrawingarea );
+				// gtk_widget_queue_draw( view.AdrDrawingarea );
+				draw_queue();
 				return;
 			}
 		}

xcfa-4.2.8.tar.gz/src/poche.h -> xcfa-5.0.2.tar.gz/src/poche.h Changed

@@ -1,9 +1,9 @@
  /*
  *  file      : poche.h
  *  project   : xcfa
- *  with      : Gtk-2
+ *  with      : Gtk-3
  *
- *  copyright : (C) 2003 - 2012 by Claude Bulin
+ *  copyright : (C) 2003 - 2015 by Claude Bulin
  *
  *  xcfa - GTK+ implementation of the GNU shell command
  *  GNU General Public License
@@ -41,101 +41,101 @@
 } TYPE_IMAGE;
 
 typedef struct {
-	TYPE_IMAGE	TypeImage;				// IMAGE | TEXT
+	TYPE_IMAGE	TypeImage;						// IMAGE | TEXT
 	
 	// _TYPE_TEXT_
 	// _TYPE_TEXT_TITLE_
-	gchar		*Texte;					// 
+	gchar		*Texte;							// 
 	
-	gchar		*FontName;				// 
-	gint		SizeFontName;				// 
-	gboolean	BoolFontBold;				// TRUE = BOLD,   FALSE = NORMAL
-	gboolean	BoolFontItalic;				// TRUE = ITALIC, FALSE = NORMAL
-	gint		PosCombobox;				// -1 OR 0 .. 3
+	gchar		*FontName;						// 
+	gint		SizeFontName;					// 
+	gboolean	BoolFontBold;					// TRUE = BOLD,   FALSE = NORMAL
+	gboolean	BoolFontItalic;					// TRUE = ITALIC, FALSE = NORMAL
+	gint		PosCombobox;					// -1 OR 0 .. 3
 	
 	// _TYPE_IMAGE_
-	GdkPixbuf	*Pixbuf;				// Adresse du PixBuf en traitement
-	GdkPixbuf	*PixbufOriginal;			// Adresse du PixBuf original
+	GdkPixbuf	*Pixbuf;						// Adresse du PixBuf en traitement
+	GdkPixbuf	*PixbufOriginal;				// Adresse du PixBuf original
 	
 	// VALUES
-	gdouble		x0;					// Pos X
-	gdouble		y0;					// Pos Y
-	gint		image_width;				// Width
-	gint		image_height;				// Height
-	gdouble		XPointer;				// Position x de la souris lors du clic
-	gdouble		YPointer;				// Position y de la souris lors du clic
-	gboolean	BoolIsSelected;				// TRUE = selected with mouse cursor
-	gboolean	BoolStructRemove;			// TRUE = STRUCT IS REMOVE | FALSE = ACTIVE
-	gboolean	BoolFlipVertical;			// TRUE = Force flip Vertical
-	gboolean	BoolFlipHorizontal;			// TRUE = Force flip Horizontal
+	gdouble		x0;								// Pos X
+	gdouble		y0;								// Pos Y
+	gint		image_width;					// Width
+	gint		image_height;					// Height
+	gdouble		XPointer;						// Position x de la souris lors du clic
+	gdouble		YPointer;						// Position y de la souris lors du clic
+	gboolean	BoolIsSelected;					// TRUE = selected with mouse cursor
+	gboolean	BoolStructRemove;				// TRUE = STRUCT IS REMOVE | FALSE = ACTIVE
+	gboolean	BoolFlipVertical;				// TRUE = Force flip Vertical
+	gboolean	BoolFlipHorizontal;				// TRUE = Force flip Horizontal
 } IMAGE;
 
 typedef enum {
-	IMG_HAUT_GAUCHE = 0,					// 
-	IMG_HAUT,						// 
-	IMG_HAUT_DROIT,						// 
-	IMG_DROIT,						// 
-	IMG_BAS_DROIT,						// 
-	IMG_BAS,						// 
-	IMG_BAS_GAUCHE,						// 
-	IMG_GAUCHE,						// 
-	IMG_MOVE,						// 
-	IMG_SIZE,						// For size tab HANDLE_MOVE []
-	IMG_NONE						// NO IMAGE SELECTED
+	IMG_HAUT_GAUCHE = 0,						// 
+	IMG_HAUT,									// 
+	IMG_HAUT_DROIT,								// 
+	IMG_DROIT,									// 
+	IMG_BAS_DROIT,								// 
+	IMG_BAS,									// 
+	IMG_BAS_GAUCHE,								// 
+	IMG_GAUCHE,									// 
+	IMG_MOVE,									// 
+	IMG_SIZE,									// For size tab HANDLE_MOVE []
+	IMG_NONE									// NO IMAGE SELECTED
 } IMG_CORNER;
 
 typedef struct {
 
 	GdkRectangle	zone[ IMG_SIZE ];			// Les IMG_SIZE coordonnees de saisie de l'image
-								// EX:
-								// 	zone [ IMG_HAUT ] . x
-								// 	zone [ IMG_HAUT ] . y
-								// 	zone [ IMG_HAUT ] . width
-								// 	zone [ IMG_HAUT ] . height
+												// EX:
+												// 	zone [ IMG_HAUT ] . x
+												// 	zone [ IMG_HAUT ] . y
+												// 	zone [ IMG_HAUT ] . width
+												// 	zone [ IMG_HAUT ] . height
 } HANDLE_MOVE;
 
 typedef struct {
-								// UNE STRUCTURE PAR FICHIER IMAGE
-	gchar		*name_img;				// Nom du fichier image original
-	gchar		*name_png;				// Nom du fichier PNG
-	GtkWidget	*togglebutton;				// Adresse du bouton
-	GtkWidget	*image;					// Adresse de l'image
-	gboolean	BoolStructRemove;			// TRUE = STRUCT IS REMOVE | FALSE = ACTIVE
+												// UNE STRUCTURE PAR FICHIER IMAGE
+	gchar		*name_img;						// Nom du fichier image original
+	gchar		*name_png;						// Nom du fichier PNG
+	GtkWidget	*togglebutton;					// Adresse du bouton
+	GtkWidget	*image;							// Adresse de l'image
+	gboolean	BoolStructRemove;				// TRUE = STRUCT IS REMOVE | FALSE = ACTIVE
 } GLIST_POCHETTE;
 
 typedef struct {
-	gboolean	BoolAccessChanged;			// COMBOBOX changed is TRUE
-	
-	GtkComboBox	*AdrComboBoxChoice;			// 
+	gboolean	BoolAccessChanged;				// COMBOBOX changed is TRUE
 	
+	GtkComboBox	*AdrComboBoxChoice;				// 
+		
 	GtkWidget	*AdrEntrySearchImgWeb;			// Adresse saisie image web
 	GtkWidget	*AdrEntryNameFileSave;			// Adresse saisie nom fichier image
-	GtkWidget	*AdrEntryTitleCD;			// Adresse saisie titre du CD
+	GtkWidget	*AdrEntryTitleCD;				// Adresse saisie titre du CD
 	
-	gchar		*TitleCD;				// 
-	gchar		*Buffer_none;				// 
-	gchar		*Buffer_title;				// 
-	gchar		*Buffer_title_time;			// 
+	gchar		*TitleCD;						// 
+	gchar		*Buffer_none;					// 
+	gchar		*Buffer_title;					// 
+	gchar		*Buffer_title_time;				// 
 	gchar		*Buffer_artist_title_time;		// 
 	
-	GtkWidget	*AdrDrawingarea;			// Adresse de la surface
-	gboolean	BoolScaleAdjust;			// TRUE = ajustement de l'echelle avec la surface de la fentre
-	cairo_surface_t	*image;					// Adresse de l'image
-	gdouble		scale;					// Pourcentage de surface de l'image
-	gdouble		x0;					// Pos X
-	gdouble		y0;					// Pos Y
-	gint		image_width;				// Width
-	gint		image_height;				// Height
-	GList		*ListImage;				// Pointeur de structure IMAGE pour AdrDrawingarea
+	GtkWidget	*AdrDrawingarea;				// Adresse de la surface
+	gboolean	BoolScaleAdjust;				// TRUE = ajustement de l'echelle avec la surface de la fentre
+	cairo_surface_t	*image;						// Adresse de l'image
+	gdouble		scale;							// Pourcentage de surface de l'image
+	gdouble		x0;								// Pos X
+	gdouble		y0;								// Pos Y
+	gint		image_width;					// Width
+	gint		image_height;					// Height
+	GList		*ListImage;						// Pointeur de structure IMAGE pour AdrDrawingarea
 	gboolean	BoolEventButtonPress;			// TRUE == BOUTON SOURIS PRESSED
-	IMAGE		*GetImage;				// Adresse de l'image en selection
-	IMG_CORNER	ImgCorner;				// See IMG_CORNER
-	GtkWidget	*Adr_viewport_image_preview;		// Adresse viewport
-	GtkWidget	*Adr_table;				// Adresse table contenu dans le viewport
-	GList		*glist;					// Contient les structures GLIST_POCHETTE
-	GtkWidget	*AdrTextview;				// Adresse textview
-	gboolean	BoolSaveToFile;				// TRUE si sauvegarde vers fichier
-	HANDLE_MOVE	HandleMove;				// Les coordonnees de saisie de l'image
+	IMAGE		*GetImage;						// Adresse de l'image en selection
+	IMG_CORNER	ImgCorner;						// See IMG_CORNER
+	GtkWidget	*Adr_viewport_image_preview;	// Adresse viewport
+	GtkWidget	*Adr_table;						// Adresse table contenu dans le viewport
+	GList		*glist;							// Contient les structures GLIST_POCHETTE
+	GtkWidget	*AdrTextview;					// Adresse textview
+	gboolean	BoolSaveToFile;					// TRUE si sauvegarde vers fichier
+	HANDLE_MOVE	HandleMove;						// Les coordonnees de saisie de l'image
 } VIEW;
 
 extern	VIEW view;
@@ -185,7 +185,8 @@
 // 
 // POCHE_DRAW.C
 // 
-void		pochedraw_paint( cairo_surface_t *cs );
+// void		pochedraw_paint( cairo_surface_t *cs );
+cairo_t 	*pochedraw_paint( cairo_surface_t *cs, cairo_t *p_cr );
 void		pochedraw_get_handle_move( IMAGE *p_Image, gboolean p_BoolTestCursor );
 // 
 // POCHE_TXT.C

xcfa-4.2.8.tar.gz/src/poche_dir.c -> xcfa-5.0.2.tar.gz/src/poche_dir.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : poche_dir.h
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -30,11 +30,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <glib.h>
 #include <gdk/gdkkeysyms.h>
@@ -237,7 +232,6 @@
 	DIR *dp;
 	struct dirent *entry;
 	struct stat statbuf;
-	gint	Dummy;
 	
 	if (NULL == (dp = opendir (Directory))) {
 		if (TRUE == libutils_test_file_exist (Directory) && libutils_get_size_file (Directory) > 100) {
@@ -247,7 +241,7 @@
 		return;
 	}
 		
-	Dummy = chdir (Directory);
+	chdir (Directory);
 	while ((entry = readdir (dp)) != NULL) {
 		
 		if (WindScan_close_request () == TRUE) break;
@@ -286,7 +280,7 @@
 			}
 		}
 	}
-	Dummy = chdir ("..");
+	chdir ("..");
 	closedir (dp);
 }
 // 
@@ -352,14 +346,17 @@
 	IMAGE		*Image = NULL;
 	cairo_t		*cr;
 	
-	// PRINT("DND FROM STOCKAGE TO DRAWING");
-	gdk_window_get_pointer( view.AdrDrawingarea->window, &X, &Y, &state ); 	
-	cr = gdk_cairo_create( view.AdrDrawingarea->window );
- cairo_scale (cr, view.scale, view.scale);
- cairo_translate (cr, view.x0, view.y0);
- x = X;
- y = Y;
- cairo_device_to_user (cr, &x, &y);
+	/* Si pas de selection a cet endroit retour */
+	GdkDeviceManager *manager = gdk_display_get_device_manager( gdk_display_get_default() );
+	GdkDevice		 *device = gdk_device_manager_get_client_pointer( manager );
+	gdk_window_get_device_position( gtk_widget_get_window(view.AdrDrawingarea), device, &X, &Y, &state );
+	// gdk_window_get_pointer( view.AdrDrawingarea->window, &X, &Y, &state ); 	
+	cr = gdk_cairo_create( gtk_widget_get_window(view.AdrDrawingarea) );
+	cairo_scale (cr, view.scale, view.scale);
+	cairo_translate (cr, view.x0, view.y0);
+	x = X;
+	y = Y;
+	cairo_device_to_user (cr, &x, &y);
 	cairo_destroy( cr );
 	
 	Image = poche_add_to_glist( Str, x, y, TRUE, _TYPE_IMAGE_ );
@@ -456,7 +453,6 @@
 {
 	GLIST_POCHETTE *gl = NULL;
 	GList *list = NULL;
-	gint total_row_table = 0;
 	gint row_table = 0;
 	GdkPixbuf	*Pixbuf = NULL;
 	
@@ -483,9 +479,16 @@
 	
 	// CONSTRUCTION TABLE
 	
-	total_row_table = g_list_length (view.glist);
+	// total_row_table = g_list_length (view.glist);
 
-	view.Adr_table = gtk_table_new (1, total_row_table, FALSE);
+	// view.Adr_table = gtk_grid_new (1, total_row_table, FALSE);
+	view.Adr_table = gtk_grid_new();
+	// gtk_table_resize(
+	// 			view.Adr_table, 	// GtkTable *table,
+	// 			total_row_table,	// guint rows,
+	// 			1					// guint columns
+	// 			);
+ 
 	gtk_widget_show (view.Adr_table);
 	gtk_container_add (GTK_CONTAINER (view.Adr_viewport_image_preview), view.Adr_table);
 
@@ -501,11 +504,21 @@
 			// BUTTON
 			gl->togglebutton = gtk_toggle_button_new ();
 			gtk_widget_show (gl->togglebutton);
-			gtk_table_attach (GTK_TABLE (view.Adr_table),
-						gl->togglebutton,
-						row_table, row_table +1, 0, 1,
-						(GtkAttachOptions) (GTK_FILL),
-						(GtkAttachOptions) (0), 0, 0);
+			// gtk_table_attach(
+			// 			GTK_TABLE (view.Adr_table),
+			// 			gl->togglebutton,
+			// 			row_table, row_table +1, 0, 1,
+			// 			(GtkAttachOptions) (GTK_FILL),
+			// 			(GtkAttachOptions) (0), 0, 0
+			// 			);
+			gtk_grid_attach(
+					GTK_GRID(view.Adr_table),	// GtkGrid *grid,
+					gl->togglebutton,				// GtkWidget *child,
+					row_table,							// gint left,
+					0,							// gint top,
+					1,					// gint width,
+					1					// gint height
+					);
 			gtk_widget_set_size_request (gl->togglebutton, SIZE_IMAGE_VIEWPORT, SIZE_IMAGE_VIEWPORT);
 			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gl->togglebutton), FALSE);
 			gtk_container_set_border_width (GTK_CONTAINER (gl->togglebutton), 5);
@@ -558,7 +571,7 @@
 		Str = NULL;
 	}
 	else if (FALSE == VarPocheDir.BoolInThread) {
-		gtk_timeout_remove (VarPocheDir.HandlerTimeout);
+		g_source_remove (VarPocheDir.HandlerTimeout);
 		pochedir_table_add_images ();
 		WindScan_close ();
 		g_print("END TIMEOUT\n");
@@ -573,7 +586,12 @@
 	GSList		*gs_List = p_list;
 	pthread_t	nmr_tid_1;
 	
-	WindScan_open ("Files scan", WINDSCAN_PULSE);
+	// WindScan_open ("Files scan", WINDSCAN_PULSE);
+	wind_scan_init(
+		WindMain,
+		"Files scan",
+		WINDSCAN_PULSE
+		);
 	WindScan_set_label ("Scan directory, verify and load ...");
 
 	// PRINT_FUNC_LF();
@@ -594,7 +612,7 @@
 	VarPocheDir.BoolSetPercent = FALSE;
 	
 	g_print("DEBUT TIMEOUT\n");
-	VarPocheDir.HandlerTimeout = gtk_timeout_add (100, pochedir_timeout_, 0);
+	VarPocheDir.HandlerTimeout = g_timeout_add (100, pochedir_timeout_, 0);
 	g_print("DEBUT THREAD\n");
 	pthread_create (&nmr_tid_1, NULL ,(void *)pochedir_thread_, (void *)NULL);

xcfa-4.2.8.tar.gz/src/poche_draw.c -> xcfa-5.0.2.tar.gz/src/poche_draw.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : poche_draw.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -31,11 +31,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib.h>
@@ -70,6 +65,7 @@
 gdouble pochedraw_get_scale_adjust( void )
 {
 	gdouble	return_scale = 1.0;
+	GtkAllocation	allocation;
 	
 	if( TRUE == view.BoolScaleAdjust ) {
 		gdouble	scale_width = 1.0;
@@ -82,8 +78,11 @@
 			view.scale = SCALE_MIN;
 			poche_set_size_request();
 		}
-		scale_width = (gdouble)view.AdrDrawingarea->allocation.width / (gdouble)view.image_width;
-		scale_height = (gdouble)view.AdrDrawingarea->allocation.height / (gdouble)view.image_height;
+		gtk_widget_get_allocation( view.AdrDrawingarea, &allocation );
+		// scale_width = (gdouble)view.AdrDrawingarea->allocation.width / (gdouble)view.image_width;
+		scale_width = (gdouble)allocation.width / (gdouble)view.image_width;
+		// scale_height = (gdouble)view.AdrDrawingarea->allocation.height / (gdouble)view.image_height;
+		scale_height = (gdouble)allocation.height / (gdouble)view.image_height;
 		new_scale = MIN(scale_width, scale_height);
 		return_scale = new_scale;
 	}
@@ -456,6 +455,7 @@
 	cairo_scale( cr, view.scale, view.scale );
 	cairo_translate( cr, view.x0, view.y0 );
 	cairo_set_source_rgb( cr, 0.0, 0.0, 0.0 );
+	// cairo_set_source_rgb( cr, red/255.0, green/255.0, blue/255.0 );
 	if( FALSE == view.BoolSaveToFile ) {
 		// CONTOUR DE LA FEUILLE
 		// EPAISSEUR
@@ -538,54 +538,65 @@
 	LocateY = MM(177);
 	cairo_move_to( cr, LocateX, LocateY );
 	
-	PackageVersion = g_strdup_printf ("X Convert File Audio %s - GNU General Public License - 2003..2012, Claude Bulin - fr", VERSION);
+	PackageVersion = g_strdup_printf ("X Convert File Audio %s - GNU General Public License - 2003..2015, Claude Bulin - fr", VERSION);
 	cairo_show_text( cr, PackageVersion );
-	// cairo_show_text( cr, "ZoomC 0.0.19 GNU General Public License - 2003 - 2012, Claude Bulin - fr" );
+	// cairo_show_text( cr, "ZoomC 0.0.19 GNU General Public License - 2003 - 2015, Claude Bulin - fr" );
 	g_free( PackageVersion );
 	PackageVersion = NULL;
 	cairo_restore (cr);
 }
-void pochedraw_paint( cairo_surface_t *cs )
+cairo_t *pochedraw_paint( cairo_surface_t *cs, cairo_t *p_cr )
 {
 	cairo_t		*cr;
 	gint		canvas_w, canvas_h;
 	GList		*List = NULL;
 	IMAGE		*Image = NULL;
 	IMAGE		*ImageSelected = NULL;
+	GtkAllocation	allocation;
 	
-	
-	if( FALSE == view.BoolSaveToFile ) {
-		cr = gdk_cairo_create( view.AdrDrawingarea->window );
+	if( TRUE == view.BoolSaveToFile ) {
+		// cr = gdk_cairo_create( gtk_widget_get_window(view.AdrDrawingarea) );
+		cr = cairo_create( cs );
 	}
 	else {
-		cr = cairo_create( cs );
+		// cr = cairo_create( cs );
+		cr = p_cr;
 	}
-	cairo_save (cr);
+	// cairo_save (cr);
 	view.scale = pochedraw_get_scale_adjust();
+	gtk_widget_get_allocation( view.AdrDrawingarea, &allocation );
 	
 	// gdk_drawable_get_size (view.AdrDrawingarea->window, &canvas_w, &canvas_h );
-	canvas_w = view.AdrDrawingarea->allocation.width;
-	canvas_h = view.AdrDrawingarea->allocation.height;
+	// gdk_drawable_get_size( gtk_widget_get_window( view.AdrDrawingarea ), &canvas_w, &canvas_h );
+	// canvas_w = view.AdrDrawingarea->allocation.width;
+	canvas_w = allocation.width;
+	// canvas_h = view.AdrDrawingarea->allocation.height;
+	canvas_h = allocation.height;
+	// canvas_w = view.image_width;
+	// canvas_h = view.image_height;
+	
 	view.x0 = ((canvas_w / view.scale) - view.image_width) / 2.0;
 	view.y0 = ((canvas_h / view.scale) - view.image_height) / 2.0;
 
+	cairo_save (cr);
 	cairo_scale( cr, view.scale, view.scale );
 	cairo_translate( cr, view.x0, view.y0 );
 	cairo_set_source_surface( cr, view.image, 0.0, 0.0 );
 	cairo_paint( cr );
 
+
 	// PAINT PREVIEW SURFACE
 	cairo_set_source_rgb( cr, 1.0, 1.0, 1.0 );
+	// cairo_set_source_rgb( cr, 0.0, 0.0, 0.0 );
 	cairo_rectangle( cr,
 			 0,
 			 0,
 			 view.image_width,
 			 view.image_height
-			 );			
+			 );
 	cairo_fill( cr );
-			
+
 	cairo_restore (cr);
-	
 	// 
 	// Image[ n ]		image en dessous / image below
 	// Image[ n +1 ]	
@@ -615,7 +626,9 @@
 	}
 	cairo_restore (cr);
 	pochedraw_set_format( cr );
-	cairo_destroy( cr );
+	
+	return( cr );
+	// cairo_destroy( cr );
 }

xcfa-4.2.8.tar.gz/src/poche_save.c -> xcfa-5.0.2.tar.gz/src/poche_save.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : poche_save.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -30,11 +30,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib.h>
@@ -70,8 +65,8 @@
 {
 	cairo_surface_t *cs;
 
-	cs = cairo_image_surface_create( CAIRO_FORMAT_ARGB32, width, height );
-	pochedraw_paint( cs );
+	cs = cairo_image_surface_create( CAIRO_FORMAT_ARGB32, MM(290), MM(360) );
+	pochedraw_paint( cs, NULL );
 	cairo_surface_write_to_png( cs, fname );
 	cairo_surface_destroy( cs );
 }
@@ -81,11 +76,17 @@
 void pochesave_write_pdf( gchar *fname, gint width, gint height )
 {
 	cairo_surface_t *cs;
-
-	cs = cairo_pdf_surface_create( fname, width, height );
-	pochedraw_paint( cs );
-	cairo_surface_write_to_png( cs, fname );
+	cairo_t			*cr = NULL;
+	
+	
+	// cs = cairo_pdf_surface_create( fname, MM(280), MM(300) );
+	// cs = cairo_pdf_surface_create( fname, width, height );
+	cs = cairo_pdf_surface_create( fname, width, 816 );
+	cr = pochedraw_paint( cs, NULL );
+	// cairo_surface_flush( cs );
 	cairo_surface_destroy( cs );
+	cairo_show_page( cr );
+	cairo_destroy( cr );
 }
 // SEE:
 // http://en.literateprograms.org/Hello_World_%28C,_Cairo%29
@@ -95,8 +96,7 @@
 	cairo_surface_t *cs;
 	
 	cs = cairo_ps_surface_create( fname, width, height );
-	pochedraw_paint( cs );
-	cairo_surface_write_to_png( cs, fname );
+	pochedraw_paint( cs, NULL );
 	cairo_surface_destroy( cs );
 }
 // 
@@ -105,20 +105,20 @@
 // 
 void on_button_save_clicked( GtkButton *button, gpointer user_data )
 {
-	gint		width;
-	gint		height;
 	gdouble		OldScale = view.scale;
 	gboolean	BoolScaleAdjust = view.BoolScaleAdjust;
 	gchar		*PathNameSaveFile = NULL;
 	gchar		*NameSaveFile = pochetxt_get_ptr_entry_name_file_to_save();
+	GtkAllocation	allocation;
 	
 	if( NULL == NameSaveFile || '\0' == *NameSaveFile ) {
-		wininfo_create (
-			_("Nom de fichier absent !!"),
-			_("Pour resoudre ce probleme:"),
+		wind_info_init (
+			WindMain,
+			_("File name not found !!"),
+			_("To solve this problem :"),
 			 "\n",
 			 "-----------------------------------\n",
-			_("Saisissez un nom de fichier sans extention"),
+			_("Enter a file name without extension"),
 		 	 "");
 		return;
 	}
@@ -128,24 +128,31 @@
 	// 
 	// PDF POSTSCRIPT
 	// 
-	// StatusBar_puts( _("Sauvegarde aux formats PDF et PostScript") );
-	StatusBar_set_mess( NOTEBOOK_POCHETTE, _STATUSBAR_SIMPLE_, _("Sauvegarde aux formats PDF et PostScript") );
-	view.scale = 1.55;
+	StatusBar_set_mess( NOTEBOOK_POCHETTE, _STATUSBAR_SIMPLE_, _("Saving to PDF") );
+	view.scale = 10;
 	poche_set_size_request();
-	gtk_widget_queue_draw( view.AdrDrawingarea );
-	while (gtk_events_pending()) gtk_main_iteration();
-	width = view.AdrDrawingarea->allocation.width;
-	height = view.AdrDrawingarea->allocation.height;
+	view.scale = 1.55;
+	printf("view.scale = 1.55 \n" );
+	do {
+		poche_set_size_request();
+		while (gtk_events_pending()) gtk_main_iteration();
+		gtk_widget_get_allocation( view.AdrDrawingarea, &allocation );
+		printf("	allocation.width = %d allocation.height = %d\n", allocation.width, allocation.height );
+	} while( allocation.width != 576 && allocation.height != 816 );
 	
-	PathNameSaveFile = g_strdup_printf( "%s/%s.pdf", Config.PathSaveImg, NameSaveFile );
-	// REDIRECTION VERS PDF ET POSTSCRIPT
+	// REDIRECTION VERS PDF
 	view.BoolSaveToFile = TRUE;
-	pochesave_write_pdf( PathNameSaveFile, width, height );
+
+	PathNameSaveFile = g_strdup_printf( "%s/%s.pdf", Config.PathSaveImg, NameSaveFile );
+	gtk_widget_get_allocation( view.AdrDrawingarea, &allocation );
+	pochesave_write_pdf( PathNameSaveFile, allocation.width, allocation.height );
 	g_free( PathNameSaveFile );
 	PathNameSaveFile = NULL;
 	
+	/**
+	// REDIRECTION VERS POSTSCRIPT
 	PathNameSaveFile = g_strdup_printf( "%s/%s.ps", Config.PathSaveImg, NameSaveFile );
-	pochesave_write_ps( PathNameSaveFile, width, height );
+	pochesave_write_ps( PathNameSaveFile, allocation.width, allocation.height );
 	g_free( PathNameSaveFile );
 	PathNameSaveFile = NULL;
 	view.BoolSaveToFile = FALSE;
@@ -156,20 +163,23 @@
 	// StatusBar_puts( _("Sauvegarde au format PNG") );
 	StatusBar_set_mess( NOTEBOOK_POCHETTE, _STATUSBAR_SIMPLE_, _("Sauvegarde au format PNG") );
 	view.scale = 2.0;
-	poche_set_size_request();
-	gtk_widget_queue_draw( view.AdrDrawingarea );
-	while (gtk_events_pending()) gtk_main_iteration();
-	width = view.AdrDrawingarea->allocation.width;
-	height = view.AdrDrawingarea->allocation.height;
+	printf("view.scale = 2.0 \n" );
+	do {
+		poche_set_size_request();
+		while (gtk_events_pending()) gtk_main_iteration();
+		gtk_widget_get_allocation( view.AdrDrawingarea, &allocation );
+		printf("	allocation.width = %d allocation.height = %d\n", allocation.width, allocation.height );
+	} while( allocation.width > 576 && allocation.height > 816 );
 	
 	PathNameSaveFile = g_strdup_printf( "%s/%s.png", Config.PathSaveImg, NameSaveFile );
 	// REDIRECTION VERS PNG
 	view.BoolSaveToFile = TRUE;
-	pochesave_write_png( PathNameSaveFile, width, height );
+	pochesave_write_png( PathNameSaveFile, allocation.width, allocation.height );
 	g_free( PathNameSaveFile );
 	PathNameSaveFile = NULL;
-	view.BoolSaveToFile = FALSE;
+	*/
 	
+	view.BoolSaveToFile = FALSE;
 	view.scale = OldScale;
 	view.BoolScaleAdjust = BoolScaleAdjust;
 	poche_set_size_request();

xcfa-4.2.8.tar.gz/src/poche_txt.c -> xcfa-5.0.2.tar.gz/src/poche_txt.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : poche_txt.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -30,11 +30,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib.h>
@@ -173,6 +168,7 @@
 	pochetxt_set_text_to_textview( Image );
 	// DEBUG CDDB_CURL
 	pochetxt_set_combobox_choice( Image->PosCombobox );
+	poche_set_flag_buttons();
 }
 
 // 
@@ -241,8 +237,8 @@
 		gchar		*Ptr = NULL;
 		gchar		*Font = g_strdup_printf( "%s %d", Image->FontName, Image->SizeFontName );
 	
-		dialog = gtk_font_selection_dialog_new("Select Font");
-		gtk_font_selection_dialog_set_font_name( GTK_FONT_SELECTION_DIALOG(dialog), Font );
+		dialog = gtk_font_chooser_dialog_new( "Select Font", GTK_WINDOW(WindMain) );
+		gtk_font_chooser_set_font( GTK_FONT_CHOOSER (dialog), Font );
 		g_free( Font );
 		Font = NULL;
 		result = gtk_dialog_run(GTK_DIALOG(dialog));
@@ -252,7 +248,7 @@
 				g_free( Image->FontName );
 				Image->FontName = NULL;
 			}
-			Image->FontName = gtk_font_selection_dialog_get_font_name( GTK_FONT_SELECTION_DIALOG(dialog));
+			Image->FontName = g_strdup( gtk_font_chooser_get_font( GTK_FONT_CHOOSER (dialog) ));
 			
 			// LE NOM DE LA POLICE: FontName
 			Ptr = Image->FontName;
@@ -265,7 +261,7 @@
 			Image->SizeFontName = atoi( Ptr );
 			Ptr --;
 			*Ptr = '\0';
-						
+			
 			// FORCER AFFICHAGE
 			gtk_widget_queue_draw( view.AdrDrawingarea );
 		}
@@ -359,12 +355,10 @@
 // 
 void on_combobox_choice_get_cd_realize( GtkWidget *widget, gpointer user_data )
 {
-	libcombo_alloc (GTK_COMBO_BOX (widget));
-	
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Aucun" );
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Titre" );
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Titre - Temps" );
-	gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Artiste - Titre - Temps" );
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Aucun" );
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Titre" );
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Titre - Temps" );
+	gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Artiste - Titre - Temps" );
 	gtk_combo_box_set_active(GTK_COMBO_BOX (widget), 0 );
 	view.AdrComboBoxChoice = GTK_COMBO_BOX (widget);
 }

xcfa-4.2.8.tar.gz/src/poche_web.c -> xcfa-5.0.2.tar.gz/src/poche_web.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : poche_web.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -30,11 +30,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <glib.h>
 #include <glib/gprintf.h>
@@ -96,8 +91,6 @@
 	gchar *name_file = NULL;
 	gint num;
 	gchar *LineCommand = NULL;
-	gint	 Dummy;
-
 
 	PRINT_FUNC_LF();
 
@@ -116,7 +109,7 @@
 	
 	// IMAGE IMPORT
 	LineCommand = g_strdup_printf ("wget --user-agent=\"Mozilla 22.0\" -O %s %s", name_file, filename);
-	Dummy = system (LineCommand);
+	system (LineCommand);
 	g_free (LineCommand);
 	LineCommand = NULL;
 	
@@ -152,11 +145,10 @@
 	gchar	*buffer = NULL;
 	gchar *result = NULL;
 	FILE *fp;
-	gchar *PtrBegin = NULL;
-	gchar *PtrEnd = NULL;
 	gchar *PtrName = NULL;
-	size_t	Dummy;
-	gint	NumFile = 1;
+	const	char *prefix = "/images?q=tbn:";
+	char	*url_start = NULL;
+	char	*url_end = NULL;
 	
 	PRINT_FUNC_LF();
 
@@ -173,74 +165,51 @@
 	buffer = g_malloc0 (sizeof (char) * (lenfile + 1024));
 
 	fp = fopen (pocheweb_event.name_index_html, "r");
-	Dummy = fread (buffer, 1, lenfile, fp);
+	fread (buffer, 1, lenfile, fp);
 	fclose (fp);
 
-	// 
-	// RECHERCHE D'UNE SEQUENCE:
-	//	.jpg
-	// ... PRECEDEE D'UNE SEQUENCE:
-	//	http://
-	// 
-	PtrEnd = buffer;
-	// BOUCLE
-	while( (PtrEnd - buffer) < lenfile ) {
-		// SEARCH END STRING '.jpg'
-		if( NULL != ( PtrEnd = strstr( PtrEnd, ".jpg" ))) {
-			PtrBegin = PtrEnd;
-			PtrBegin --;
-			PtrEnd += 4;
-			// SEARCH BEGIN STRING 'http:'
-			while( PtrBegin > buffer ) {
+	url_start = buffer;
+	do {
+		url_start = strstr( url_start, prefix );
+		if( NULL != url_start ) {
+			url_end = strstr( url_start, "\"" );
+			if( NULL != url_end ) {
 				
-				if( *(PtrBegin + 0) == 'h' &&
-				 *(PtrBegin + 1) == 't' &&
-				 *(PtrBegin + 2) == 't' &&
-				 *(PtrBegin + 3) == 'p' &&
-				 *(PtrBegin + 4) == ':' ) {
-					
-					// MAKE STRING
-					result = g_strnfill( (PtrEnd - PtrBegin) + 10, '\0' );
-					// GET STRING
-					strncpy( result, PtrBegin, PtrEnd - PtrBegin );
-					
-					if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
-						g_print( "NumFile = %d\n", NumFile );
-						g_print( "result = %s\n", result );
+				result = g_strnfill( (url_end - url_start) + 100, '\0' );
+				strcpy( result, "www.google.com/" );
+				strncat( result, url_start, url_end - url_start );
+				
+				// printf("result = www.google.com/%s\n", result );
+				
+				if ((PtrName = pocheweb_get_on_web_file_img (result))) {
+					if (pocheweb_event.name) {
+						g_free (pocheweb_event.name);
+						pocheweb_event.name = NULL;
 					}
-					NumFile ++;
+					pocheweb_event.name = g_strdup( PtrName );
+					pochedir_make_glist( PtrName );
 					
-					if ((PtrName = pocheweb_get_on_web_file_img (result))) {
-						if (pocheweb_event.name) {
-							g_free (pocheweb_event.name);
-							pocheweb_event.name = NULL;
-						}
-						pocheweb_event.name = g_strdup( PtrName );
-						pochedir_make_glist( PtrName );
-						
-						g_free( PtrName );
-						PtrName = NULL;
+					g_free( PtrName );
+					PtrName = NULL;
+				}
+				
+				url_start = url_end + 1;
+				
+				g_free( result );
+				result = NULL;
+				
+				if (WindScan_close_request ()) {
+					if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
+						g_print ("DEMANDE D'ANNULATION DEPUIS: ");
+						PRINT_FUNC_LF();
 					}
-					g_free( result );
-					result = NULL;
 					break;
 				}
-				else {
-					PtrBegin --;
-				}
-			}
-			
-			if (WindScan_close_request ()) {
-				if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
-					g_print ("DEMANDE D'ANNULATION DEPUIS: ");
-					PRINT_FUNC_LF();
-				}
-				break;
+				
 			}
+			else break;
 		}
-		PtrEnd ++;
-		if ((PtrEnd - buffer) >= lenfile -100) break;
-	}
+	} while( NULL != url_start );
 
 	g_free (buffer);
 	buffer = NULL;
@@ -253,14 +222,12 @@
 */
 gboolean pocheweb_recup_file_html (gchar *cd_name)
 {
-	/*FILE *index;*/
 	gchar *name = NULL;
 	gchar *ptrname = NULL;
 	gboolean bool_ret = FALSE;
 	gchar *PtrNew = NULL;
 	gchar *Ptr = NULL;
 	gchar *LineCommand = NULL;
-	gint	 Dummy;
 
 	PRINT_FUNC_LF();
 
@@ -289,17 +256,14 @@
 	g_free (PtrNew);
 	PtrNew = Ptr = NULL;
 	
-/*g_print ("\n---------NAME = %s\n\n", name);*/
-
 	pocheweb_event.name_index_html = g_strdup_printf ("%s/index.html", Config.PathPochette);
 	LineCommand = g_strdup_printf ("wget --user-agent=\"Mozilla 22.0\" -O %s %s", pocheweb_event.name_index_html, name);
-	
 	if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
 		g_print( "pocheweb_event.name_index_html = %s\n", pocheweb_event.name_index_html );	// /tmp/XcfaPochette/index.html
 		g_print( "name = %s\n", name );				// http://images.google.com/images?q=
 		g_print( "LineCommand=%s\n", LineCommand );	// wget --user-agent="Mozilla 22.0" -O /tmp/XcfaPochette/index.html http://images.google.com/images?q=
 	}
-	Dummy = system (LineCommand);
+	system (LineCommand);
 	g_free (LineCommand);
 	LineCommand = NULL;
 
@@ -317,9 +281,6 @@
 {
 	gchar *ptr_cdname = NULL;
 
-	// PRINT_FUNC_LF();
-
-	// ptr_cdname = pocheevnt_get_comboboxentry_cdaudio ();
 	ptr_cdname = pochetxt_get_ptr_entry_img_web();
 	
 	if (pocheweb_recup_file_html (ptr_cdname) == TRUE) {
@@ -351,19 +312,20 @@
 		pochedir_table_add_images ();
 		// pocheevnt_set_flag_buttons_recto ();
 		// pocheevnt_set_flag_buttons_verso ();
-		gtk_timeout_remove (pocheweb_event.timeout);
+		g_source_remove (pocheweb_event.timeout);
 		
 		WindScan_close ();
 
 		if (pocheweb_bool_file_add () == FALSE) {
-			wininfo_create (
-				_("Aucun fichier trouve !"),
-				_("Pour resoudre ce probleme:"),
+			wind_info_init (
+				WindMain,
+				_("No file found !"),
+				_("To solve this problem :"),
 				 "\n",
 				 "-----------------------------------\n",
-				_("Modifiez la chaine de recherche et"),
+				_("Modify the search parameters and"),
 				 "\n",
-				_("recommencez."),
+				_("start again."),
 			 	 "");
 		}
 	}
@@ -377,32 +339,31 @@
 	// PRINT_FUNC_LF();
 	
 	if( NULL == StrEntryWeb || '\0' == *StrEntryWeb ) {
-		wininfo_create (
-			_("Critere de recherche absent !!"),
-			_("Pour resoudre ce probleme:"),
+		wind_info_init (
+			WindMain,
+			_("Search criteria away !!"),
+			_("To solve this problem :"),
 			 "\n",
 			 "-----------------------------------\n",
-			_("Saisissez une chaine de recherche et"),
-			 "\n",
-			_("recommencez."),
+				_("Modify the search parameters and"),
+				 "\n",
+				_("start again."),
 		 	 "");
 		return;
 	}
 	pocheweb_event.pocheweb_tt_glist = g_list_length (view.glist);
-	WindScan_open ("Recherche des fichiers images", WINDSCAN_PULSE);
+	// WindScan_open ("Recherche des fichiers images", WINDSCAN_PULSE);
+	wind_scan_init(
+		WindMain,
+		"Recherche des fichiers images",
+		WINDSCAN_PULSE
+		);
 	WindScan_set_label ("Recherche des fichiers images ...");
-	pocheweb_event.name = g_strdup (_("[Recherche des fichiers images]"));
+	pocheweb_event.name = g_strdup (_("[Search images files]"));
 	pocheweb_event.name = NULL;
 	pocheweb_event.EndThread = FALSE;
 	pocheweb_event.EndTimeout = FALSE;
-	pocheweb_event.timeout = gtk_timeout_add (10, pocheweb_timeout, 0);
+	pocheweb_event.timeout = g_timeout_add (10, pocheweb_timeout, 0);
 	pthread_create (&pocheweb_event.nmr_tid, NULL ,(void *)pocheweb_thread, (void *)NULL);
 }
 
-
-
-
-
-
-
-

xcfa-4.2.8.tar.gz/src/popup.c -> xcfa-5.0.2.tar.gz/src/popup.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : popup.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright :( C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define gettext_noop(x)( x) 
-#endif
-
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -76,7 +71,6 @@
 
 
 
-
 #define CASE_POP_MENU_FICHERS 0
 #define MAX_POP_MENU_FICHERS 9
 POP_MENU PopMenuFichiers [ MAX_POP_MENU_FICHERS ] = {
@@ -300,10 +294,9 @@
 }
 // 
 // 
-void popup_make_popup( POP_MENU *p_popup, gint nbr_op)
+void popup_make_popup( POP_MENU *p_popup, gint nbr_op )
 {
 	GtkWidget *menu = NULL;
-	GtkWidget *Attach = NULL;
 	GtkWidget *SubMenu = NULL;
 	gint cpt = 0;
 	gint val = 0;
@@ -322,10 +315,11 @@
 			INFO_MP3 *info =( INFO_MP3 *)VarPopup.detail->info;
 			val = info->LevelDbfs.level;
 		}
+		val = val;
 	}
 	
 	menu = gtk_menu_new( );	
-	gtk_widget_set_extension_events( menu, GDK_EXTENSION_EVENTS_ALL );
+	// gtk_widget_set_extension_events( menu, GDK_EXTENSION_EVENTS_ALL );
 
 	for( cpt = 0; cpt < nbr_op; cpt ++ ) {
 		if( p_popup[ cpt ].Op.Type > -1 ) {
@@ -344,7 +338,7 @@
 			gtk_container_add( GTK_CONTAINER( menu), p_popup[ cpt ].Widget );
 		}
 		else if( p_popup[ cpt ].Op.Type == -3 ) {
-			Attach = p_popup[ cpt ].Widget = gtk_menu_item_new_with_mnemonic( gettext(p_popup[ cpt ].Title) );
+			p_popup[ cpt ].Widget = gtk_menu_item_new_with_mnemonic( gettext(p_popup[ cpt ].Title) );
 			gtk_widget_show( p_popup[ cpt ].Widget );
 			gtk_container_add( GTK_CONTAINER( menu), p_popup[ cpt ].Widget );
 			
@@ -352,7 +346,7 @@
 			gtk_menu_item_set_submenu( GTK_MENU_ITEM( p_popup[ cpt ].Widget), SubMenu );
 		}
 		else if( p_popup[ cpt ].Op.Type == -10 ) {
-			p_popup[ cpt ].Widget = gtk_image_menu_item_new_with_mnemonic( gettext(p_popup[ cpt ].Title) );
+			p_popup[ cpt ].Widget = gtk_menu_item_new_with_mnemonic( gettext(p_popup[ cpt ].Title) );
 			gtk_widget_show( p_popup[ cpt ].Widget );
 			gtk_container_add( GTK_CONTAINER( SubMenu), p_popup[ cpt ].Widget );
 		}
@@ -449,20 +443,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 // 
 //
 // POPUP FILE WAV PISTE
@@ -493,36 +473,9 @@
 	DETAIL *detail = ( DETAIL *)user_data;
 	FileWav_from_popup( FILEWAV_TRACK_CELL, detail, -2, -1, -2 );
 }
-void on_ColTrack1_activate( GtkMenuItem *menuitem, gpointer user_data )
-{
-	DETAIL *detail = ( DETAIL *)user_data;
-	FileWav_from_popup( FILEWAV_TRACK_COL, detail, -2, 1, -2 );
-}
-void on_ColTrack2_activate( GtkMenuItem *menuitem, gpointer user_data )
-{
-	DETAIL *detail = ( DETAIL *)user_data;
-	FileWav_from_popup( FILEWAV_TRACK_COL, detail, -2, 2, -2 );
-}
-void on_ColTrack4_activate( GtkMenuItem *menuitem, gpointer user_data )
-{
-	DETAIL *detail = ( DETAIL *)user_data;
-	FileWav_from_popup( FILEWAV_TRACK_COL, detail, -2, 4, -2 );
-}
-void on_ColTrack6_activate( GtkMenuItem *menuitem, gpointer user_data )
-{
-	DETAIL *detail = ( DETAIL *)user_data;
-	FileWav_from_popup( FILEWAV_TRACK_COL, detail, -2, 6, -2 );
-}
-void on_ColTrackOriginal_activate( GtkMenuItem *menuitem, gpointer user_data )
-{
-	DETAIL *detail = ( DETAIL *)user_data;
-	FileWav_from_popup( FILEWAV_TRACK_COL, detail, -2, -1, -2 );
-}
 void popup_file_wav_piste( DETAIL *detail)
 {
 	GtkWidget *Menu;
-	GtkWidget *CellTrack;
-	GtkWidget *CellSubMenu;
 	GtkWidget *CellTrack1;
 	GtkWidget *CellTrack2;
 	GtkWidget *CellTrack4;
@@ -530,82 +483,35 @@
 	GtkWidget *CellSeparate;
 	GtkWidget *CellTrackOriginal;
 
-	GtkWidget *ColTrack;
-	GtkWidget *ColSubMenu;
-	GtkWidget *ColTrack1;
-	GtkWidget *ColTrack2;
-	GtkWidget *ColTrack4;
-	GtkWidget *ColTrack6;
-	GtkWidget *ColSeparate;
-	GtkWidget *ColTrackOriginal;
 	
 	Menu = gtk_menu_new( );
-	gtk_widget_set_extension_events( Menu, GDK_EXTENSION_EVENTS_ALL );
-	CellTrack = gtk_menu_item_new_with_mnemonic( _("Cellule") );
-	gtk_widget_show( CellTrack );
-	gtk_container_add( GTK_CONTAINER( Menu), CellTrack ); 
 	
-	CellSubMenu = gtk_menu_new( );
-	gtk_menu_item_set_submenu( GTK_MENU_ITEM( CellTrack), CellSubMenu );
-		
-	CellTrack1 = gtk_menu_item_new_with_mnemonic( _("1 piste") );
+	CellTrack1 = gtk_menu_item_new_with_mnemonic( "1 track" );
 	gtk_widget_show( CellTrack1 );
-	gtk_container_add( GTK_CONTAINER( CellSubMenu), CellTrack1 );
-	CellTrack2 = gtk_menu_item_new_with_mnemonic( _("2 pistes") );
+	gtk_container_add( GTK_CONTAINER( Menu), CellTrack1 );
+	CellTrack2 = gtk_menu_item_new_with_mnemonic( "2 track" );
 	gtk_widget_show( CellTrack2 );
-	gtk_container_add( GTK_CONTAINER( CellSubMenu), CellTrack2 );
-	CellTrack4 = gtk_menu_item_new_with_mnemonic( _("4 pistes") );
+	gtk_container_add( GTK_CONTAINER( Menu), CellTrack2 );
+	CellTrack4 = gtk_menu_item_new_with_mnemonic( "4 track" );
 	gtk_widget_show( CellTrack4 );
-	gtk_container_add( GTK_CONTAINER( CellSubMenu), CellTrack4 );
-	CellTrack6 = gtk_menu_item_new_with_mnemonic( _("6 pistes") );
+	gtk_container_add( GTK_CONTAINER( Menu), CellTrack4 );
+	CellTrack6 = gtk_menu_item_new_with_mnemonic( "6 track" );
 	gtk_widget_show( CellTrack6 );
-	gtk_container_add( GTK_CONTAINER( CellSubMenu), CellTrack6 );
+	gtk_container_add( GTK_CONTAINER( Menu), CellTrack6 );
 	CellSeparate = gtk_separator_menu_item_new( );
 	gtk_widget_show( CellSeparate );
-	gtk_container_add( GTK_CONTAINER( CellSubMenu), CellSeparate );
-	CellTrackOriginal = gtk_menu_item_new_with_mnemonic( _("Valeur d'origine") );
+	gtk_container_add( GTK_CONTAINER( Menu), CellSeparate );
+	CellTrackOriginal = gtk_menu_item_new_with_mnemonic( _("Original value") );
 	gtk_widget_show( CellTrackOriginal );
-	gtk_container_add( GTK_CONTAINER( CellSubMenu), CellTrackOriginal );
-	
-	ColTrack = gtk_menu_item_new_with_mnemonic( _("Colonne") );
-	gtk_widget_show( ColTrack );
-	gtk_container_add( GTK_CONTAINER( Menu), ColTrack ); 
-	
-	ColSubMenu = gtk_menu_new( );
-	gtk_menu_item_set_submenu( GTK_MENU_ITEM( ColTrack), ColSubMenu );
-	
-	ColTrack1 = gtk_menu_item_new_with_mnemonic( _("1 piste") );
-	gtk_widget_show( ColTrack1 );
-	gtk_container_add( GTK_CONTAINER( ColSubMenu), ColTrack1 );
-	ColTrack2 = gtk_menu_item_new_with_mnemonic( _("2 pistes") );
-	gtk_widget_show( ColTrack2 );
-	gtk_container_add( GTK_CONTAINER( ColSubMenu), ColTrack2 );
-	ColTrack4 = gtk_menu_item_new_with_mnemonic( _("4 pistes") );
-	gtk_widget_show( ColTrack4 );
-	gtk_container_add( GTK_CONTAINER( ColSubMenu), ColTrack4 );
-	ColTrack6 = gtk_menu_item_new_with_mnemonic( _("6 pistes") );
-	gtk_widget_show( ColTrack6 );
-	gtk_container_add( GTK_CONTAINER( ColSubMenu), ColTrack6 );
-	ColSeparate = gtk_separator_menu_item_new( );
-	gtk_widget_show( ColSeparate );
-	gtk_container_add( GTK_CONTAINER( ColSubMenu), ColSeparate );
-	ColTrackOriginal = gtk_menu_item_new_with_mnemonic( _("Valeur d'origine") );
-	gtk_widget_show( ColTrackOriginal );
-	gtk_container_add( GTK_CONTAINER( ColSubMenu), ColTrackOriginal );
+	gtk_container_add( GTK_CONTAINER( Menu), CellTrackOriginal );
 	
 	g_signal_connect(( gpointer) CellTrack1, "activate", G_CALLBACK( on_CellTrack1_activate), detail );
 	g_signal_connect(( gpointer) CellTrack2, "activate", G_CALLBACK( on_CellTrack2_activate), detail );
 	g_signal_connect(( gpointer) CellTrack4, "activate", G_CALLBACK( on_CellTrack4_activate), detail );
 	g_signal_connect(( gpointer) CellTrack6, "activate", G_CALLBACK( on_CellTrack6_activate), detail );
 	g_signal_connect(( gpointer) CellTrackOriginal, "activate", G_CALLBACK( on_CellTrackOriginal_activate), detail );
-	g_signal_connect(( gpointer) ColTrack1, "activate", G_CALLBACK( on_ColTrack1_activate), detail );
-	g_signal_connect(( gpointer) ColTrack2, "activate", G_CALLBACK( on_ColTrack2_activate), detail );
-	g_signal_connect(( gpointer) ColTrack4, "activate", G_CALLBACK( on_ColTrack4_activate), detail );
-	g_signal_connect(( gpointer) ColTrack6, "activate", G_CALLBACK( on_ColTrack6_activate), detail );
-	g_signal_connect(( gpointer) ColTrackOriginal, "activate", G_CALLBACK( on_ColTrackOriginal_activate), detail );
 	
 	GLADE_HOOKUP_OBJECT_NO_REF( Menu, Menu, "Menu" );
-	GLADE_HOOKUP_OBJECT( Menu, CellSubMenu, "CellSubMenu" );
 	GLADE_HOOKUP_OBJECT( Menu, CellTrack1, "CellTrack1" );
 	GLADE_HOOKUP_OBJECT( Menu, CellTrack2, "CellTrack2" );
 	GLADE_HOOKUP_OBJECT( Menu, CellTrack4, "CellTrack4" );
@@ -613,14 +519,6 @@
 	GLADE_HOOKUP_OBJECT( Menu, CellSeparate, "CellSeparate" );
 	GLADE_HOOKUP_OBJECT( Menu, CellTrackOriginal, "CellTrackOriginal" );
 
-	GLADE_HOOKUP_OBJECT( Menu, ColSubMenu, "ColSubMenu" );
-	GLADE_HOOKUP_OBJECT( Menu, ColTrack1, "ColTrack1" );
-	GLADE_HOOKUP_OBJECT( Menu, ColTrack2, "ColTrack2" );
-	GLADE_HOOKUP_OBJECT( Menu, ColTrack4, "ColTrack4" );
-	GLADE_HOOKUP_OBJECT( Menu, ColTrack6, "ColTrack6" );
-	GLADE_HOOKUP_OBJECT( Menu, ColSeparate, "ColSeparate" );
-	GLADE_HOOKUP_OBJECT( Menu, ColTrackOriginal, "ColTrackOriginal" );
-	
 	gtk_menu_popup( GTK_MENU( Menu), NULL, NULL, NULL, NULL, 3, 0 );
 }
 // 
@@ -673,56 +571,9 @@
 	DETAIL *detail = ( DETAIL *)user_data;
 	FileWav_from_popup( FILEWAV_FREQUENCY_CELL_HERTZ, detail, -1, -2, -2 );
 }
-void on_ColHertz8000_activate( GtkMenuItem *menuitem, gpointer user_data )
-{
-	DETAIL *detail = ( DETAIL *)user_data;
-	FileWav_from_popup( FILEWAV_FREQUENCY_COL_HERTZ, detail, 8000, -2, -2 );
-}
-void on_ColHertz22000_activate( GtkMenuItem *menuitem, gpointer user_data )
-{
-	DETAIL *detail = ( DETAIL *)user_data;
-	FileWav_from_popup( FILEWAV_FREQUENCY_COL_HERTZ, detail, 22000, -2, -2 );
-}
-void on_ColHertz32000_activate( GtkMenuItem *menuitem, gpointer user_data )
-{
-	DETAIL *detail = ( DETAIL *)user_data;
-	FileWav_from_popup( FILEWAV_FREQUENCY_COL_HERTZ, detail, 32000, -2, -2 );
-}
-void on_ColHertz44056_activate( GtkMenuItem *menuitem, gpointer user_data )
-{
-	DETAIL *detail = ( DETAIL *)user_data;
-	FileWav_from_popup( FILEWAV_FREQUENCY_COL_HERTZ, detail, 44056, -2, -2 );
-}
-void on_ColHertz44100_activate( GtkMenuItem *menuitem, gpointer user_data )
-{
-	DETAIL *detail = ( DETAIL *)user_data;
-	FileWav_from_popup( FILEWAV_FREQUENCY_COL_HERTZ, detail, 44100, -2, -2 );
-}
-void on_ColHertz48000_activate( GtkMenuItem *menuitem, gpointer user_data )
-{
-	DETAIL *detail = ( DETAIL *)user_data;
-	FileWav_from_popup( FILEWAV_FREQUENCY_COL_HERTZ, detail, 48000, -2, -2 );
-}
-void on_ColHertz88200_activate( GtkMenuItem *menuitem, gpointer user_data )
-{
-	DETAIL *detail = ( DETAIL *)user_data;
-	FileWav_from_popup( FILEWAV_FREQUENCY_COL_HERTZ, detail, 88200, -2, -2 );
-}
-void on_ColHertz96000_activate( GtkMenuItem *menuitem, gpointer user_data )
-{
-	DETAIL *detail = ( DETAIL *)user_data;
-	FileWav_from_popup( FILEWAV_FREQUENCY_COL_HERTZ, detail, 96000, -2, -2 );
-}
-void on_ColHertzOriginal_activate( GtkMenuItem *menuitem, gpointer user_data )
-{
-	DETAIL *detail = ( DETAIL *)user_data;
-	FileWav_from_popup( FILEWAV_FREQUENCY_COL_HERTZ, detail, -1, -2, -2 );
-}
 void popup_file_wav_frequence( DETAIL *detail)
 {
 	GtkWidget *Menu;
-	GtkWidget *CellHertz;
-	GtkWidget *CellSubMenu;
 	GtkWidget *CellHertz8000;
 	GtkWidget *CellHertz22000;
 	GtkWidget *CellHertz32000;
@@ -733,98 +584,42 @@
 	GtkWidget *CellHertz96000;
 	GtkWidget *CellSeparate;
 	GtkWidget *CellHertzOriginal;
-	
-	GtkWidget *ColHertz;
-	GtkWidget *ColSubMenu;
-	GtkWidget *ColHertz8000;
-	GtkWidget *ColHertz22000;
-	GtkWidget *ColHertz32000;
-	GtkWidget *ColHertz44056;
-	GtkWidget *ColHertz44100;
-	GtkWidget *ColHertz48000;
-	GtkWidget *ColHertz88200;
-	GtkWidget *ColHertz96000;
-	GtkWidget *ColSeparate;
-	GtkWidget *ColHertzOriginal;
-	
+		
 	Menu = gtk_menu_new( );
-	gtk_widget_set_extension_events( Menu, GDK_EXTENSION_EVENTS_ALL );
-	CellHertz = gtk_menu_item_new_with_mnemonic( _("Cellule") );
-	gtk_widget_show( CellHertz );
-	gtk_container_add( GTK_CONTAINER( Menu), CellHertz ); 
-	
-	CellSubMenu = gtk_menu_new( );
-	gtk_menu_item_set_submenu( GTK_MENU_ITEM( CellHertz), CellSubMenu );
+	// gtk_widget_set_extension_events( Menu, GDK_EXTENSION_EVENTS_ALL );
 		
-	CellHertz8000 = gtk_menu_item_new_with_mnemonic( _(" 8000 Hertz") );
+
+	CellHertz8000 = gtk_menu_item_new_with_mnemonic( " 8000 Hertz" );
 	gtk_widget_show( CellHertz8000 );
-	gtk_container_add( GTK_CONTAINER( CellSubMenu), CellHertz8000 );
-	CellHertz22000 = gtk_menu_item_new_with_mnemonic( _("22000 Hertz") );
+	gtk_container_add( GTK_CONTAINER( Menu), CellHertz8000 );
+	CellHertz22000 = gtk_menu_item_new_with_mnemonic( "22000 Hertz" );
 	gtk_widget_show( CellHertz22000 );
-	gtk_container_add( GTK_CONTAINER( CellSubMenu), CellHertz22000 );
-	CellHertz32000 = gtk_menu_item_new_with_mnemonic( _("32000 Hertz") );
+	gtk_container_add( GTK_CONTAINER( Menu), CellHertz22000 );
+	CellHertz32000 = gtk_menu_item_new_with_mnemonic( "32000 Hertz" );
 	gtk_widget_show( CellHertz32000 );
-	gtk_container_add( GTK_CONTAINER( CellSubMenu), CellHertz32000 );
-	CellHertz44056 = gtk_menu_item_new_with_mnemonic( _("44056 Hertz") );
+	gtk_container_add( GTK_CONTAINER( Menu), CellHertz32000 );
+	CellHertz44056 = gtk_menu_item_new_with_mnemonic( "44056 Hertz" );
 	gtk_widget_show( CellHertz44056 );
-	gtk_container_add( GTK_CONTAINER( CellSubMenu), CellHertz44056 );
-	CellHertz44100 = gtk_menu_item_new_with_mnemonic( _("44100 Hertz") );
+	gtk_container_add( GTK_CONTAINER( Menu), CellHertz44056 );
+	CellHertz44100 = gtk_menu_item_new_with_mnemonic( "44100 Hertz" );
 	gtk_widget_show( CellHertz44100 );
-	gtk_container_add( GTK_CONTAINER( CellSubMenu), CellHertz44100 );
-	CellHertz48000 = gtk_menu_item_new_with_mnemonic( _("48000 Hertz") );
+	gtk_container_add( GTK_CONTAINER( Menu), CellHertz44100 );
+	CellHertz48000 = gtk_menu_item_new_with_mnemonic( "48000 Hertz" );
 	gtk_widget_show( CellHertz48000 );
-	gtk_container_add( GTK_CONTAINER( CellSubMenu), CellHertz48000 );
-	CellHertz88200 = gtk_menu_item_new_with_mnemonic( _("88200 Hertz") );
+	gtk_container_add( GTK_CONTAINER( Menu), CellHertz48000 );
+	CellHertz88200 = gtk_menu_item_new_with_mnemonic( "88200 Hertz" );
 	gtk_widget_show( CellHertz88200 );
-	gtk_container_add( GTK_CONTAINER( CellSubMenu), CellHertz88200 );
-	CellHertz96000 = gtk_menu_item_new_with_mnemonic( _("96000 Hertz") );
+	gtk_container_add( GTK_CONTAINER( Menu), CellHertz88200 );
+	CellHertz96000 = gtk_menu_item_new_with_mnemonic( "96000 Hertz" );
 	gtk_widget_show( CellHertz96000 );
-	gtk_container_add( GTK_CONTAINER( CellSubMenu), CellHertz96000 );
+	gtk_container_add( GTK_CONTAINER( Menu), CellHertz96000 );
 	CellSeparate = gtk_separator_menu_item_new( );
 	gtk_widget_show( CellSeparate );
-	gtk_container_add( GTK_CONTAINER( CellSubMenu), CellSeparate );
-	CellHertzOriginal = gtk_menu_item_new_with_mnemonic( _("Valeur d'origine") );
+	gtk_container_add( GTK_CONTAINER( Menu), CellSeparate );
+	CellHertzOriginal = gtk_menu_item_new_with_mnemonic( _("Original value") );
 	gtk_widget_show( CellHertzOriginal );
-	gtk_container_add( GTK_CONTAINER( CellSubMenu), CellHertzOriginal );
-	
-	ColHertz = gtk_menu_item_new_with_mnemonic( _("Colonne") );
-	gtk_widget_show( ColHertz );
-	gtk_container_add( GTK_CONTAINER( Menu), ColHertz ); 
-	
-	ColSubMenu = gtk_menu_new( );
-	gtk_menu_item_set_submenu( GTK_MENU_ITEM( ColHertz), ColSubMenu );
-	
-	ColHertz8000 = gtk_menu_item_new_with_mnemonic( _(" 8000 Hertz") );
-	gtk_widget_show( ColHertz8000 );
-	gtk_container_add( GTK_CONTAINER( ColSubMenu), ColHertz8000 );
-	ColHertz22000 = gtk_menu_item_new_with_mnemonic( _("22000 Hertz") );
-	gtk_widget_show( ColHertz22000 );
-	gtk_container_add( GTK_CONTAINER( ColSubMenu), ColHertz22000 );
-	ColHertz32000 = gtk_menu_item_new_with_mnemonic( _("32000 Hertz") );
-	gtk_widget_show( ColHertz32000 );
-	gtk_container_add( GTK_CONTAINER( ColSubMenu), ColHertz32000 );
-	ColHertz44056 = gtk_menu_item_new_with_mnemonic( _("44056 Hertz") );
-	gtk_widget_show( ColHertz44056 );
-	gtk_container_add( GTK_CONTAINER( ColSubMenu), ColHertz44056 );
-	ColHertz44100 = gtk_menu_item_new_with_mnemonic( _("44100 Hertz") );
-	gtk_widget_show( ColHertz44100 );
-	gtk_container_add( GTK_CONTAINER( ColSubMenu), ColHertz44100 );
-	ColHertz48000 = gtk_menu_item_new_with_mnemonic( _("48000 Hertz") );
-	gtk_widget_show( ColHertz48000 );
-	gtk_container_add( GTK_CONTAINER( ColSubMenu), ColHertz48000 );
-	ColHertz88200 = gtk_menu_item_new_with_mnemonic( _("88200 Hertz") );
-	gtk_widget_show( ColHertz88200 );
-	gtk_container_add( GTK_CONTAINER( ColSubMenu), ColHertz88200 );
-	ColHertz96000 = gtk_menu_item_new_with_mnemonic( _("96000 Hertz") );
-	gtk_widget_show( ColHertz96000 );
-	gtk_container_add( GTK_CONTAINER( ColSubMenu), ColHertz96000 );
-	ColSeparate = gtk_separator_menu_item_new( );
-	gtk_widget_show( ColSeparate );
-	gtk_container_add( GTK_CONTAINER( ColSubMenu), ColSeparate );
-	ColHertzOriginal = gtk_menu_item_new_with_mnemonic( _("Valeur d'origine") );
-	gtk_widget_show( ColHertzOriginal );
-	gtk_container_add( GTK_CONTAINER( ColSubMenu), ColHertzOriginal );
-		
+	gtk_container_add( GTK_CONTAINER( Menu), CellHertzOriginal );
+	
 	g_signal_connect(( gpointer) CellHertz8000, "activate", G_CALLBACK( on_CellHertz8000_activate), detail );
 	g_signal_connect(( gpointer) CellHertz22000, "activate", G_CALLBACK( on_CellHertz22000_activate), detail );
 	g_signal_connect(( gpointer) CellHertz32000, "activate", G_CALLBACK( on_CellHertz32000_activate), detail );
@@ -834,20 +629,9 @@
 	g_signal_connect(( gpointer) CellHertz88200, "activate", G_CALLBACK( on_CellHertz88200_activate), detail );
 	g_signal_connect(( gpointer) CellHertz96000, "activate", G_CALLBACK( on_CellHertz96000_activate), detail );
 	g_signal_connect(( gpointer) CellHertzOriginal, "activate", G_CALLBACK( on_CellHertzOriginal_activate), detail );
-	
-	g_signal_connect(( gpointer) ColHertz8000, "activate", G_CALLBACK( on_ColHertz8000_activate), detail );
-	g_signal_connect(( gpointer) ColHertz22000, "activate", G_CALLBACK( on_ColHertz22000_activate), detail );
-	g_signal_connect(( gpointer) ColHertz32000, "activate", G_CALLBACK( on_ColHertz32000_activate), detail );
-	g_signal_connect(( gpointer) ColHertz44056, "activate", G_CALLBACK( on_ColHertz44056_activate), detail );
-	g_signal_connect(( gpointer) ColHertz44100, "activate", G_CALLBACK( on_ColHertz44100_activate), detail );
-	g_signal_connect(( gpointer) ColHertz48000, "activate", G_CALLBACK( on_ColHertz48000_activate), detail );
-	g_signal_connect(( gpointer) ColHertz88200, "activate", G_CALLBACK( on_ColHertz88200_activate), detail );
-	g_signal_connect(( gpointer) ColHertz96000, "activate", G_CALLBACK( on_ColHertz96000_activate), detail );
-	g_signal_connect(( gpointer) ColHertzOriginal, "activate", G_CALLBACK( on_ColHertzOriginal_activate), detail );
 
 	GLADE_HOOKUP_OBJECT_NO_REF( Menu, Menu, "Menu" );
-	GLADE_HOOKUP_OBJECT( Menu, CellHertz, "CellHertz" );
-	GLADE_HOOKUP_OBJECT( Menu, CellSubMenu, "CellSubMenu" );
+	GLADE_HOOKUP_OBJECT( Menu, Menu, 		"Menu" );
 	GLADE_HOOKUP_OBJECT( Menu, CellHertz8000, "CellHertz8000" );
 	GLADE_HOOKUP_OBJECT( Menu, CellHertz22000, "CellHertz22000" );
 	GLADE_HOOKUP_OBJECT( Menu, CellHertz32000, "CellHertz32000" );
@@ -858,19 +642,6 @@
 	GLADE_HOOKUP_OBJECT( Menu, CellHertz96000, "CellHertz96000" );
 	GLADE_HOOKUP_OBJECT( Menu, CellSeparate, "CellSeparate" );
 	GLADE_HOOKUP_OBJECT( Menu, CellHertzOriginal, "CellHertzOriginal" );
-	
-	GLADE_HOOKUP_OBJECT( Menu, ColHertz, "ColHertz" );
-	GLADE_HOOKUP_OBJECT( Menu, ColSubMenu, "ColSubMenu" );
-	GLADE_HOOKUP_OBJECT( Menu, ColHertz8000, "ColHertz8000" );
-	GLADE_HOOKUP_OBJECT( Menu, ColHertz22000, "ColHertz22000" );
-	GLADE_HOOKUP_OBJECT( Menu, ColHertz32000, "ColHertz32000" );
-	GLADE_HOOKUP_OBJECT( Menu, ColHertz44056, "ColHertz44056" );
-	GLADE_HOOKUP_OBJECT( Menu, ColHertz44100, "ColHertz44100" );
-	GLADE_HOOKUP_OBJECT( Menu, ColHertz48000, "ColHertz48000" );
-	GLADE_HOOKUP_OBJECT( Menu, ColHertz88200, "ColHertz88200" );
-	GLADE_HOOKUP_OBJECT( Menu, ColHertz96000, "ColHertz96000" );
-	GLADE_HOOKUP_OBJECT( Menu, ColSeparate, "ColSeparate" );
-	GLADE_HOOKUP_OBJECT( Menu, ColHertzOriginal, "ColHertzOriginal" );
 
 	gtk_menu_popup( GTK_MENU( Menu), NULL, NULL, NULL, NULL, 3, 0 );
 }
@@ -909,42 +680,9 @@
 	DETAIL *detail = ( DETAIL *)user_data;
 	FileWav_from_popup( FILEWAV_QUANTIFICATION_CELL, detail, -2, -2, -1 );
 }
-	
-void on_ColWav8_activate( GtkMenuItem *menuitem, gpointer user_data )
-{
-	DETAIL *detail = ( DETAIL *)user_data;
-	FileWav_from_popup( FILEWAV_QUANTIFICATION_COL, detail, -2, -2, 8 );
-}
-void on_ColWav16_activate( GtkMenuItem *menuitem, gpointer user_data )
-{
-	DETAIL *detail = ( DETAIL *)user_data;
-	FileWav_from_popup( FILEWAV_QUANTIFICATION_COL, detail, -2, -2, 16 );
-}
-void on_ColWav24_activate( GtkMenuItem *menuitem, gpointer user_data )
-{
-	DETAIL *detail = ( DETAIL *)user_data;
-	FileWav_from_popup( FILEWAV_QUANTIFICATION_COL, detail, -2, -2, 24 );
-}
-void on_ColWav32_activate( GtkMenuItem *menuitem, gpointer user_data )
-{
-	DETAIL *detail = ( DETAIL *)user_data;
-	FileWav_from_popup( FILEWAV_QUANTIFICATION_COL, detail, -2, -2, 32 );
-}
-void on_ColWav64_activate( GtkMenuItem *menuitem, gpointer user_data )
-{
-	DETAIL *detail = ( DETAIL *)user_data;
-	FileWav_from_popup( FILEWAV_QUANTIFICATION_COL, detail, -2, -2, 64 );
-}
-void on_ColOriginal_activate( GtkMenuItem *menuitem, gpointer user_data )
-{
-	DETAIL *detail = ( DETAIL *)user_data;
-	FileWav_from_popup( FILEWAV_QUANTIFICATION_COL, detail, -2, -2, -1 );
-}
 void popup_file_wav_quantification( DETAIL *detail)
 {
 	GtkWidget *Menu;
-	GtkWidget *CellWav;
-	GtkWidget *CellSubMenu;
 	GtkWidget *CellWav8;
 	GtkWidget *CellWav16;
 	GtkWidget *CellWav24;
@@ -952,77 +690,31 @@
 	GtkWidget *CellWav64;
 	GtkWidget *CellSeparate;
 	GtkWidget *CellOriginal;
-
-	GtkWidget *ColWav;
-	GtkWidget *ColSubMenu;
-	GtkWidget *ColWav8;
-	GtkWidget *ColWav16;
-	GtkWidget *ColWav24;
-	GtkWidget *ColWav32;
-	GtkWidget *ColWav64;
-	GtkWidget *ColSeparate;
-	GtkWidget *ColOriginal;
 	
 	Menu = gtk_menu_new( );
-	gtk_widget_set_extension_events( Menu, GDK_EXTENSION_EVENTS_ALL );
-	CellWav = gtk_menu_item_new_with_mnemonic( _("Cellule") );
-	gtk_widget_show( CellWav );
-	gtk_container_add( GTK_CONTAINER( Menu), CellWav ); 
-	
-	CellSubMenu = gtk_menu_new( );
-	gtk_menu_item_set_submenu( GTK_MENU_ITEM( CellWav), CellSubMenu );
+	// gtk_widget_set_extension_events( Menu, GDK_EXTENSION_EVENTS_ALL );
 		
-	CellWav8 = gtk_menu_item_new_with_mnemonic( _(" 8 bits") );
+	CellWav8 = gtk_menu_item_new_with_mnemonic( " 8 bits" );
 	gtk_widget_show( CellWav8 );
-	gtk_container_add( GTK_CONTAINER( CellSubMenu), CellWav8 );
-	CellWav16 = gtk_menu_item_new_with_mnemonic( _("16 bits") );
+	gtk_container_add( GTK_CONTAINER( Menu), CellWav8 );
+	CellWav16 = gtk_menu_item_new_with_mnemonic( "16 bits" );
 	gtk_widget_show( CellWav16 );
-	gtk_container_add( GTK_CONTAINER( CellSubMenu), CellWav16 );
-	CellWav24 = gtk_menu_item_new_with_mnemonic( _("24 bits") );
+	gtk_container_add( GTK_CONTAINER( Menu), CellWav16 );
+	CellWav24 = gtk_menu_item_new_with_mnemonic( "24 bits" );
 	gtk_widget_show( CellWav24 );
-	gtk_container_add( GTK_CONTAINER( CellSubMenu), CellWav24 );
-	CellWav32 = gtk_menu_item_new_with_mnemonic( _("32 bits") );
+	gtk_container_add( GTK_CONTAINER( Menu), CellWav24 );
+	CellWav32 = gtk_menu_item_new_with_mnemonic( "32 bits" );
 	gtk_widget_show( CellWav32 );
-	gtk_container_add( GTK_CONTAINER( CellSubMenu), CellWav32 );
-	CellWav64 = gtk_menu_item_new_with_mnemonic( _("64 bits") );
+	gtk_container_add( GTK_CONTAINER( Menu), CellWav32 );
+	CellWav64 = gtk_menu_item_new_with_mnemonic( "64 bits" );
 	gtk_widget_show( CellWav64 );
-	gtk_container_add( GTK_CONTAINER( CellSubMenu), CellWav64 );
+	gtk_container_add( GTK_CONTAINER( Menu), CellWav64 );
 	CellSeparate = gtk_separator_menu_item_new( );
 	gtk_widget_show( CellSeparate );
-	gtk_container_add( GTK_CONTAINER( CellSubMenu), CellSeparate );
-	CellOriginal = gtk_menu_item_new_with_mnemonic( _("Valeur d'origine") );
+	gtk_container_add( GTK_CONTAINER( Menu), CellSeparate );
+	CellOriginal = gtk_menu_item_new_with_mnemonic( _("Original value") );
 	gtk_widget_show( CellOriginal );
-	gtk_container_add( GTK_CONTAINER( CellSubMenu), CellOriginal );
-	
-	ColWav = gtk_menu_item_new_with_mnemonic( _("Colonne") );
-	gtk_widget_show( ColWav );
-	gtk_container_add( GTK_CONTAINER( Menu), ColWav ); 
-	
-	ColSubMenu = gtk_menu_new( );
-	gtk_menu_item_set_submenu( GTK_MENU_ITEM( ColWav), ColSubMenu );
-		
-	ColWav8 = gtk_menu_item_new_with_mnemonic( _(" 8 bits") );
-	gtk_widget_show( ColWav8 );
-	gtk_container_add( GTK_CONTAINER( ColSubMenu), ColWav8 );
-	
-	ColWav16 = gtk_menu_item_new_with_mnemonic( _("16 bits") );
-	gtk_widget_show( ColWav16 );
-	gtk_container_add( GTK_CONTAINER( ColSubMenu), ColWav16 );
-	ColWav24 = gtk_menu_item_new_with_mnemonic( _("24 bits") );
-	gtk_widget_show( ColWav24 );
-	gtk_container_add( GTK_CONTAINER( ColSubMenu), ColWav24 );
-	ColWav32 = gtk_menu_item_new_with_mnemonic( _("32 bits") );
-	gtk_widget_show( ColWav32 );
-	gtk_container_add( GTK_CONTAINER( ColSubMenu), ColWav32 );
-	ColWav64 = gtk_menu_item_new_with_mnemonic( _("64 bits") );
-	gtk_widget_show( ColWav64 );
-	gtk_container_add( GTK_CONTAINER( ColSubMenu), ColWav64 );
-	ColSeparate = gtk_separator_menu_item_new( );
-	gtk_widget_show( ColSeparate );
-	gtk_container_add( GTK_CONTAINER( ColSubMenu), ColSeparate );
-	ColOriginal = gtk_menu_item_new_with_mnemonic( _("Valeur d'origine") );
-	gtk_widget_show( ColOriginal );
-	gtk_container_add( GTK_CONTAINER( ColSubMenu), ColOriginal );
+	gtk_container_add( GTK_CONTAINER( Menu), CellOriginal );
 	
 	g_signal_connect(( gpointer) CellWav8, "activate", G_CALLBACK( on_CellWav8_activate), detail );
 	g_signal_connect(( gpointer) CellWav16, "activate", G_CALLBACK( on_CellWav16_activate), detail );
@@ -1031,15 +723,7 @@
 	g_signal_connect(( gpointer) CellWav64, "activate", G_CALLBACK( on_CellWav64_activate), detail );
 	g_signal_connect(( gpointer) CellOriginal, "activate", G_CALLBACK( on_CellOriginal_activate), detail );
 	
-	g_signal_connect(( gpointer) ColWav8, "activate", G_CALLBACK( on_ColWav8_activate), detail );
-	g_signal_connect(( gpointer) ColWav16, "activate", G_CALLBACK( on_ColWav16_activate), detail );
-	g_signal_connect(( gpointer) ColWav24, "activate", G_CALLBACK( on_ColWav24_activate), detail );
-	g_signal_connect(( gpointer) ColWav32, "activate", G_CALLBACK( on_ColWav32_activate), detail );
-	g_signal_connect(( gpointer) ColWav64, "activate", G_CALLBACK( on_ColWav64_activate), detail );
-	g_signal_connect(( gpointer) ColOriginal, "activate", G_CALLBACK( on_ColOriginal_activate), detail );
-
 	GLADE_HOOKUP_OBJECT_NO_REF( Menu, Menu, "Menu" );
-	GLADE_HOOKUP_OBJECT( Menu, CellWav8, "CellSubMenu" );
 	GLADE_HOOKUP_OBJECT( Menu, CellWav8, "CellWav8" );
 	GLADE_HOOKUP_OBJECT( Menu, CellWav16, "CellWav16" );
 	GLADE_HOOKUP_OBJECT( Menu, CellWav24, "CellWav24" );
@@ -1048,15 +732,6 @@
 	GLADE_HOOKUP_OBJECT( Menu, CellWav64, "CellSeparate" );
 	GLADE_HOOKUP_OBJECT( Menu, CellOriginal, "CellOriginal" );
 	
-	GLADE_HOOKUP_OBJECT( Menu, ColWav8, "ColSubMenu" );
-	GLADE_HOOKUP_OBJECT( Menu, ColWav8, "ColWav8" );
-	GLADE_HOOKUP_OBJECT( Menu, ColWav16, "ColWav16" );
-	GLADE_HOOKUP_OBJECT( Menu, ColWav24, "ColWav24" );
-	GLADE_HOOKUP_OBJECT( Menu, ColWav32, "ColWav32" );
-	GLADE_HOOKUP_OBJECT( Menu, ColWav64, "ColWav64" );
-	GLADE_HOOKUP_OBJECT( Menu, ColWav64, "ColSeparate" );
-	GLADE_HOOKUP_OBJECT( Menu, ColOriginal, "ColOriginal" );
-	
 	gtk_menu_popup( GTK_MENU( Menu), NULL, NULL, NULL, NULL, 3, 0 );
 }
 // 
@@ -1085,12 +760,13 @@
 	GtkWidget *SplitRemove;
 	
 	Menu = gtk_menu_new( );
-	gtk_widget_set_extension_events( Menu, GDK_EXTENSION_EVENTS_ALL );
-	SplitNext = gtk_menu_item_new_with_mnemonic( _("Selecteur suivant") );
+	// gtk_widget_set_extension_events( Menu, GDK_EXTENSION_EVENTS_ALL );
+	
+	SplitNext = gtk_menu_item_new_with_mnemonic( _("Next selector") );
 	gtk_widget_show( SplitNext );
 	gtk_container_add( GTK_CONTAINER( Menu), SplitNext );
 
-	SplitPrevious = gtk_menu_item_new_with_mnemonic( _("Selecteur precedant") );
+	SplitPrevious = gtk_menu_item_new_with_mnemonic( _("Previous selector") );
 	gtk_widget_show( SplitPrevious );
 	gtk_container_add( GTK_CONTAINER( Menu), SplitPrevious );
 	
@@ -1098,7 +774,7 @@
 	gtk_widget_show( Separate );
 	gtk_container_add( GTK_CONTAINER( Menu), Separate );
 		
-	SplitRemove = gtk_menu_item_new_with_mnemonic( _("Supprimer la plage active") );
+	SplitRemove = gtk_menu_item_new_with_mnemonic( _("Delete the active range") );
 	gtk_widget_show( SplitRemove );
 	gtk_container_add( GTK_CONTAINER( Menu), SplitRemove );	
 	
@@ -1169,12 +845,13 @@
 	GtkWidget *ImageLast;
 
 	Menu = gtk_menu_new( );
-	gtk_widget_set_extension_events( Menu, GDK_EXTENSION_EVENTS_ALL );
-	FlipHorizontal = gtk_menu_item_new_with_mnemonic( _("Retourner horizontalement") );
+	// gtk_widget_set_extension_events( Menu, GDK_EXTENSION_EVENTS_ALL );
+	
+	FlipHorizontal = gtk_menu_item_new_with_mnemonic( _("Flip Horizontal") );
 	gtk_widget_show( FlipHorizontal );
 	gtk_container_add( GTK_CONTAINER( Menu), FlipHorizontal );
 	
-	FlipVertical = gtk_menu_item_new_with_mnemonic( _("Retourner verticalement") );
+	FlipVertical = gtk_menu_item_new_with_mnemonic( _("Flip Vertical") );
 	gtk_widget_show( FlipVertical );
 	gtk_container_add( GTK_CONTAINER( Menu), FlipVertical );
 	
@@ -1182,19 +859,19 @@
 	gtk_widget_show( Separate );
 	gtk_container_add( GTK_CONTAINER( Menu), Separate );
 		
-	ImageFisrt = gtk_menu_item_new_with_mnemonic( _("Image au premier plan") );
+	ImageFisrt = gtk_menu_item_new_with_mnemonic( _("Foreground image") );
 	gtk_widget_show( ImageFisrt );
 	gtk_container_add( GTK_CONTAINER( Menu), ImageFisrt );	
 	
-	ImageUp = gtk_menu_item_new_with_mnemonic( _("Image au dessus") );
+	ImageUp = gtk_menu_item_new_with_mnemonic( _("Image above") );
 	gtk_widget_show( ImageUp );
 	gtk_container_add( GTK_CONTAINER( Menu), ImageUp );	
 
-	ImageDown = gtk_menu_item_new_with_mnemonic( _("Image en dessous") );
+	ImageDown = gtk_menu_item_new_with_mnemonic( _("Image below") );
 	gtk_widget_show( ImageDown );
 	gtk_container_add( GTK_CONTAINER( Menu), ImageDown );	
 	
-	ImageLast = gtk_menu_item_new_with_mnemonic( _("Image au dernier plan") );
+	ImageLast = gtk_menu_item_new_with_mnemonic( _("Image to the background") );
 	gtk_widget_show( ImageLast );
 	gtk_container_add( GTK_CONTAINER( Menu), ImageLast );	
 	
@@ -1202,7 +879,7 @@
 	gtk_widget_show( Separate );
 	gtk_container_add( GTK_CONTAINER( Menu), Separate );
 		
-	RemoveImage = gtk_menu_item_new_with_mnemonic( _("Effacer l'image") );
+	RemoveImage = gtk_menu_item_new_with_mnemonic( _("Clear image") );
 	gtk_widget_show( RemoveImage );
 	gtk_container_add( GTK_CONTAINER( Menu), RemoveImage );	
 
@@ -1238,8 +915,9 @@
 	GtkWidget *RemoveImage;
 	
 	Menu = gtk_menu_new( );
-	gtk_widget_set_extension_events( Menu, GDK_EXTENSION_EVENTS_ALL );
-	RemoveImage = gtk_menu_item_new_with_mnemonic( _("Supprimer l'image de la liste") );
+	// gtk_widget_set_extension_events( Menu, GDK_EXTENSION_EVENTS_ALL );
+	
+	RemoveImage = gtk_menu_item_new_with_mnemonic( _("Remove image from the list") );
 	gtk_widget_show( RemoveImage );
 	gtk_container_add( GTK_CONTAINER( Menu), RemoveImage );
 	
@@ -1299,7 +977,7 @@
 	gint		Choice;
 	
 	Menu = gtk_menu_new( );
-	gtk_widget_set_extension_events( Menu, GDK_EXTENSION_EVENTS_ALL );
+	// gtk_widget_set_extension_events( Menu, GDK_EXTENSION_EVENTS_ALL );
 	
 	for( Choice = 0; -1 != StructTagsFileMp3[ Choice ].num; Choice ++ ) {
 		
@@ -1322,6 +1000,571 @@
 }
 
 
+// 
+//
+// POPUP TAG FILE
+// 
+// 
+/*
+typedef struct {
+	gboolean	BoolFromPopup;
+	gint		num;
+	gchar		*name;
+} FILE_POPUP_GENRE;
+*/
+FILE_POPUP_GENRE FilePopupGenre = { FALSE, -1, NULL };
+
+void on_menu_popup_num_file_activate( GtkMenuItem *menuitem, gpointer user_data )
+{
+	gint	Choice = GPOINTER_TO_INT(user_data);
+	
+	FilePopupGenre.num = Choice;
+	FilePopupGenre.BoolFromPopup = TRUE;
+	
+	PRINT_FUNC_LF();
+	if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
+		g_print( "\tPtrEntry = %s\n", FilePopupGenre.name );
+		g_print( "\tNumEntry = %d\n", Choice);
+	}
+
+	gtk_entry_set_text( GTK_ENTRY(GLADE_GET_OBJECT("entry_tag_genre_file")), FilePopupGenre.name );
+	// cd_expander_set_genre( CdPopupGenre.num, CdPopupGenre.name );
+	
+	FileTags_changed_all_tags( 0 ); // #define	TAG_GENRE	0
+	
+	FilePopupGenre.BoolFromPopup = FALSE;
+}
+void on_menu_popup_txt_file_activate( GtkMenuItem *menuitem, gpointer user_data )
+{
+	gchar	*Ptr = (gchar *)user_data;
+	
+	if( NULL != FilePopupGenre.name ) {
+		g_free( FilePopupGenre.name );
+		FilePopupGenre.name = NULL;
+	}
+	FilePopupGenre.name = g_strdup( Ptr );
+}
+void popup_menu_file( void )
+{
+	GtkWidget	*Menu;
+	GtkWidget	*RemoveImage;
+	gint		Choice;
+	
+	Menu = gtk_menu_new( );
+	// gtk_widget_set_extension_events( Menu, GDK_EXTENSION_EVENTS_ALL );
+	
+	for( Choice = 0; -1 != StructTagsFileMp3[ Choice ].num; Choice ++ ) {
+		
+		// StructTagsFileMp3[ i ].name
+		// StructTagsFileMp3[ i ].num
+		
+	// ********* gtk_combo_box_set_wrap_width (GTK_COMBO_BOX (widget), 4);
+		RemoveImage = gtk_menu_item_new_with_mnemonic( StructTagsFileMp3[ Choice ].name );
+		
+		gtk_widget_show( RemoveImage );
+		gtk_container_add( GTK_CONTAINER( Menu), RemoveImage );
+		
+		g_signal_connect(( gpointer) RemoveImage, "activate", G_CALLBACK(on_menu_popup_txt_file_activate), (gpointer)StructTagsFileMp3[ Choice ].name );
+		g_signal_connect(( gpointer) RemoveImage, "activate", G_CALLBACK(on_menu_popup_num_file_activate), GINT_TO_POINTER(StructTagsFileMp3[ Choice ].num));
+		
+		GLADE_HOOKUP_OBJECT( Menu, RemoveImage, "RemoveImage" );
+	}
+	GLADE_HOOKUP_OBJECT_NO_REF( Menu, Menu, "Menu" );
+
+	gtk_menu_popup( GTK_MENU( Menu), NULL, NULL, NULL, NULL, 3, 0 );
+}
+
+
+
+
+// 
+// POPUP MP3 FILES
+// 
+/*
+	TYPE:	ABR
+	DEBIT:	32 40 48 56 64 80 96 112 128 160 192 224 320
+	MODE:	Defaut / Stereo / Join Stereo / Forced Join Stereo / Duo Channels / Mono
+
+	TYPE:	CBR
+	DEBIT:	32 40 48 56 64 80 96 112 128 160 192 224 320
+	MODE:	Defaut / Stereo / Join Stereo / Forced Join Stereo / Duo Channels / Mono
+
+	TYPE:	VBR
+	DEBIT:	preset medium / preset standard / preset extreme / preset fast standard / preset fast extreme / V0 V1 V2 V3 V4 V5 V6 V7 V8 V9
+	MODE:	Defaut / Stereo / Join Stereo / Forced Join Stereo / Duo Channels / Mono
+
+	TYPE:	VBR-NEW
+	DEBIT:	NONE / preset medium / preset standard / preset extreme / preset fast standard / preset fast extreme / V0 V1 V2 V3 V4 V5 V6 V7 V8 V9
+	MODE:	Defaut / Stereo / Join Stereo / Forced Join Stereo / Duo Channels / Mono
+*/
+DETAIL *Detail_VarOptionsFileOggMp3 = NULL;
+
+gchar *VarOptionsFileMp3[] = {
+	// ABR
+	// 0 .. 13
+	" 32", " 40", " 48", " 56", " 64", " 80", " 96", "112", "128", "160", "192", "224", "256", "320",
+	// CBR
+	// 14 .. 28
+	" 32", " 40", " 48", " 56", " 64", " 80", " 96", "112", "128", "160", "192", "224", "256", "320", "preset insane",
+	// VBR
+	// 29 .. 43
+	"preset medium", "preset standard", "preset extreme", "preset fast standard", "preset fast extreme", gettext_noop("V0 [ best quality ]"), "V1", "V2", "V3", gettext_noop("V4 [ default ]"), "V5", "V6", "V7", "V8", gettext_noop("V9 [ Lower quality ]"),
+	// VBR-NEW
+	// 44 .. 59
+	"NONE", "preset medium", "preset standard", "preset extreme", "preset fast standard", "preset fast extreme", "V0", "V1", "V2", "V3", gettext_noop("V4 [ default ]"), "V5", "V6", "V7", "V8", "V9",
+	// MODE
+	// 60 .. 65
+	"Default", "Stereo", "Join Stereo", "Forced Join Stereo", "Duo Channels", "Mono"
+};
+// 
+// 
+void on_type_file_mp3_activate( GtkMenuItem *menuitem, gpointer user_data )
+{
+	gint	Choice = GPOINTER_TO_INT(user_data);
+	gint	Debit = Detail_VarOptionsFileOggMp3->Mp3_Debit;
+	gint	Mode = Detail_VarOptionsFileOggMp3->Mp3_Mode;
+	
+	if( -1 == Choice ) {
+		// g_print( "REMOVE\n");
+		Debit = Detail_VarOptionsFileOggMp3->Mp3_Debit = -1;	// SET DEBIT
+		Mode = Detail_VarOptionsFileOggMp3->Mp3_Mode = -1;	// SET MODE
+		FileMp3Ogg_update_newbitrate( FILE_IS_MP3, Debit, Mode, -1 );
+		return;
+	}
+	
+	// MP3: DEBIT MODE
+	if( Choice <= 59 )
+		Debit = Detail_VarOptionsFileOggMp3->Mp3_Debit = Choice;	// SET DEBIT
+	else	Mode = Detail_VarOptionsFileOggMp3->Mp3_Mode = Choice;	// SET MODE
+	
+	// SELECTIONS DES DEUX OPTIONS OBLIGATOIRE
+	if( -1 == Detail_VarOptionsFileOggMp3->Mp3_Debit )	Debit = Detail_VarOptionsFileOggMp3->Mp3_Debit = 0;
+	if( -1 == Detail_VarOptionsFileOggMp3->Mp3_Mode )	Mode = Detail_VarOptionsFileOggMp3->Mp3_Mode = 60;
+	
+	Detail_VarOptionsFileOggMp3->BoolChanged = ( -1 != Detail_VarOptionsFileOggMp3->Mp3_Debit || -1 != Detail_VarOptionsFileOggMp3->Mp3_Mode );
+		
+	FileMp3Ogg_update_newbitrate( FILE_IS_MP3, Debit, Mode, -1 );
+}
+// 
+// 
+void popup_file_mp3_type( DETAIL *detail, gint p_debit, gint p_mode )
+{
+	GtkWidget	*Menu;
+	GtkWidget	*Type;
+	GtkWidget	*SubMenu;
+	GtkWidget	*Debit;
+	GtkWidget	*Separate;
+	gint		Cpt;
+	gchar		*Str = NULL;
+	
+	Detail_VarOptionsFileOggMp3 = detail;
+	
+	Menu = gtk_menu_new( );
+	// gtk_widget_set_extension_events( Menu, GDK_EXTENSION_EVENTS_ALL );
+	
+	// ABR
+	Type = gtk_menu_item_new_with_mnemonic( "Abr" );
+	gtk_widget_show( Type );
+	gtk_container_add( GTK_CONTAINER( Menu), Type );
+		
+		// SUBMENU ABR
+		SubMenu = gtk_menu_new();
+		gtk_menu_item_set_submenu( GTK_MENU_ITEM(Type), SubMenu );
+		for( Cpt = 0; Cpt <= 13; Cpt ++ ) {
+			if( p_debit == Cpt )
+				Str = g_strdup_printf( ">%s", VarOptionsFileMp3[ Cpt ] );
+			else	Str = g_strdup_printf( " %s", VarOptionsFileMp3[ Cpt ] );
+			Debit = gtk_menu_item_new_with_mnemonic( Str );
+			g_free( Str );
+			Str = NULL;
+			gtk_widget_show( Debit );
+			gtk_container_add( GTK_CONTAINER(SubMenu), Debit );
+			g_signal_connect( (gpointer)Debit, "activate", G_CALLBACK(on_type_file_mp3_activate), GINT_TO_POINTER(Cpt));
+		}
+	
+	// CBR
+	Type = gtk_menu_item_new_with_mnemonic( "Cbr" );
+	gtk_widget_show( Type );
+	gtk_container_add( GTK_CONTAINER( Menu), Type );
+		
+		// SUBMENU CBR
+		SubMenu = gtk_menu_new();
+		gtk_menu_item_set_submenu( GTK_MENU_ITEM(Type), SubMenu );
+		for( Cpt = 14; Cpt <= 28; Cpt ++ ) {
+			if( p_debit == Cpt )
+				Str = g_strdup_printf( ">%s", VarOptionsFileMp3[ Cpt ] );
+			else	Str = g_strdup_printf( " %s", VarOptionsFileMp3[ Cpt ] );
+			Debit = gtk_menu_item_new_with_mnemonic( Str );
+			g_free( Str );
+			Str = NULL;
+			gtk_widget_show( Debit );
+			gtk_container_add( GTK_CONTAINER(SubMenu), Debit );
+			g_signal_connect( (gpointer)Debit, "activate", G_CALLBACK(on_type_file_mp3_activate), GINT_TO_POINTER(Cpt));
+		}
+
+	// VBR
+	Type = gtk_menu_item_new_with_mnemonic( "Vbr" );
+	gtk_widget_show( Type );
+	gtk_container_add( GTK_CONTAINER( Menu), Type );	
+		
+		// SUBMENU VBR
+		SubMenu = gtk_menu_new();
+		gtk_menu_item_set_submenu( GTK_MENU_ITEM(Type), SubMenu );
+		for( Cpt = 29; Cpt <= 43; Cpt ++ ) {
+			if( p_debit == Cpt )
+				Str = g_strdup_printf( ">%s", VarOptionsFileMp3[ Cpt ] );
+			else	Str = g_strdup_printf( " %s", VarOptionsFileMp3[ Cpt ] );
+			Debit = gtk_menu_item_new_with_mnemonic( Str );
+			g_free( Str );
+			Str = NULL;
+			gtk_widget_show( Debit );
+			gtk_container_add( GTK_CONTAINER(SubMenu), Debit );
+			g_signal_connect( (gpointer)Debit, "activate", G_CALLBACK(on_type_file_mp3_activate), GINT_TO_POINTER(Cpt));
+		}
+	
+	// VBR-NEW
+	Type = gtk_menu_item_new_with_mnemonic( "Vbr New" );
+	gtk_widget_show( Type );
+	gtk_container_add( GTK_CONTAINER( Menu), Type );
+		
+		// SUBMENU VBR-NEW
+		SubMenu = gtk_menu_new();
+		gtk_menu_item_set_submenu( GTK_MENU_ITEM(Type), SubMenu );
+		for( Cpt = 44; Cpt <= 59; Cpt ++ ) {
+			if( p_debit == Cpt )
+				Str = g_strdup_printf( ">%s", VarOptionsFileMp3[ Cpt ] );
+			else	Str = g_strdup_printf( " %s", VarOptionsFileMp3[ Cpt ] );
+			Debit = gtk_menu_item_new_with_mnemonic( Str );
+			g_free( Str );
+			Str = NULL;
+			gtk_widget_show( Debit );
+			gtk_container_add( GTK_CONTAINER(SubMenu), Debit );
+			g_signal_connect( (gpointer)Debit, "activate", G_CALLBACK(on_type_file_mp3_activate), GINT_TO_POINTER(Cpt));
+		}
+	
+	// MODE
+	Type = gtk_menu_item_new_with_mnemonic( "Mode" );
+	gtk_widget_show( Type );
+	gtk_container_add( GTK_CONTAINER( Menu), Type );
+		
+		// SUBMENU MODE
+		SubMenu = gtk_menu_new();
+		gtk_menu_item_set_submenu( GTK_MENU_ITEM(Type), SubMenu );
+		for( Cpt = 60; Cpt <= 65; Cpt ++ ) {
+			if( p_mode == Cpt )
+				Str = g_strdup_printf( "> %s", VarOptionsFileMp3[ Cpt ] );
+			else	Str = g_strdup_printf( " %s", VarOptionsFileMp3[ Cpt ] );
+			Debit = gtk_menu_item_new_with_mnemonic( Str );
+			g_free( Str );
+			Str = NULL;
+			gtk_widget_show( Debit );
+			gtk_container_add( GTK_CONTAINER(SubMenu), Debit );
+			g_signal_connect( (gpointer)Debit, "activate", G_CALLBACK(on_type_file_mp3_activate), GINT_TO_POINTER(Cpt));
+		}
+		
+	// REMOVE ENTRY
+	if( p_debit > -1 ) {
+		Separate = gtk_separator_menu_item_new( );
+		gtk_widget_show( Separate );
+		gtk_container_add( GTK_CONTAINER( Menu), Separate );
+		Separate = gtk_menu_item_new_with_mnemonic( "Effacer la saisie" );
+		gtk_widget_show( Separate );
+		gtk_container_add( GTK_CONTAINER(Menu), Separate );	
+		g_signal_connect( (gpointer)Separate, "activate", G_CALLBACK(on_type_file_mp3_activate), GINT_TO_POINTER(-1));
+	}
+	GLADE_HOOKUP_OBJECT_NO_REF( Menu, Menu, "Menu" );
+	
+	gtk_menu_popup( GTK_MENU(Menu), NULL, NULL, NULL, NULL, 3, 0 );
+}
+
+
+
+// 
+// POPUP OGG FILES
+// 
+/*
+DEBIT:		45 kbit/s / 64 kbit/s / 80 kbit/s / 96 kbit/s / 112 kbit/s / 128 kbit/s / 160 kbit/s / 192 kbit/s / 224 kbit/s / 256 kbit/s / 320 kbit/s / 
+		Qualite -1 -Moins bonne qualite / Qualite 0 / Qualite 1 / Qualite 2 / Qualite 3 -Defaut / Qualite 4 / Qualite 5 / Qualite 6 / Qualite 7 / Qualite 8 / Qualite 9 / Qualite 10 -Meilleure qualite
+MANAGED:	Oui / Non
+DOWNMIX:	Mono force / Stereo
+*/
+gchar *VarOptionsFileOgg[] = {
+	// 0 .. 22
+	" 45 kbit/s", " 64 kbit/s", " 80 kbit/s", " 96 kbit/s", "112 kbit/s", "128 kbit/s", "160 kbit/", "192 kbit/s", "224 kbit/s", "256 kbit/s", "320 kbit/s",
+	gettext_noop("Quality -1 [ Lower quality ]"), gettext_noop("Quality 0"), gettext_noop("Quality 1"), gettext_noop("Quality 2"),
+	gettext_noop("Quality 3 [ Defaut ]"), gettext_noop("Quality 4"), gettext_noop("Quality 5"), gettext_noop("Quality 6"), gettext_noop("Quality 7"),
+	gettext_noop("Quality 8"), gettext_noop("Quality 9"), gettext_noop("Quality 10 [ Best Quality ]"),
+	// 23 .. 24
+	gettext_noop("Yes"), gettext_noop("No"),
+	// 25 .. 26
+	"Mono force", "Stereo"
+};
+
+// 
+// 
+void on_type_file_ogg_activate( GtkMenuItem *menuitem, gpointer user_data )
+{
+	gint	Choice = GPOINTER_TO_INT(user_data);
+	gint	Debit = Detail_VarOptionsFileOggMp3->Ogg_Debit;
+	gint	Managed = Detail_VarOptionsFileOggMp3->Ogg_Managed;
+	gint	Downmix = Detail_VarOptionsFileOggMp3->Ogg_Downmix;
+	
+	if( -1 == Choice ) {
+		// g_print( "REMOVE\n");
+		Debit = Detail_VarOptionsFileOggMp3->Ogg_Debit = -1;	// SET DEBIT
+		Managed = Detail_VarOptionsFileOggMp3->Ogg_Managed = -1;	// SET MANAGED
+		Downmix = Detail_VarOptionsFileOggMp3->Ogg_Downmix = -1;	// SET DOWNMIX
+		FileMp3Ogg_update_newbitrate( FILE_IS_OGG, Debit, Managed, Downmix );
+		return;
+	}
+	
+	// OGG: DEBIT MANAGED DOWNMIX
+	if( Choice <= 22 )
+		Debit = Detail_VarOptionsFileOggMp3->Ogg_Debit = Choice;	// SET DEBIT
+	else if( Choice <= 24)
+		Managed = Detail_VarOptionsFileOggMp3->Ogg_Managed = Choice;	// SET MANAGED
+	else
+		Downmix = Detail_VarOptionsFileOggMp3->Ogg_Downmix = Choice;	// SET DOWNMIX
+	
+	// SELECTIONS DES DEUX OPTIONS OBLIGATOIRE
+	if( -1 == Detail_VarOptionsFileOggMp3->Ogg_Debit )	Debit = Detail_VarOptionsFileOggMp3->Ogg_Debit = 0;
+	if( -1 == Detail_VarOptionsFileOggMp3->Ogg_Managed )	Managed = Detail_VarOptionsFileOggMp3->Ogg_Managed = 23;
+	if( -1 == Detail_VarOptionsFileOggMp3->Ogg_Downmix )	Downmix = Detail_VarOptionsFileOggMp3->Ogg_Downmix = 25;
+	
+	if( Detail_VarOptionsFileOggMp3->Ogg_Debit >= 11 )	Managed = Detail_VarOptionsFileOggMp3->Ogg_Managed = -1;
+	if( Detail_VarOptionsFileOggMp3->Ogg_Debit >= 9 )	Downmix = Detail_VarOptionsFileOggMp3->Ogg_Downmix = -1;
+	
+	Detail_VarOptionsFileOggMp3->BoolChanged = ( -1 != Detail_VarOptionsFileOggMp3->Ogg_Debit || -1 != Detail_VarOptionsFileOggMp3->Ogg_Managed || -1 != Detail_VarOptionsFileOggMp3->Ogg_Downmix );
+	
+	FileMp3Ogg_update_newbitrate( FILE_IS_OGG, Debit, Managed, Downmix );
+}
+// 
+// 
+void popup_file_ogg_type( DETAIL *detail, gint p_debit, gint p_managed, gint p_downmix )
+{
+	GtkWidget	*Menu;
+	GtkWidget	*Debit;
+	GtkWidget	*SubMenu;
+	GtkWidget	*Separate;
+	gint		Cpt;
+	gchar		*Str = NULL;
+	
+	Detail_VarOptionsFileOggMp3 = detail;
+	
+	Menu = gtk_menu_new( );
+	// gtk_widget_set_extension_events( Menu, GDK_EXTENSION_EVENTS_ALL );
+	
+	// DEBIT
+	Debit = gtk_menu_item_new_with_mnemonic( "Debit" );
+	gtk_widget_show( Debit );
+	gtk_container_add( GTK_CONTAINER( Menu), Debit );
+		
+		// SUBMENU DEBIT
+		SubMenu = gtk_menu_new();
+		gtk_menu_item_set_submenu( GTK_MENU_ITEM(Debit), SubMenu );
+		for( Cpt = 0; Cpt <= 22; Cpt ++ ) {
+			if( p_debit == Cpt )
+				Str = g_strdup_printf( ">%s", VarOptionsFileOgg[ Cpt ] );
+			else	Str = g_strdup_printf( " %s", VarOptionsFileOgg[ Cpt ] );
+			Debit = gtk_menu_item_new_with_mnemonic( Str );
+			g_free( Str );
+			Str = NULL;
+			gtk_widget_show( Debit );
+			gtk_container_add( GTK_CONTAINER(SubMenu), Debit );
+			g_signal_connect( (gpointer)Debit, "activate", G_CALLBACK(on_type_file_ogg_activate), GINT_TO_POINTER(Cpt));
+		}
+	
+	// MANAGED
+	if( p_debit < 11 ) {
+		Debit = gtk_menu_item_new_with_mnemonic( "Managed" );
+		gtk_widget_show( Debit );
+		gtk_container_add( GTK_CONTAINER( Menu), Debit );
+		
+			// SUBMENU MANAGED
+			SubMenu = gtk_menu_new();
+			gtk_menu_item_set_submenu( GTK_MENU_ITEM(Debit), SubMenu );
+			for( Cpt = 23; Cpt <= 24; Cpt ++ ) {
+				if( p_managed == Cpt )
+					Str = g_strdup_printf( ">%s", VarOptionsFileOgg[ Cpt ] );
+				else	Str = g_strdup_printf( " %s", VarOptionsFileOgg[ Cpt ] );
+				Debit = gtk_menu_item_new_with_mnemonic( Str );
+				g_free( Str );
+				Str = NULL;
+				gtk_widget_show( Debit );
+				gtk_container_add( GTK_CONTAINER(SubMenu), Debit );
+				g_signal_connect( (gpointer)Debit, "activate", G_CALLBACK(on_type_file_ogg_activate), GINT_TO_POINTER(Cpt));
+			}
+	}
+	
+	// DOWNMIX
+	if( p_debit < 9 ) {
+		Debit = gtk_menu_item_new_with_mnemonic( "Downmix" );
+		gtk_widget_show( Debit );
+		gtk_container_add( GTK_CONTAINER( Menu), Debit );
+		
+			// SUBMENU DOWNMIX
+			SubMenu = gtk_menu_new();
+			gtk_menu_item_set_submenu( GTK_MENU_ITEM(Debit), SubMenu );
+			for( Cpt = 25; Cpt <= 26; Cpt ++ ) {
+				if( p_downmix == Cpt )
+					Str = g_strdup_printf( ">%s", VarOptionsFileOgg[ Cpt ] );
+				else	Str = g_strdup_printf( " %s", VarOptionsFileOgg[ Cpt ] );
+				Debit = gtk_menu_item_new_with_mnemonic( Str );
+				g_free( Str );
+				Str = NULL;
+				gtk_widget_show( Debit );
+				gtk_container_add( GTK_CONTAINER(SubMenu), Debit );
+				g_signal_connect( (gpointer)Debit, "activate", G_CALLBACK(on_type_file_ogg_activate), GINT_TO_POINTER(Cpt));
+			}
+	}
+	
+	// REMOVE ENTRY
+	if( p_debit > -1 ) {
+		Separate = gtk_separator_menu_item_new( );
+		gtk_widget_show( Separate );
+		gtk_container_add( GTK_CONTAINER( Menu), Separate );
+		Separate = gtk_menu_item_new_with_mnemonic( "Effacer la saisie" );
+		gtk_widget_show( Separate );
+		gtk_container_add( GTK_CONTAINER(Menu), Separate );	
+		g_signal_connect( (gpointer)Separate, "activate", G_CALLBACK(on_type_file_ogg_activate), GINT_TO_POINTER(-1));
+	}
+	GLADE_HOOKUP_OBJECT_NO_REF( Menu, Menu, "Menu" );
+	
+	gtk_menu_popup( GTK_MENU(Menu), NULL, NULL, NULL, NULL, 3, 0 );
+}
+// 
+// 
+gchar *popup_get_param_ogg( gint p_debit, gint p_managed, gint p_downmix )
+{
+	gchar *val_bitrate_ogg[] = {
+		"--bitrate=45",
+		"--bitrate=64",
+		"--bitrate=80",
+		"--bitrate=96",
+		"--bitrate=112",
+		"--bitrate=128",
+		"--bitrate=160",
+		"--bitrate=192",
+		"--bitrate=224",
+		"--bitrate=256",
+		"--bitrate=320",
+		"--quality=-1",
+		"--quality=0",
+		"--quality=1",
+		"--quality=2",
+		"--quality=3",
+		"--quality=4",
+		"--quality=5",
+		"--quality=6",
+		"--quality=7",
+		"--quality=8",
+		"--quality=9",
+		"--quality=10"
+		};
+	gchar	*StrRet = NULL;
+	
+	if( p_debit > -1 ) {
+		StrRet = g_strdup_printf( "%s%s%s",
+				val_bitrate_ogg[ p_debit ], 
+				( p_debit < 11 && p_managed == 23 ) ? " --managed" : "",
+				( p_debit < 9 && p_downmix == 25 ) ? " --downmix" : ""
+				);
+	}
+	return( (gchar *)StrRet );
+}
+// 
+// 
+gchar *popup_get_param_mp3( gint p_debit, gint p_mode )
+{
+	static 	gchar *str_param_mp3 [] = {
+		// ABR
+		// 0 .. 13
+		"-b 32",
+		"-b 40",
+		"-b 48",
+		"-b 56",
+		"-b 64",
+		"-b 80",
+		"-b 96",
+		"-b 112",
+		"-b 128",
+		"-b 160",
+		"-b 192",
+		"-b 224",
+		"-b 256",
+		"-b 320",
+		// CBR
+		// 14 .. 28
+		"-b 32",
+		"-b 40",
+		"-b 48",
+		"-b 56",
+		"-b 64",
+		"-b 80",
+		"-b 96",
+		"-b 112",
+		"-b 128",
+		"-b 160",
+		"-b 192",
+		"-b 224",
+		"-b 256",
+		"-b 320",
+		"--preset insane",
+		// VBR
+		// 29 .. 43
+		"--preset medium",
+		"--preset standard",
+		"--preset extreme",
+		"--preset fast standard",
+		"--preset fast extreme",
+		"-V0",
+		"-V1",
+		"-V2",
+		"-V3",
+		"-V4",
+		"-V5",
+		"-V6",
+		"-V7",
+		"-V8",
+		"-V9",
+		// VBR-NEW
+		// 44 .. 59
+		"--vbr-new",
+		"--vbr-new --preset medium",
+		"--vbr-new --preset standard",
+		"--vbr-new --preset extreme",
+		"--vbr-new --preset fast standard",
+		"--vbr-new --preset fast extreme",
+		"--vbr-new -V0",
+		"--vbr-new -V1",
+		"--vbr-new -V2",
+		"--vbr-new -V3",
+		"--vbr-new -V4",
+		"--vbr-new -V5",
+		"--vbr-new -V6",
+		"--vbr-new -V7",
+		"--vbr-new -V8",
+		"--vbr-new -V9",
+		// MODE
+		// 60 .. 65
+		"",		// Defaut
+		"-m s",		// Stereo
+		"-m j",		// Join Stereo
+		"-m f",		// Forced Join Stereo
+		"-m d",		// Duo Channels
+		"-m m"		// Mono
+		};
+	gchar	*StrRet = NULL;
+	
+	if( p_debit > -1) {
+		StrRet = g_strdup_printf( "%s%s%s",
+				str_param_mp3[ p_debit ],
+				( p_mode == 60 ) ? "" : " ",
+				( p_mode > 60 ) ? str_param_mp3[ p_mode ] : ""
+				);
+	}
+	return( (gchar *)StrRet );
+}

xcfa-4.2.8.tar.gz/src/popup.h -> xcfa-5.0.2.tar.gz/src/popup.h Changed

@@ -1,9 +1,9 @@
  /*
  *  file      : popup.h
  *  project   : xcfa
- *  with      : Gtk-2
+ *  with      : Gtk-3
  *
- *  copyright : (C) 2003 - 2012 by Claude Bulin
+ *  copyright : (C) 2003 - 2015 by Claude Bulin
  *
  *  xcfa - GTK+ implementation of the GNU shell command
  *  GNU General Public License
@@ -49,16 +49,32 @@
 void	popup_normalise_cd (void);
 void	popup_normalise_dvd (void);
 
+
+
 typedef struct {
 	gboolean	BoolFromPopup;
 	gint		num;
 	gchar		*name;
 } CD_POPUP_GENRE;
 extern CD_POPUP_GENRE CdPopupGenre ;
-
 void	popup_menu_cd( void );
 
 
+typedef struct {
+	gboolean	BoolFromPopup;
+	gint		num;
+	gchar		*name;
+} FILE_POPUP_GENRE;
+extern FILE_POPUP_GENRE FilePopupGenre ;
+void 	popup_menu_file( void );
+
+
+
+void	popup_file_mp3_type( DETAIL *detail, gint p_debit, gint p_mode );
+void	popup_file_ogg_type( DETAIL *detail, gint p_debit, gint p_managed, gint p_downmix );
+gchar	*popup_get_param_ogg( gint p_debit, gint p_managed, gint p_downmix );
+gchar	*popup_get_param_mp3( gint p_debit, gint p_mode );
+
 #endif

xcfa-4.2.8.tar.gz/src/prg_init.c -> xcfa-5.0.2.tar.gz/src/prg_init.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : prg_init.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -28,11 +28,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define gettext_noop(x) (x)
-#endif
-
 #include <gtk/gtk.h>
 #include <string.h>
 
@@ -359,37 +354,37 @@
 	
 	if (libutils_find_file ("apt-get") == TRUE || libutils_find_file ("aptitude") == TRUE) {
 		if (widget != NULL) {
-			New_Str = g_strdup_printf (_(" ... les paquets: deb "));
+			New_Str = g_strdup_printf (_(" ... Packets: deb "));
 		}
 		var_options.Type_Package = _DEBIAN_;
 	}
 	else if (libutils_find_file ("slackpkg") == TRUE || libutils_find_file ("installpkg") == TRUE) {
 		if (widget != NULL) {
-			New_Str = g_strdup_printf (_(" ... les paquets: tgz "));
+			New_Str = g_strdup_printf (_(" ... Packets: tgz "));
 		}
 		var_options.Type_Package = _TGZ_;
 	}
 	else if (libutils_find_file ("pacman-g2") == TRUE) {
 		if (widget != NULL) {
-			New_Str = g_strdup_printf (_(" ... les paquets: fpm "));
+			New_Str = g_strdup_printf (_(" ... Packets: fpm "));
 		}
 		var_options.Type_Package = _FPM_;
 	}
 	else if (libutils_find_file ("rpm") == TRUE || libutils_find_file ("urpmi") == TRUE || libutils_find_file ("zypper") == TRUE || libutils_find_file ("yum") == TRUE) {
 		if (widget != NULL) {
-			New_Str = g_strdup_printf (_(" ... les paquets: rpm "));
+			New_Str = g_strdup_printf (_(" ... Packets: rpm "));
 		}
 		var_options.Type_Package = _RPM_;
 	}
 	else if (libutils_find_file ("yaourt") == TRUE || libutils_find_file ("pacman") == TRUE) {
 		if (widget != NULL) {
-			New_Str = g_strdup_printf (_(" ... les paquets: pkg.tar.xz "));
+			New_Str = g_strdup_printf (_(" ... Packets: pkg.tar.xz "));
 		}
 		var_options.Type_Package = _ARCHLINUX_;
 	}
 	else {
 		if (widget != NULL) {
-			New_Str = g_strdup_printf (_(" ... les paquets: ? "));
+			New_Str = g_strdup_printf (_(" ... Packets: ? "));
 		}
 		var_options.Type_Package = _PACKAGE_NOT_FOUND_;
 	}
@@ -611,7 +606,7 @@
 	// PRGEXT_NAME
 	renderer = gtk_cell_renderer_text_new ();
 	g_object_set (renderer, "xalign", 0.0, NULL);
-	column = gtk_tree_view_column_new_with_attributes (_("Nom"),
+	column = gtk_tree_view_column_new_with_attributes (_("Name"),
 						 renderer,
 						 "markup", PRGEXT_NAME,
 						 NULL);
@@ -639,7 +634,7 @@
 	renderer = gtk_cell_renderer_text_new ();
 	g_object_set (renderer, "xalign", 0.0, NULL);
 	column = gtk_tree_view_column_new_with_attributes (
-							_("Paquet"),
+							_("Packets"),
 							renderer,
 							"markup", PRGEXT_PAQUAGE,
 							NULL);
@@ -686,7 +681,7 @@
 				 );
 	var_prgextern.Adr_Tree_Model = model = GTK_TREE_MODEL (store);
 	treeview = gtk_tree_view_new_with_model (model);
-	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
+	// gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
 	g_object_unref (model);
 	gtk_container_add (GTK_CONTAINER (widget), treeview);
 	prginit_add_columns (GTK_TREE_VIEW (treeview));

xcfa-4.2.8.tar.gz/src/prg_init.h -> xcfa-5.0.2.tar.gz/src/prg_init.h Changed

@@ -1,9 +1,9 @@
  /*
  *  file      : prg_init.h
  *  project   : xcfa
- *  with      : Gtk-2
+ *  with      : Gtk-3
  *
- *  copyright : (C) 2003 - 2012 by Claude Bulin
+ *  copyright : (C) 2003 - 2015 by Claude Bulin
  *
  *  xcfa - GTK+ implementation of the GNU shell command
  *  GNU General Public License
@@ -34,78 +34,78 @@
 	GtkListStore      *Adr_List_Store;			// 
 	GtkTreeModel      *Adr_Tree_Model;			// 
 	GtkWidget         *Adr_scroll;				// 
-	GtkTreeSelection  *Adr_Line_Selected;			// 
-	gboolean           Bool_Goto_Page_Options;		// 
+	GtkTreeSelection  *Adr_Line_Selected;		// 
+	gboolean           Bool_Goto_Page_Options;	// 
 	GdkPixbuf         *Pixbuf_Ok;				// 
 	GdkPixbuf         *Pixbuf_Not_Ok;			// 
 } VAR_PRGEXTERN;
 
 typedef enum {
-	NMR_a52dec = 0,						// 
-	NMR_aacplusenc,						// 
-	NMR_cdparanoia,						// 
-	NMR_cd_discid,						// 
-	NMR_checkmp3,						// 
-	NMR_faac,						// 
-	NMR_faad,						// 
-	NMR_flac,						// 
-	NMR_icedax,						// 
-	NMR_lame,						// 
-	NMR_lsdvd,						// 
-	NMR_mac,						// 
-	NMR_musepack_tools_mppdec,				// 
-	NMR_musepack_tools_mppenc,				// 
-	NMR_mplayer,						// 
-	NMR_mp3gain,						// 
-	NMR_normalize,						// 
-	NMR_libnotify_bin,					// 
-	NMR_shorten,						// 
-	NMR_shntool,						// 
-	NMR_sox,						// 
-	NMR_vorbis_tools_oggenc,				// 
-	NMR_vorbisgain,						// 
-	NMR_wavpack,						// 
-	NMR_MAX_TABLEAU						// 
+	NMR_a52dec = 0,								// 
+	NMR_aacplusenc,								// 
+	NMR_cdparanoia,								// 
+	NMR_cd_discid,								// 
+	NMR_checkmp3,								// 
+	NMR_faac,									// 
+	NMR_faad,									// 
+	NMR_flac,									// 
+	NMR_icedax,									// 
+	NMR_lame,									// 
+	NMR_lsdvd,									// 
+	NMR_mac,									// 
+	NMR_musepack_tools_mppdec,					// 
+	NMR_musepack_tools_mppenc,					// 
+	NMR_mplayer,								// 
+	NMR_mp3gain,								// 
+	NMR_normalize,								// 
+	NMR_libnotify_bin,							// 
+	NMR_shorten,								// 
+	NMR_shntool,								// 
+	NMR_sox,									// 
+	NMR_vorbis_tools_oggenc,					// 
+	NMR_vorbisgain,								// 
+	NMR_wavpack,								// 
+	NMR_MAX_TABLEAU								// 
 } TYPE_PROGINIT;
 
 typedef struct {
-	gchar		*PackageDebian64;			// PACKAGEDEBIAN_64
-	gchar		*PackageDebian32;			// PACKAGEDEBIAN_32
-	gchar		*Name1;					// NAME1
-	gchar		*Name2;					// NAME2
-	gchar		*Name3;					// NAME3
-	gboolean	*BoolFound;				// FOUND
-	gchar		*PtrName;				// NAME TREE-VIEW : pointeur sur Name1 | Name2 | Name3
-	GdkPixbuf	*Pixbuf;				// PIXBUF TREE-VIEW
-	gchar		*Paquage;				// PAQUAGE
-	gchar		*Description;				// DESCRIPTION TREE-VIEW
+	gchar		*PackageDebian64;				// PACKAGEDEBIAN_64
+	gchar		*PackageDebian32;				// PACKAGEDEBIAN_32
+	gchar		*Name1;							// NAME1
+	gchar		*Name2;							// NAME2
+	gchar		*Name3;							// NAME3
+	gboolean	*BoolFound;						// FOUND
+	gchar		*PtrName;						// NAME TREE-VIEW : pointeur sur Name1 | Name2 | Name3
+	GdkPixbuf	*Pixbuf;						// PIXBUF TREE-VIEW
+	gchar		*Paquage;						// PAQUAGE
+	gchar		*Description;					// DESCRIPTION TREE-VIEW
 } TABLEAU_PRG_EXTERN;
 
 typedef struct {
-	gboolean	bool_a52dec;				// 
-	gboolean	bool_notify_send;			// 
-	gboolean	bool_ape;				// 
-	gboolean	bool_mpc123_mppdec;			// 
-	gboolean	bool_mppenc;				// 
-	gboolean	bool_cdparanoia;			// 
-	gboolean	bool_cdda2wav;				// 
-	gboolean	bool_lame;				// 
-	gboolean	bool_oggenc;				// 
-	gboolean	bool_sox;				// 
-	gboolean	bool_normalize;				// 
-	gboolean	bool_checkmp3;				// 
-	gboolean	bool_faad;				// 
-	gboolean	bool_faac;				// 
-	gboolean	bool_mplayer;				// 
-	gboolean	bool_shorten;				// 
-	gboolean	bool_lsdvd;				// 
-	gboolean	bool_vorbisgain;			// 
-	gboolean	bool_flac;				// 
-	gboolean	bool_mp3gain;				// 
-	gboolean	bool_wavpack;				// 
-	gboolean	bool_shntool;				// 
-	gboolean	bool_aacplusenc;			// 
-	gboolean	bool_cd_discid;				// 
+	gboolean	bool_a52dec;					// 
+	gboolean	bool_notify_send;				// 
+	gboolean	bool_ape;						// 
+	gboolean	bool_mpc123_mppdec;				// 
+	gboolean	bool_mppenc;					// 
+	gboolean	bool_cdparanoia;				// 
+	gboolean	bool_cdda2wav;					// 
+	gboolean	bool_lame;						// 
+	gboolean	bool_oggenc;					// 
+	gboolean	bool_sox;						// 
+	gboolean	bool_normalize;					// 
+	gboolean	bool_checkmp3;					// 
+	gboolean	bool_faad;						// 
+	gboolean	bool_faac;						// 
+	gboolean	bool_mplayer;					// 
+	gboolean	bool_shorten;					// 
+	gboolean	bool_lsdvd;						// 
+	gboolean	bool_vorbisgain;				// 
+	gboolean	bool_flac;						// 
+	gboolean	bool_mp3gain;					// 
+	gboolean	bool_wavpack;					// 
+	gboolean	bool_shntool;					// 
+	gboolean	bool_aacplusenc;				// 
+	gboolean	bool_cd_discid;					// 
 
 } PRGINIT;

xcfa-4.2.8.tar.gz/src/proc.c -> xcfa-5.0.2.tar.gz/src/proc.c Changed

xcfa-4.2.8.tar.gz/src/proc.h -> xcfa-5.0.2.tar.gz/src/proc.h Changed

xcfa-4.2.8.tar.gz/src/replaygain.c -> xcfa-5.0.2.tar.gz/src/replaygain.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : replaygain.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <string.h>
@@ -114,59 +109,61 @@
 	ETAT_REPLAYGAIN *PtrReplayGain = NULL;
 	gboolean BoolList = FALSE;
 	gint		 pos;
+	gchar		**PtrTabArgs = NULL;
 	
 	if( TRUE == rpg.bool_thread_end) return;
 	
 	rpg.MessUser [ 0 ] = '\0';
 	
 	// Entete global
-	pos = filelc_get_command_line_nice ( );
+	PtrTabArgs = filelc_AllocTabArgs();
+	pos = 3;
 	
 	// Entetes particuliers
 	switch (rpg_type ) {
 	case MP3GAIN :
-		conv.ArgConv [ pos++ ] = g_strdup ("mp3gain" );
+		PtrTabArgs [ pos++ ] = g_strdup ("mp3gain" );
 		strcat( rpg.MessUser, "MP3, mp3gain" );
 		switch (rpg_action ) {
 		case RPG_NONE :
 		case RPG_ATTENTE :
 			break;
 		case RPG_EFFACER :
-			conv.ArgConv [ pos++ ] = g_strdup ("-s" );
-			conv.ArgConv [ pos++ ] = g_strdup ("d" );
+			PtrTabArgs [ pos++ ] = g_strdup ("-s" );
+			PtrTabArgs [ pos++ ] = g_strdup ("d" );
 			strcat( rpg.MessUser, ", EFFACER" );
 			break;
 		case RPG_ALBUM :
-			conv.ArgConv [ pos++ ] = g_strdup ("-a" );
-			conv.ArgConv [ pos++ ] = g_strdup ("-p" );
-			conv.ArgConv [ pos++ ] = g_strdup ("-c" );
-			conv.ArgConv [ pos++ ] = g_strdup ("-f" );
-			conv.ArgConv [ pos++ ] = g_strdup ("-T" );
+			PtrTabArgs [ pos++ ] = g_strdup ("-a" );
+			PtrTabArgs [ pos++ ] = g_strdup ("-p" );
+			PtrTabArgs [ pos++ ] = g_strdup ("-c" );
+			PtrTabArgs [ pos++ ] = g_strdup ("-f" );
+			PtrTabArgs [ pos++ ] = g_strdup ("-T" );
 			strcat( rpg.MessUser, ", ALBUM" );
 			break;
 		case RPG_PISTE :
-			conv.ArgConv [ pos++ ] = g_strdup ("-r" );
-			conv.ArgConv [ pos++ ] = g_strdup ("-p" );
-			conv.ArgConv [ pos++ ] = g_strdup ("-c" );
-			conv.ArgConv [ pos++ ] = g_strdup ("-f" );
-			conv.ArgConv [ pos++ ] = g_strdup ("-T" );
+			PtrTabArgs [ pos++ ] = g_strdup ("-r" );
+			PtrTabArgs [ pos++ ] = g_strdup ("-p" );
+			PtrTabArgs [ pos++ ] = g_strdup ("-c" );
+			PtrTabArgs [ pos++ ] = g_strdup ("-f" );
+			PtrTabArgs [ pos++ ] = g_strdup ("-T" );
 			strcat( rpg.MessUser, ", PISTE" );
 			break;
 		}
 		break;
 	case METAFLAC :
-		conv.ArgConv [ pos++ ] = g_strdup ("metaflac" );
+		PtrTabArgs [ pos++ ] = g_strdup ("metaflac" );
 		strcat( rpg.MessUser, "FLAC, metaflac" );
 		switch (rpg_action ) {
 		case RPG_NONE :
 		case RPG_ATTENTE :
 			break;
 		case RPG_EFFACER :
-			conv.ArgConv [ pos++ ] = g_strdup ("--remove-replay-gain" );
+			PtrTabArgs [ pos++ ] = g_strdup ("--remove-replay-gain" );
 			strcat( rpg.MessUser, ", EFFACER" );
 			break;
 		case RPG_ALBUM :
-			conv.ArgConv [ pos++ ] = g_strdup ("--add-replay-gain" );
+			PtrTabArgs [ pos++ ] = g_strdup ("--add-replay-gain" );
 			strcat( rpg.MessUser, ", ALBUM" );
 			break;
 		case RPG_PISTE :
@@ -175,18 +172,18 @@
 		}
 		break;
 	case WVGAIN :
-		conv.ArgConv [ pos++ ] = g_strdup ("wvgain" );
+		PtrTabArgs [ pos++ ] = g_strdup ("wvgain" );
 		strcat( rpg.MessUser, "WAVPACK, wvgain" );
 		switch (rpg_action ) {
 		case RPG_NONE :
 		case RPG_ATTENTE :
 			break;
 		case RPG_EFFACER :
-			conv.ArgConv [ pos++ ] = g_strdup ("-c" );
+			PtrTabArgs [ pos++ ] = g_strdup ("-c" );
 			strcat( rpg.MessUser, ", EFFACER" );
 			break;
 		case RPG_ALBUM :
-			conv.ArgConv [ pos++ ] = g_strdup ("-a" );
+			PtrTabArgs [ pos++ ] = g_strdup ("-a" );
 			strcat( rpg.MessUser, ", ALBUM" );
 			break;
 		case RPG_PISTE :
@@ -195,18 +192,18 @@
 		}
 		break;
 	case VORBISGAIN :
-		conv.ArgConv [ pos++ ] = g_strdup ("vorbisgain" );
+		PtrTabArgs [ pos++ ] = g_strdup ("vorbisgain" );
 		strcat( rpg.MessUser, "OGG, vorbisgain" );
 		switch (rpg_action ) {
 		case RPG_NONE :
 		case RPG_ATTENTE :
 			break;
 		case RPG_EFFACER :
-			conv.ArgConv [ pos++ ] = g_strdup ("-c" );
+			PtrTabArgs [ pos++ ] = g_strdup ("-c" );
 			strcat( rpg.MessUser, ", EFFACER" );
 			break;
 		case RPG_ALBUM :
-			conv.ArgConv [ pos++ ] = g_strdup ("-a" );
+			PtrTabArgs [ pos++ ] = g_strdup ("-a" );
 			strcat( rpg.MessUser, ", ALBUM" );
 			break;
 		case RPG_PISTE :
@@ -237,7 +234,7 @@
 					
 					BoolList = TRUE;
 					
-					conv.ArgConv [ pos++ ] = g_strdup (detail->namefile );
+					PtrTabArgs [ pos++ ] = g_strdup (detail->namefile );
 					
 					// Get pointer Etat Flag
 					ListEtat = g_list_append (ListEtat, &detail->Etat_ReplayGain );
@@ -250,7 +247,7 @@
 				else if( detail->type_infosong_file_is == FILE_IS_MP3 && rpg_type == MP3GAIN ) {
 				
 					BoolList = TRUE;
-					conv.ArgConv [ pos++ ] = g_strdup (detail->namefile );
+					PtrTabArgs [ pos++ ] = g_strdup (detail->namefile );
 					
 					// Get pointer Etat Flag
 					ListEtat = g_list_append (ListEtat, &detail->Etat_ReplayGain );
@@ -263,7 +260,7 @@
 				else if( detail->type_infosong_file_is == FILE_IS_FLAC && rpg_type == METAFLAC ) {
 					// PISTE -> NONE
 					BoolList = TRUE;
-					conv.ArgConv [ pos++ ] = g_strdup (detail->namefile );
+					PtrTabArgs [ pos++ ] = g_strdup (detail->namefile );
 					
 					// Get pointer Etat Flag
 					ListEtat = g_list_append (ListEtat, &detail->Etat_ReplayGain );
@@ -275,7 +272,7 @@
 				// WVGAIN
 				else if( detail->type_infosong_file_is == FILE_IS_WAVPACK && rpg_type == WVGAIN ) {
 					BoolList = TRUE;
-					conv.ArgConv [ pos++ ] = g_strdup (detail->namefile );
+					PtrTabArgs [ pos++ ] = g_strdup (detail->namefile );
 					
 					// Get pointer Etat Flag
 					ListEtat = g_list_append (ListEtat, &detail->Etat_ReplayGain );
@@ -295,9 +292,9 @@
 		// Appel au ReplayGain
 		rpg.bool_compteur = TRUE;
 		rpg.bool_etat = TRUE;
-		conv.ArgConv [ pos++ ] = NULL;
-		conv_to_convert (FALSE, REPLAYGAIN, rpg.MessUser );
-		filelc_get_command_line_remove ( );
+		PtrTabArgs [ pos++ ] = NULL;
+		conv_to_convert( PtrTabArgs, FALSE, REPLAYGAIN, rpg.MessUser );
+		PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 		
 		rpg.bool_compteur = FALSE;
 
@@ -371,7 +368,7 @@
 		} else if( rpg.type_replaygain == _APPLY_REPLAYGAIN_ ) {
 			fileaction_set_end (TYPE_REPLAYGAINAPPLY );
 		}
-		gtk_timeout_remove (rpg.handler_timeout );
+		g_source_remove (rpg.handler_timeout );
 	}
 	
 	return (TRUE );
@@ -481,9 +478,14 @@
 	}
 
 	conv_reset_struct( WindScan_close_request );
-	WindScan_open( "ReplayGain", WINDSCAN_PULSE );
+	// WindScan_open( "ReplayGain", WINDSCAN_PULSE );
+	wind_scan_init(
+		WindMain,
+		"ReplayGain",
+		WINDSCAN_PULSE 
+		);
 	WindScan_set_label( "ReplayGain ..." );
-	rpg.handler_timeout = gtk_timeout_add( 100, replaygain_timeout, 0 );
+	rpg.handler_timeout = g_timeout_add( 100, replaygain_timeout, 0 );
 	pthread_create( &rpg.nmr_tid, NULL ,(void *)replaygain_thread, (void *)NULL );
 }

xcfa-4.2.8.tar.gz/src/replaygain.h -> xcfa-5.0.2.tar.gz/src/replaygain.h Changed

xcfa-4.2.8.tar.gz/src/scan.c -> xcfa-5.0.2.tar.gz/src/scan.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : scan_cd.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -28,11 +28,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -85,11 +80,12 @@
 	gboolean tst;
 } Tsearchdrive;
 
-/* definition de tous les type de bus
-*/
+// definition de tous les type de bus
+// 
 Tsearchdrive listesearchdrives[] = {
-	/* 10 - LINUX_IDE : pure ide devices with linux
-	*/
+	/* 
+	 * 10 - LINUX_IDE : pure ide devices with linux
+	 */
 	{ IDE, "dev=/dev/hda", "/dev/hda", "hda", FALSE },
 	{ IDE, "dev=/dev/hdb", "/dev/hdb", "hdb", FALSE },
 	{ IDE, "dev=/dev/hdc", "/dev/hdc", "hdc", FALSE },
@@ -100,8 +96,9 @@
 	{ IDE, "dev=/dev/hdh", "/dev/hdh", "hdh", FALSE },
 	{ IDE, "dev=/dev/hdi", "/dev/hdi", "hdi", FALSE },
 	{ IDE, "dev=/dev/hdj", "/dev/hdj", "hdj", FALSE },
-	/* 28 - LINUX_SCSI : SCSI alias with linux
-	*/
+	/* 
+	 * 28 - LINUX_SCSI : SCSI alias with linux
+	 */
 	{ SCSI, "dev=/dev/scd0", "/dev/scd0", "scd0", FALSE },
 	{ SCSI, "dev=/dev/scd1", "/dev/scd1", "scd1", FALSE },
 	{ SCSI, "dev=/dev/scd2", "/dev/scd2", "scd2", FALSE },
@@ -130,8 +127,9 @@
 	{ SCSI, "dev=/dev/sge", "/dev/sge", "sge", FALSE },
 	{ SCSI, "dev=/dev/sgf", "/dev/sgf", "sgf", FALSE },
 	{ SCSI, "dev=/dev/sgg", "/dev/sgg", "sgg", FALSE },
-	/* The end of list
-	*/
+	/* 
+	 * The end of list
+	 */
 	{ _NONE_, NULL, NULL, NULL, FALSE}
 };
 
@@ -256,17 +254,18 @@
 	
 	/* test is 'dvd+rw-tools package' present ? */
 	if (libutils_find_file ("dvd+rw-mediainfo") == FALSE) {
-		wininfo_create (
-			_("PACKAGE dvd+rw-tools ABSENT"),
-			_("Le package 'dvd+rw-tools' est absent"),
+		wind_info_init (
+			WindMain,
+			_("PACKAGE dvd+rw-tools is missing"),
+			_("The package 'imagemagick' is missing"),
 			 "\n",
-			_("de votre systeme !"),
+			_("on your system !"),
 			 "\n\n",
-			_("Veuillez l'installer car j'ai besoin de"),
+			_("Please install it and resume"),
 			 "\n",
-			_("'dvd+rw-mediainfo' pour identifier le(s)"),
+			_("'Dvd + rw-mediainfo' to identify the"),
 			 "\n",
-			_("lecteur(s) de cd / dvd."),
+			_("reader of cd / dvd."),
 			 "");
 			return (NULL);
 	}
@@ -311,87 +310,91 @@
 		g_print ("\nAnalyse devices in : ");
 		g_print ("%s::%s(line=%d) \n", __FILE__, __FUNCTION__, __LINE__);
 	}
-	for (pass = 0, Lcurentry = listesearchdrives; Lcurentry->detectline; pass++, Lcurentry++) {
-
-		/* Entree en test ? */
-		if (Lcurentry->tst == FALSE) continue;
+	
+	if( TRUE == g_file_test( "/dev", G_FILE_TEST_IS_DIR )) {
+		for (pass = 0, Lcurentry = listesearchdrives; Lcurentry->detectline; pass++, Lcurentry++) {
 
-/* TODO
-* TODO : 'dvd+rw-mediainfo' FONCTIONNE T-IL AUSSI AVEC LES LECTEURS DE CD ?
-* TODO : IL FAUDRAIT AUSSI FAIRE UN TEST AVEC DES LECTEURS / GRAVEURS DE CD
-* TODO
-*/
-		gstr = GetInfo_mediainfo (Lcurentry->useline);
-		Lout = gstr->str;
-
-		if (*Lout) {
-			if ((Ptr = strstr (Lout, "INQUIRY:"))) {
-				/* sur mon ordi :
-				INQUIRY: [_NEC ][DVD_RW ND-3520A ][1.04]
-				INQUIRY: [_NEC ][DVD_RW ND-3520A ][3.05] -- Apres un flash bios
-				INQUIRY: [_NEC ][DVD_RW ND-3520A ][3.06] -- Apres un flash bios
-				INQUIRY: [DVDRW ][IDE 16X ][A07R]
-				INQUIRY: [DVDRW ][IDE 16X ][A190] -- Apres un flash bios
-				*/
-
-				/* remplacer tous les '[' et les ']' par ' ' */
-				if (strchr (Ptr, '[') && strchr (Ptr, ']')) {
-					Ptr = strchr (Ptr, '[');
-					i = 0;
-					while (*Ptr != '\n') str [ i++ ] = *Ptr++;
-					str [ i ] = '\0';
-					while ((Ptr = strchr (str, '['))) *Ptr = ' ';
-					while ((Ptr = strchr (str, ']'))) *Ptr = ' ';
-
-					/* supprimer les espaces de debut */
-					Ptr = str;
-					while (*Ptr == ' ') Ptr ++;
-					strcpy (str, Ptr);
-
-					/* supprimer les espaces de fin */
-					Ptr = str;
-					while (*Ptr) Ptr ++;
-					Ptr --;
-					while (*Ptr == ' ') Ptr --;
-					Ptr ++;
-					*Ptr = '\0';
-
-					/* supprimer les doubles espaces */
-					Ptr = str;
-					while (*Ptr) {
-						if ((*Ptr==' ') && (*(Ptr+1)==' ')) {
-							strcpy (Ptr, Ptr+1);
-							Ptr = str;
-							continue;
-						}
+			/* Entree en test ? */
+			if (Lcurentry->tst == FALSE) continue;
+			
+			if( FALSE == libutils_access_mode( Lcurentry->useline )) continue;
+			
+			/* TODO
+			* TODO : 'dvd+rw-mediainfo' FONCTIONNE T-IL AUSSI AVEC LES LECTEURS DE CD ?
+			* TODO : IL FAUDRAIT AUSSI FAIRE UN TEST AVEC DES LECTEURS / GRAVEURS DE CD
+			* TODO
+			*/		
+			gstr = GetInfo_mediainfo( Lcurentry->useline );
+			Lout = gstr->str;
+
+			if (*Lout) {
+				if ((Ptr = strstr (Lout, "INQUIRY:"))) {
+					/* sur mon ordi :
+					INQUIRY: [_NEC ][DVD_RW ND-3520A ][1.04]
+					INQUIRY: [_NEC ][DVD_RW ND-3520A ][3.05] -- Apres un flash bios
+					INQUIRY: [_NEC ][DVD_RW ND-3520A ][3.06] -- Apres un flash bios
+					INQUIRY: [DVDRW ][IDE 16X ][A07R]
+					INQUIRY: [DVDRW ][IDE 16X ][A190] -- Apres un flash bios
+					*/
+					/* remplacer tous les '[' et les ']' par ' ' */
+					if (strchr (Ptr, '[') && strchr (Ptr, ']')) {
+						Ptr = strchr (Ptr, '[');
+						i = 0;
+						while (*Ptr != '\n') str [ i++ ] = *Ptr++;
+						str [ i ] = '\0';
+						while ((Ptr = strchr (str, '['))) *Ptr = ' ';
+						while ((Ptr = strchr (str, ']'))) *Ptr = ' ';
+
+						/* supprimer les espaces de debut */
+						Ptr = str;
+						while (*Ptr == ' ') Ptr ++;
+						strcpy (str, Ptr);
+
+						/* supprimer les espaces de fin */
+						Ptr = str;
+						while (*Ptr) Ptr ++;
+						Ptr --;
+						while (*Ptr == ' ') Ptr --;
 						Ptr ++;
-					}
-					if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
-						g_print ("\tline[ %d ] %s ", pass, Lcurentry->tp == IDE ? "IDE" : "SCSI");
-						g_print ("%s\t'%s'\n", Lcurentry->useline, str);
-					}
-					if ((Media = (MEDIA *)g_malloc0 (sizeof (MEDIA)))) {
-						Media->Full_Name = g_strdup (str);
-						Media->Device = g_strdup (Lcurentry->useline);
-						Media->Num = var_scancd.TotalReadersDetected;
-						var_scancd.TotalReadersDetected ++;
+						*Ptr = '\0';
+
+						/* supprimer les doubles espaces */
+						Ptr = str;
+						while (*Ptr) {
+							if ((*Ptr==' ') && (*(Ptr+1)==' ')) {
+								strcpy (Ptr, Ptr+1);
+								Ptr = str;
+								continue;
+							}
+							Ptr ++;
+						}
+						if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
+							g_print ("\tline[ %d ] %s ", pass, Lcurentry->tp == IDE ? "IDE" : "SCSI");
+							g_print ("%s\t'%s'\n", Lcurentry->useline, str);
+						}
+						if ((Media = (MEDIA *)g_malloc0 (sizeof (MEDIA)))) {
+							Media->Full_Name = g_strdup (str);
+							Media->Device = g_strdup (Lcurentry->useline);
+							Media->Num = var_scancd.TotalReadersDetected;
+							var_scancd.TotalReadersDetected ++;
 						
-						Media->line = pass;
-						Media->type = Lcurentry->tp == IDE ? 0 : 1;
+							Media->line = pass;
+							Media->type = Lcurentry->tp == IDE ? 0 : 1;
 						
-						List = g_list_append (List, Media);
+							List = g_list_append (List, Media);
+						}
+					}
+					else {
+						PRINT_FUNC_LF();
+						if( TRUE == OptionsCommandLine.BoolVerboseMode )
+							g_print ("La ligne renvoyee par: dvd+rw-mediainfo est inconnue\n");
 					}
-				}
-				else {
-					PRINT_FUNC_LF();
-					if( TRUE == OptionsCommandLine.BoolVerboseMode )
-						g_print ("La ligne renvoyee par: dvd+rw-mediainfo est inconnue\n");
 				}
 			}
-		}
 
-		g_string_free (gstr, TRUE);
-		Lout = NULL;
+			g_string_free (gstr, TRUE);
+			Lout = NULL;
+		}
 	}
 	g_print ("\n");

xcfa-4.2.8.tar.gz/src/scan.h -> xcfa-5.0.2.tar.gz/src/scan.h Changed

xcfa-4.2.8.tar.gz/src/split.c -> xcfa-5.0.2.tar.gz/src/split.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : split.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <stdio.h>
@@ -67,9 +62,9 @@
 
 
 
-extern gint		 n_drag_types;			/* Drag And Drop	*/
-VAR_SPLIT VarSplit;
-ADJUST Adjust;
+extern gint		 n_drag_types;			// Drag And Drop
+VAR_SPLIT	VarSplit;
+ADJUST		Adjust;
 
 void SetAjust (void);
 
@@ -80,12 +75,12 @@
 void split_set_time (void)
 {
 	gint		sec;
-	gdouble		dsec;
+	// gdouble		dsec;
 	gdouble		TimeSongSec;
 	gdouble		Percent;
-	gint		H, M, S, C;
+	gint		H, M, S;
+	// gint		C, hundr;
 	gchar		*Str = NULL;
-	gint		hundr;
 
 	if (NULL == VarSplit.Tags || VarSplit.NbrSelecteurs <= 0) {
 		gtk_label_set_use_markup (GTK_LABEL(GLADE_GET_OBJECT("label_begin_time_split")), TRUE);
@@ -115,12 +110,12 @@
 	// POSITION INDEX DEBUT
 	Percent = SplitSelector_get_percent_begin (VarSplit.SelecteurActif);
 	sec = (gint) (((gdouble)TimeSongSec * (gdouble)Percent) / 100.0);
-	dsec = ((gdouble)TimeSongSec *(gdouble)Percent) / 100.0;
-	hundr = ((gdouble)dsec - (gdouble)sec) * 100.0;
+	// dsec = ((gdouble)TimeSongSec *(gdouble)Percent) / 100.0;
+	// hundr = ((gdouble)dsec - (gdouble)sec) * 100.0;
 	H = (sec / 60) / 60;
 	M = (sec / 60) % 60;
 	S = sec % 60;
-	C = hundr;
+	// C = hundr;
 	Str = g_strdup_printf (" %02d:%02d:%02d ", H, M, S);
 	gtk_label_set_use_markup (GTK_LABEL(GLADE_GET_OBJECT("label_begin_time_split")), TRUE);
 	gtk_label_set_markup (GTK_LABEL(GLADE_GET_OBJECT("label_begin_time_split")), Str);
@@ -129,12 +124,12 @@
 	// POSITION INDEX FIN
 	Percent = SplitSelector_get_percent_end (VarSplit.SelecteurActif);
 	sec = (gint) (((gdouble)TimeSongSec * (gdouble)Percent) / 100.0);
-	dsec = ((gdouble)TimeSongSec *(gdouble)Percent) / 100.0;
-	hundr = ((gdouble)dsec - (gdouble)sec) * 100.0;
+	// dsec = ((gdouble)TimeSongSec *(gdouble)Percent) / 100.0;
+	// hundr = ((gdouble)dsec - (gdouble)sec) * 100.0;
 	H = (sec / 60) / 60;
 	M = (sec / 60) % 60;
 	S = sec % 60;
-	C = hundr;
+	// C = hundr;
 	Str = g_strdup_printf (" %02d:%02d:%02d ", H, M, S);
 	gtk_label_set_use_markup (GTK_LABEL(GLADE_GET_OBJECT("label_end_time_split")), TRUE);
 	gtk_label_set_markup (GTK_LABEL(GLADE_GET_OBJECT("label_end_time_split")), Str);
@@ -149,12 +144,12 @@
 	// DUREE DE LA PLAGE
 	Percent = SplitSelector_get_percent_end (VarSplit.SelecteurActif) - SplitSelector_get_percent_begin (VarSplit.SelecteurActif);
 	sec = (gint) (((gdouble)TimeSongSec * (gdouble)Percent) / 100.0);
-	dsec = ((gdouble)TimeSongSec *(gdouble)Percent) / 100.0;
-	hundr = ((gdouble)dsec - (gdouble)sec) * 100.0;
+	// dsec = ((gdouble)TimeSongSec *(gdouble)Percent) / 100.0;
+	// hundr = ((gdouble)dsec - (gdouble)sec) * 100.0;
 	H = (sec / 60) / 60;
 	M = (sec / 60) % 60;
 	S = sec % 60;
-	C = hundr;
+	// C = hundr;
 	Str = g_strdup_printf (" %02d:%02d:%02d ", H, M, S);
 	gtk_label_set_use_markup (GTK_LABEL(GLADE_GET_OBJECT("label_time_split")), TRUE);
 	gtk_label_set_markup (GTK_LABEL(GLADE_GET_OBJECT("label_time_split")), Str);
@@ -163,12 +158,12 @@
 	// TEMPS DU PLAY
 	Percent = VarSplit.PercentActivePlay;
 	sec = (gint) (((gdouble)TimeSongSec * (gdouble)Percent) / 100.0);
-	dsec = ((gdouble)TimeSongSec *(gdouble)Percent) / 100.0;
-	hundr = ((gdouble)dsec - (gdouble)sec) * 100.0;
+	// dsec = ((gdouble)TimeSongSec *(gdouble)Percent) / 100.0;
+	// hundr = ((gdouble)dsec - (gdouble)sec) * 100.0;
 	H = (sec / 60) / 60;
 	M = (sec / 60) % 60;
 	S = sec % 60;
-	C = hundr;
+	// C = hundr;
 	Str = g_strdup_printf (" %02d:%02d:%02d ", H, M, S);
 	gtk_label_set_use_markup (GTK_LABEL(GLADE_GET_OBJECT("label_curseur_lecture_split")), TRUE);
 	gtk_label_set_markup (GTK_LABEL(GLADE_GET_OBJECT("label_curseur_lecture_split")), Str);
@@ -204,21 +199,19 @@
 	gdouble			Value;
 	gint			Begin;
 	gint			LenScroll;
+	GtkAllocation	allocation;
 	
 	if (VarSplit.NbrSelecteurs == 0) return;
-	
 	SplitSelector_get_pos ();
-	
-	Value = (gint)VarSplit.AdjScroll->value;
-	
-	LenScroll = VARSPLIT_SPECTRE_WITH -1;
+	Value = gtk_adjustment_get_value( VarSplit.AdjScroll );
+	gtk_widget_get_allocation( VarSplit.AdrWidgetSpectre, &allocation );
+	LenScroll = allocation.width -1;
 	Begin = SplitSelector_get_pos_play () - (gint)Value;
 		
 	while( Begin > 100 && Value + LenScroll < SplitSpectre_get_with() ) {
 		Begin --;
 		Value ++;
 	}
-
 	if (Value < 0.0) {
 		Value = 0.0;
 	}
@@ -230,28 +223,48 @@
 // 
 void split_redraw_image (void)
 {
+	/**
+	GtkAllocation	allocation;
+	
 	if (NULL == VarSplit.AdrWidgetSpectre) return;
-	// PRINT_FUNC_LF();
+	gtk_widget_get_allocation( VarSplit.AdrWidgetSpectre, &allocation );
 	gtk_widget_queue_draw_area (
 				VarSplit.AdrWidgetSpectre,
-				VarSplit.AdrWidgetSpectre->allocation.x,
-				VarSplit.AdrWidgetSpectre->allocation.y,
-				VarSplit.AdrWidgetSpectre->allocation.width,
-				VarSplit.AdrWidgetSpectre->allocation.height
+				allocation.x,
+				allocation.y,
+				allocation.width,
+				allocation.height
 				);
+	*/
+	if (NULL == VarSplit.AdrWidgetSpectre) return;
+	gtk_widget_queue_draw( VarSplit.AdrWidgetSpectre );
 }
 // 
 // 
-static void split_drag_data_received_file (GtkWidget	 *widget,
-					GdkDragContext *drag_context,
-					gint x,
-					gint y,
-					GtkSelectionData *data,
-					guint info,
-					guint time)
+static void split_drag_data_received_file(
+					GtkWidget *widget,
+					GdkDragContext *context,
+					gint x,
+					gint y,
+					GtkSelectionData *data,
+					guint info,
+					guint time,
+					gpointer user_data)
 {
-	if (gtk_drag_get_source_widget(drag_context) != widget) {
-		dragndrop_list_drag_data (widget, (gchar *)data->data);
+	/**
+	if( TRUE == VarSplit.BoolPlay ) {
+		wind_info_init (
+			WindMain,
+			_("Veuillez arreter la lecture du fichier"),
+			 "\n",
+			_("avant d'impôrter un fichier."),
+			 "");
+		return;
+	}
+	*/
+	if (gtk_drag_get_source_widget(context) != widget) {
+		// dragndrop_list_drag_data (widget, (gchar *)data->data);
+		dragndrop_list_drag_data( widget, (gchar*)gtk_selection_data_get_data( data ));
 	}
 }
 // 
@@ -281,14 +294,14 @@
 		g_free (Str);	Str = NULL;
 		
 		if (VarSplit.NbrSelecteurs > 1) {
-			StatusBar_set_mess( NOTEBOOK_SPLIT, _STATUSBAR_SIMPLE_, _("Menu: Click droit / Ajout plage: Click bouton centre / Zoom: Ctrl+Scroll") );
+			StatusBar_set_mess( NOTEBOOK_SPLIT, _STATUSBAR_SIMPLE_, _("Menu: right click / Adding track: Click the center button / Zoom: Ctrl+Scroll") );
 		}
 		else {
-			StatusBar_set_mess( NOTEBOOK_SPLIT, _STATUSBAR_SIMPLE_, _("Ajout plage: Click bouton centre / Zoom: Ctrl+Scroll") );
+			StatusBar_set_mess( NOTEBOOK_SPLIT, _STATUSBAR_SIMPLE_, _("Adding track: Click the center button / Zoom: Ctrl+Scroll") );
 		}
 	}
 	else {
-		StatusBar_set_mess( NOTEBOOK_SPLIT, _STATUSBAR_SIMPLE_, _("Pret pour l'import d'un fichier CUE, WAV, FLAC, OGG, MP3, APE, WMA") );
+		StatusBar_set_mess( NOTEBOOK_SPLIT, _STATUSBAR_SIMPLE_, _("Ready for imports and a CUE file, WAV, FLAC, OGG, MP3, APE, WMA") );
 	}
 }
 //
@@ -297,6 +310,8 @@
 {
 	VarSplit.BoolInThread = TRUE;
 	
+	SplitSpectre_remove();
+	VarSplit.Tags = (INFO_WAV *)tagswav_get_info (VarSplit.PathNameFile);
 	SplitSpectre_read_file_spectre (VarSplit.PathNameFile);
 	
 	VarSplit.BoolInThread = FALSE;
@@ -310,10 +325,10 @@
 	if (FALSE == VarSplit.BoolInThread) {
 		gint	IndicePoints = 0;
 				
-		gtk_timeout_remove (VarSplit.HandlerTimeoutDo);
+		g_source_remove (VarSplit.HandlerTimeoutDo);
 		
-		VarSplit.Tags = tagswav_remove_info (VarSplit.Tags);
-		VarSplit.Tags = (INFO_WAV *)tagswav_get_info (VarSplit.PathNameFile);
+		// VarSplit.Tags = tagswav_remove_info (VarSplit.Tags);
+		// VarSplit.Tags = (INFO_WAV *)tagswav_get_info (VarSplit.PathNameFile);
 		
 		// 
 		split_set_name_file ();
@@ -350,23 +365,27 @@
 // 
 // IMPORT D'UN FICHIER
 // 
-void split_file_load (gchar *p_PathNameFile)
+void split_file_load( gchar *p_PathNameFile )
 {
 	gchar		*PathNameFile = NULL;
 	TYPE_FILE_IS	TypeFileIs = GetInfo_file_is (p_PathNameFile);
 
+printf("\n---------------------------- BEGIN split_file_load( %s\n", p_PathNameFile );
+
 	if (0 == strcmp (p_PathNameFile, SPLIT_FILE_TMP_WAV)) {
-		wininfo_create (
-			_("Ce fichier appartient a XCFA"),
-			_("Selectionnez un autre fichier."),
+		wind_info_init (
+			WindMain,
+			_("This file belongs XCFA"),
+			_("Select another file."),
 			 "");
 		return;
 	}
 	
 	if (libutils_get_size_file (p_PathNameFile) <= 0) {
-		wininfo_create (
-			_("Fichier vide"),
-			_("Le fichier ne contient aucune donnee !!!"),
+		wind_info_init (
+			WindMain,
+			_("Empty file"),
+			_("The file contains no data !!!"),
 			 "");
 		return;
 	}
@@ -383,9 +402,10 @@
 			return;
 		}
 		if (0 == strcmp (PathNameFile, SPLIT_FILE_TMP_WAV)) {
-			wininfo_create (
-				_("Ce fichier appartient a XCFA"),
-				_("Selectionnez un autre fichier."),
+			wind_info_init (
+				WindMain,
+				_("This file belongs XCFA"),
+				_("Select another file."),
 				 "");
 			g_free (PathNameFile);
 			PathNameFile = NULL;
@@ -408,13 +428,14 @@
 		
 		if (FALSE == PrgInit.bool_sox || FALSE == PrgInit.bool_mplayer) {
 		
-			wininfo_create (
-				_("Sox et Mplayer absents"),
-				_("Sox et Mplayer sont absents de votre"),
+			wind_info_init (
+				WindMain,
+				_("Sox and Mplayer not found"),
+				_("Sox et Mplayer are not found"),
 			 	"\n",
-				_("configuration."),
+				_("in your configuration."),
 			 	"\n\n",
-				_("Veuillez les installer pour pouvoir continuer."),
+				_("Please install it and resume"),
 
 				"");
 			return;
@@ -428,13 +449,16 @@
 	VarSplit.PathNameFileReal = g_strdup (p_PathNameFile);
 	
 	SplitConv_to (PathNameFile);
+printf("\n---------------------------- END split_file_load( %s\n", p_PathNameFile );
 }
-void split_file_load_continue (gchar *p_PathNameFile)
+void split_file_load_continue( gchar *p_PathNameFile )
 {
 	pthread_t	nmr_tid;
 	gchar		*PathNameFile = p_PathNameFile;
 	TYPE_FILE_IS	TypeFileIs = libutils_test_file_exist (p_PathNameFile);
 	
+printf("---------------------------- BEGIN split_file_load_continue( %s\n", p_PathNameFile );
+
 	if (TRUE == libutils_test_file_exist (PathNameFile) &&
 	 (FILE_IS_WAV == TypeFileIs || FILE_IS_FLAC == TypeFileIs || FILE_IS_MP3 == TypeFileIs || FILE_IS_OGG == TypeFileIs || FILE_IS_APE == TypeFileIs)) {
 		
@@ -459,16 +483,18 @@
 		VarSplit.BoolInThread = TRUE;
 		PRINT("DEBUT TIMEOUT SPLIT");
 		PRINT("DEBUT THREAD SPLIT");
-		VarSplit.HandlerTimeoutDo = gtk_timeout_add (100, VarSplit_timeout, 0);
+		VarSplit.HandlerTimeoutDo = g_timeout_add (100, VarSplit_timeout, 0);
 		pthread_create (&nmr_tid, NULL ,(void *)VarSplit_thread, (void *)NULL);
 	}
 	else {
-		wininfo_create (
-			_("Erreur de choix de fichier"),
-			_("Veuillez selectionner un fichier de type WAV FLAC MP3 OGG APE"),
+		wind_info_init (
+			WindMain,
+			_("Error file select"),
+			_("Please select a file type of MP3 WAV OGG FLAC APE"),
 			 "");
 	}
 	split_set_flag_buttons ();
+printf("---------------------------- END split_file_load_continue( %s\n", p_PathNameFile );
 }
 
 	
@@ -495,14 +521,15 @@
 	 FILE_IS_APE == TypeFileIs ||
 	 FILE_IS_WMA == TypeFileIs ||
 	 TRUE == FileIs_g_str_has_suffix (path, ".CUE")) {
-		split_file_load (path);
+		split_file_load( path );
 		BoolTypeFileIsOk = TRUE;
 	}
 	
 	if (FALSE == BoolTypeFileIsOk) {
-		wininfo_create (
-			_("Mauvais type de fichier"),
-			_("Les types de fichiers acceptes\nsont: WAV FLAC MP3 OGG APE WMA CUE"),
+		wind_info_init (
+			WindMain,
+			_("Wrong type of file"),
+			_("File types accepted\nsare: WAV FLAC MP3 OGG APE WMA CUE"),
 			 "");
 	}
 }
@@ -510,7 +537,7 @@
 // 
 void on_button_importer_split_clicked (GtkButton *button, gpointer user_data)
 {
-	if (GDK_space != keys.keyval)
+	if (GDK_KEY_space != keys.keyval)
 		fileselect_create (_PATH_LOAD_SPLIT_FILE_, Config.PathLoadSplit, split_maj_file_load);
 }
 // INIT WIDGET DE LA DESTINAION DES DECOUPES
@@ -536,7 +563,7 @@
 // 
 void on_button_destination_split_clicked (GtkButton *button, gpointer user_data)
 {
-	if (GDK_space != keys.keyval) {
+	if (GDK_KEY_space != keys.keyval) {
 		fileselect_create (_PATH_CHOICE_DESTINATION_, Config.PathDestinationSplit, split_maj_destination);
 		split_set_flag_buttons ();
 	}
@@ -550,8 +577,6 @@
 	TYPE_FILE_IS	TypeFileIs = FILE_IS_NONE;
 	gboolean	BoolTypeFileIsOk = FALSE;
 	
-	// PRINT_FUNC_LF();
-	
 	while (NULL != gs_List) {
 		if (NULL != (Ptr = (gchar *)gs_List->data)) {
 			if( TRUE == OptionsCommandLine.BoolVerboseMode )
@@ -564,7 +589,7 @@
 			 FILE_IS_APE == TypeFileIs ||
 	 		 FILE_IS_WMA == TypeFileIs ||
 			 TRUE == FileIs_g_str_has_suffix (Ptr, ".CUE")) {
-				split_file_load (Ptr);
+				split_file_load( Ptr );
 				BoolTypeFileIsOk = TRUE;
 				break;
 			}
@@ -573,9 +598,10 @@
 	}
 	
 	if (FALSE == BoolTypeFileIsOk) {
-		wininfo_create (
-			_("Mauvais type de fichier"),
-			_("Les types de fichiers acceptes\nsont: WAV FLAC MP3 OGG APE WMA CUE"),
+		wind_info_init (
+			WindMain,
+			_("Wrong type of file"),
+			_("File types accepted\nsare: WAV FLAC MP3 OGG APE WMA CUE"),
 			 "");
 	}
 	
@@ -586,24 +612,27 @@
 // 
 void split_set_value (gdouble p_value)
 {
+	GtkAllocation	allocation;
+	gdouble			Value;
+	
+	Value = gtk_adjustment_get_value( VarSplit.AdjScroll );
+	gtk_widget_get_allocation( VarSplit.AdrWidgetSpectre, &allocation );
+	
 	VarSplit.PercentActivePlay = p_value;
 	if (VarSplit.PercentActivePlay >= 100.0) VarSplit.PercentActivePlay = 99.99;
 
-	if( SplitSelector_get_pos_play () > VARSPLIT_SPECTRE_WITH + (gint)VarSplit.AdjScroll->value &&
-	 (gint)VarSplit.AdjScroll->value < SplitSpectre_get_with() ) {
+	if( SplitSelector_get_pos_play () > VARSPLIT_SPECTRE_WITH + (gint)Value &&
+	 (gint)Value < SplitSpectre_get_with() ) {
 		SplitSpectre_scroll_droite_play ();
 	}
 	split_set_time ();
 	gtk_widget_queue_draw( VarSplit.AdrWidgetSpectreTop );
-	SplitSpectre_draw_lines_play();
-	// gtk_widget_queue_draw( VarSplit.AdrWidgetSpectre );
+	gtk_widget_queue_draw( VarSplit.AdrWidgetSpectre );
 }
 // 
 // 
 void split_end_play (void)
 {
-	PRINT_FUNC_LF();
-	
 	split_set_stop ();
 	
 	gtk_widget_show (GTK_WIDGET (GLADE_GET_OBJECT("button_play_split")));
@@ -632,8 +661,6 @@
 // 
 void on_button_play_split_clicked (GtkButton *button, gpointer user_data)
 {
-	// PRINT_FUNC_LF();
-	
 	VarSplit.BoolPlay = TRUE;
 	
 	gtk_widget_show (GTK_WIDGET (GLADE_GET_OBJECT("button_pause_split")));
@@ -657,8 +684,6 @@
 // 
 void on_button_pause_split_clicked (GtkButton *button, gpointer user_data)
 {
-	// PRINT_FUNC_LF();
-	
 	VarSplit.BoolPlay = FALSE;
 	
 	AlsaPlay_stop ();
@@ -683,15 +708,11 @@
 // 
 void on_button_play_begin_split_clicked (GtkButton *button, gpointer user_data)
 {
-	gdouble		Percent;
-	
-	// PRINT_FUNC_LF();
-	
 	gdouble	PercentBegin = SplitSelector_get_percent_begin (VarSplit.SelecteurActif);
 	gdouble	PercentEnd = SplitSelector_get_percent_begin (VarSplit.SelecteurActif) + SplitSelector_get_percent_for_x_secondes (5);
 	
 	VarSplit.BoolPlay = TRUE;
-	Percent = SplitSelector_get_percent_begin (VarSplit.SelecteurActif);
+	SplitSelector_get_percent_begin (VarSplit.SelecteurActif);
 	AlsaPlay_song (
 		VarSplit.PathNameFile,
 		PercentBegin,
@@ -699,8 +720,6 @@
 		split_set_value,
 		split_end_play
 		);
-	
-	// gtk_widget_set_sensitive (GTK_WIDGET (GLADE_GET_OBJECT("frame_choice_reader")),		FALSE);
 	gtk_widget_set_sensitive (GTK_WIDGET (GLADE_GET_OBJECT("button_play_begin_split")),	FALSE);
 	gtk_widget_set_sensitive (GTK_WIDGET (GLADE_GET_OBJECT("button_play_split")),		FALSE);
 	gtk_widget_set_sensitive (GTK_WIDGET (GLADE_GET_OBJECT("button_play_end_split")),	FALSE);
@@ -713,15 +732,11 @@
 // 
 void on_button_play_end_split_clicked (GtkButton *button, gpointer user_data)
 {
-	gdouble		Percent;
-	
-	// PRINT_FUNC_LF();
-	
 	gdouble	PercentBegin = SplitSelector_get_percent_end (VarSplit.SelecteurActif) - SplitSelector_get_percent_for_x_secondes (5);
 	gdouble	PercentEnd = SplitSelector_get_percent_end (VarSplit.SelecteurActif);
 	
 	VarSplit.BoolPlay = TRUE;
-	Percent = SplitSelector_get_percent_begin (VarSplit.SelecteurActif);
+	SplitSelector_get_percent_begin (VarSplit.SelecteurActif);
 	AlsaPlay_song (
 		VarSplit.PathNameFile,
 		PercentBegin,
@@ -729,7 +744,6 @@
 		split_set_value,
 		split_end_play
 		);
-	
 	gtk_widget_set_sensitive (GTK_WIDGET (GLADE_GET_OBJECT("button_play_begin_split")),	FALSE);
 	gtk_widget_set_sensitive (GTK_WIDGET (GLADE_GET_OBJECT("button_play_split")),		FALSE);
 	gtk_widget_set_sensitive (GTK_WIDGET (GLADE_GET_OBJECT("button_play_end_split")),	FALSE);
@@ -772,45 +786,58 @@
 // 
 void SetAjust (void)
 {
-	// PRINT_FUNC_LF();
-	VarSplit.AdjScroll->value = Adjust.value;
-	VarSplit.AdjScroll->lower = Adjust.lower;
-	VarSplit.AdjScroll->upper = Adjust.upper;
-	VarSplit.AdjScroll->step_increment = Adjust.step_increment;
-	VarSplit.AdjScroll->page_increment = Adjust.page_increment;
-	VarSplit.AdjScroll->page_size = Adjust.page_size;
+	if( NULL == VarSplit.AdjScroll ) return;
+	gtk_adjustment_set_value( VarSplit.AdjScroll, Adjust.value );
+	gtk_adjustment_set_lower( VarSplit.AdjScroll, Adjust.lower );
+	gtk_adjustment_set_upper( VarSplit.AdjScroll, Adjust.upper );
+	gtk_adjustment_set_step_increment( VarSplit.AdjScroll, Adjust.step_increment );
+	gtk_adjustment_set_page_increment( VarSplit.AdjScroll, Adjust.page_increment );
+	gtk_adjustment_set_page_size( VarSplit.AdjScroll, Adjust.page_size );
+	
 	gtk_adjustment_value_changed( VarSplit.AdjScroll );
 }
 // 
 // 
 void page_plus_scrolled ( gint p_CursorX )
 {
-	// PRINT_FUNC_LF();
+	gdouble			Value;
+	GtkAllocation	allocation;
+
+	Value = gtk_adjustment_get_value( VarSplit.AdjScroll );
+	gtk_widget_get_allocation( VarSplit.AdrWidgetSpectre, &allocation );
+
 	Adjust.mul += 1;
 	Adjust.with = SplitSpectre_get_with();
 	Adjust.lower = 0.;
 	Adjust.upper = Adjust.with;
 	Adjust.step_increment = 10;
-	Adjust.page_size = VarSplit.AdrWidgetSpectre->allocation.width;
-	Adjust.page_increment = VarSplit.AdrWidgetSpectre->allocation.width;
-	Adjust.value = VarSplit.AdjScroll->value + p_CursorX;
-	SetAjust ();
+	Adjust.page_size = allocation.width;
+	Adjust.page_increment = allocation.width;
+	Adjust.value = Value + (gdouble)p_CursorX;
+
+	SetAjust();
+	SetAjust();
 }
 // 
 // 
 void rigtht_plus_scrolled (void)
 {
-	// PRINT_FUNC_LF();
+	gdouble			Value;
+	GtkAllocation	allocation;
+
+	Value = gtk_adjustment_get_value( VarSplit.AdjScroll );
+	gtk_widget_get_allocation( VarSplit.AdrWidgetSpectre, &allocation );
+
 	// Adjust.mul += 1;
 	Adjust.with = SplitSpectre_get_with();
 	Adjust.lower = 0.;
 	Adjust.upper = Adjust.with;
 	Adjust.step_increment = 10;
-	Adjust.page_size = VarSplit.AdrWidgetSpectre->allocation.width;
-	Adjust.page_increment = VarSplit.AdrWidgetSpectre->allocation.width;
-	Adjust.value = VarSplit.AdjScroll->value;
+	Adjust.page_size = allocation.width;
+	Adjust.page_increment = allocation.width;
+	Adjust.value = Value;
 	Adjust.value += 10;
-	while( Adjust.value > Adjust.with - VarSplit.AdrWidgetSpectre->allocation.width )
+	while( Adjust.value > Adjust.with - allocation.width )
 		Adjust.value --;
 	SetAjust ();
 }
@@ -818,39 +845,50 @@
 // 
 void page_moins_scrolled ( gint p_CursorX )
 {
-	// PRINT_FUNC_LF();
+	gdouble			Value;
+
+	Value = gtk_adjustment_get_value( VarSplit.AdjScroll );
+	GtkAllocation	allocation;
+
+	gtk_widget_get_allocation( VarSplit.AdrWidgetSpectre, &allocation );
+
 	Adjust.mul -= 1;
 	if( Adjust.mul < 1 ) Adjust.mul = 1;
 	Adjust.with = SplitSpectre_get_with();
-	if( Adjust.with < VarSplit.AdrWidgetSpectre->allocation.width ) {
-		Adjust.with = VarSplit.AdrWidgetSpectre->allocation.width;
+	if( Adjust.with < allocation.width ) {
+		Adjust.with = allocation.width;
 		Adjust.value = 0;
 	} else {
-		Adjust.value = VarSplit.AdjScroll->value - p_CursorX;
+		Adjust.value = Value - p_CursorX;
 	}
-	while( Adjust.value > Adjust.with - VarSplit.AdrWidgetSpectre->allocation.width )
+	while( Adjust.value > Adjust.with - allocation.width )
 		Adjust.value --;
 	if( Adjust.value < 0. ) Adjust.value = 0.;
 	Adjust.lower = 0.;
 	Adjust.upper = Adjust.with;
 	Adjust.step_increment = 10;
-	Adjust.page_size = VarSplit.AdrWidgetSpectre->allocation.width;
-	Adjust.page_increment = VarSplit.AdrWidgetSpectre->allocation.width;
+	Adjust.page_size = allocation.width;
+	Adjust.page_increment = allocation.width;
 	SetAjust ();
 }
 // 
 // 
 void left_plus_scrolled (void)
 {
-	// PRINT_FUNC_LF();
+	gdouble			Value;
+	GtkAllocation	allocation;
+
+	Value = gtk_adjustment_get_value( VarSplit.AdjScroll );
+	gtk_widget_get_allocation( VarSplit.AdrWidgetSpectre, &allocation );
+
 	// Adjust.mul += 1;
 	Adjust.with = SplitSpectre_get_with();
 	Adjust.lower = 0.;
 	Adjust.upper = Adjust.with;
 	Adjust.step_increment = 10;
-	Adjust.page_size = VarSplit.AdrWidgetSpectre->allocation.width;
-	Adjust.page_increment = VarSplit.AdrWidgetSpectre->allocation.width;
-	Adjust.value = VarSplit.AdjScroll->value;
+	Adjust.page_size = allocation.width;
+	Adjust.page_increment = allocation.width;
+	Adjust.value = Value;
 	Adjust.value -= 10;
 	while( Adjust.value < 0.0 )
 		Adjust.value = 0.0;
@@ -865,10 +903,10 @@
 }
 // 
 // 
-gboolean on_eventbox_splitspectre_chrono_expose_event (GtkWidget *drawing, GdkEventExpose *e, gpointer data)
+gboolean on_eventbox_splitspectre_chrono_draw( GtkWidget *widget, cairo_t *p_cr, gpointer user_data )
 {
-	SplitSpectre_draw_chrono( VarSplit.AdrWidgetSpectreChrono );
-	return TRUE;
+	SplitSpectre_draw_chrono( VarSplit.AdrWidgetSpectreChrono, p_cr );
+	return FALSE;
 }
 // 
 // 
@@ -876,9 +914,14 @@
 {
 	gint			CursorX, CursorY;
 	GdkModifierType		state;
-		
-	// GET EMPLACEMENT CURSOR MOUSE
- 	gdk_window_get_pointer (((GdkEventButton*)event)->window, &CursorX, &CursorY, &state);	
+	GtkAllocation	allocation;
+	
+	gtk_widget_get_allocation( VarSplit.AdrWidgetSpectre, &allocation );	
+	/* Si pas de selection a cet endroit retour */
+	GdkDeviceManager *manager = gdk_display_get_device_manager( gdk_display_get_default() );
+	GdkDevice		 *device = gdk_device_manager_get_client_pointer( manager );
+	gdk_window_get_device_position( ((GdkEventButton*)event)->window, device, &CursorX, &CursorY, &state );
+ 	// gdk_window_get_pointer (((GdkEventButton*)event)->window, &CursorX, &CursorY, &state);	
 	
 	// SI LE CURSEUR N EST PAS DANS LA ZONE ALORS SORTIE
 	if (CursorX < VARSPLIT_CHRONO_X) return FALSE;
@@ -899,7 +942,6 @@
 // 
 gboolean on_eventbox_splitspectre_top_event (GtkWidget *widget, GdkEvent *event, gpointer user_data)
 {
-	// static gint Nbr = 0;
 	gboolean		BoolEventTypeScroll = (GDK_SCROLL == event->type) ? TRUE : FALSE;
 	gint			EventTypeScrollDirection = ((GdkEventScroll*)event)->direction;
 	gint			CursorX, CursorY;
@@ -907,16 +949,22 @@
 	// gboolean		bool_click_droit = (((GdkEventButton*)event)->button == 3);
 	// gboolean		bool_click_centre = (((GdkEventButton*)event)->button == 2);
 	gboolean		bool_click_gauche = (((GdkEventButton*)event)->button == 1);
-	
-	// PRINT("");
- 	
- 	// GET EMPLACEMENT CURSOR MOUSE
- 	gdk_window_get_pointer (((GdkEventButton*)event)->window, &CursorX, &CursorY, &state);	
+	gdouble			Value;
+	Value = gtk_adjustment_get_value( VarSplit.AdjScroll );
+	GtkAllocation	allocation;
+
+	gtk_widget_get_allocation( VarSplit.AdrWidgetSpectre, &allocation );
+
+	/* Si pas de selection a cet endroit retour */
+	GdkDeviceManager *manager = gdk_display_get_device_manager( gdk_display_get_default() );
+	GdkDevice		 *device = gdk_device_manager_get_client_pointer( manager );
+	gdk_window_get_device_position( ((GdkEventButton*)event)->window, device, &CursorX, &CursorY, &state );
+ 	// gdk_window_get_pointer (((GdkEventButton*)event)->window, &CursorX, &CursorY, &state);	
 	
 	// UN CLICK BOUTON SOURIS : PRESSED
 	if (TRUE == bool_click_gauche && event->type == GDK_BUTTON_PRESS) {
 		gint Pos;
-		CursorX += (gint)VarSplit.AdjScroll->value;
+		CursorX += (gint)Value;
 		for (Pos = 0; Pos < VarSplit.NbrSelecteurs ; Pos ++) {
 			if (CursorX > SplitSelector_get_pos_begin (Pos) && CursorX < SplitSelector_get_pos_end (Pos)) {
 				VarSplit.SelecteurActif = Pos;
@@ -951,7 +999,6 @@
 			if( LenPos < LenWin ) {
 				demi = ( LenWin - LenPos ) / 2;
 				Adjust.value = BeginPos - demi;
-				
 			}
 			// LA SELECTION EST PLUS GRANDE QUE LA FENETRE
 			else if( LenPos > LenWin ) {
@@ -965,7 +1012,6 @@
 			gtk_widget_queue_draw( VarSplit.AdrWidgetSpectre );
 			gtk_widget_queue_draw( VarSplit.AdrWidgetSpectreTop );
 		}
-		
 	}
 	else {
 		gtk_widget_queue_draw( VarSplit.AdrWidgetSpectreChrono );
@@ -975,20 +1021,40 @@
 }
 // 
 // 
-gboolean on_eventbox_splitspectre_top_expose_event (GtkWidget *drawing, GdkEventExpose *e, gpointer data)
+gboolean on_eventbox_splitspectre_top_draw( GtkWidget *widget, cairo_t *p_cr, gpointer user_data )
+{
+	SplitSpectre_draw_top( VarSplit.AdrWidgetSpectreTop, p_cr );
+	return FALSE;
+}
+
+void split_realize( void )
 {
-	SplitSpectre_draw_top( VarSplit.AdrWidgetSpectreTop );
-	return TRUE;
+	if( NULL != VarSplit.RangeAdjScroll && NULL != VarSplit.AdrWidgetSpectre ) {
+
+		GtkAllocation	allocation;
+		gtk_widget_get_allocation( VarSplit.AdrWidgetSpectre, &allocation );
+		
+		VarSplit.AdjScroll = gtk_range_get_adjustment( GTK_RANGE(VarSplit.RangeAdjScroll) );
+		Adjust.value = gtk_adjustment_get_value( VarSplit.AdjScroll );
+		Adjust.lower = gtk_adjustment_get_lower( VarSplit.AdjScroll );
+		Adjust.upper = gtk_adjustment_get_upper( VarSplit.AdjScroll );
+		Adjust.step_increment = gtk_adjustment_get_step_increment( VarSplit.AdjScroll );
+		Adjust.page_size = gtk_adjustment_get_page_size( VarSplit.AdjScroll );
+		Adjust.page_increment = gtk_adjustment_get_page_increment( VarSplit.AdjScroll );
+		Adjust.with = allocation.width;
+		Adjust.mul = 1;
+	}
 }
+
 // IMAGE
 // 
 void on_image_split_spectre_realize (GtkWidget *widget, gpointer user_data)
 {
-	GtkScrolledWindow	*AdrScrolledWindow;
-	
+	GtkAllocation	allocation;
+
 	// INIT COORDONNEES WIDGET
 	VarSplit.AdrWidgetSpectre = widget;
-	
+	gtk_widget_get_allocation( VarSplit.AdrWidgetSpectre, &allocation );
 	// 
 	gtk_widget_grab_focus (VarSplit.AdrWidgetSpectre);
 	
@@ -1000,10 +1066,6 @@
 			 GTK_DEST_DEFAULT_DROP,
 			 drag_types, n_drag_types,
 			 GDK_ACTION_COPY| GDK_ACTION_MOVE );
-	g_signal_connect(G_OBJECT(widget),
-			 "drag-data-received",
-			 G_CALLBACK(split_drag_data_received_file),
-			 NULL);
 
 	gtk_drag_source_set(
 			GTK_WIDGET(widget),
@@ -1011,6 +1073,10 @@
 			drag_types, n_drag_types,
 			GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_DEFAULT
 			);
+	g_signal_connect(G_OBJECT(widget),
+			 "drag-data-received",
+			 G_CALLBACK(split_drag_data_received_file),
+			 NULL);
 	
 	VarSplit.BoolEventButtonPressSpectre = FALSE;
 	VarSplit.BoolReadFileSpectre = FALSE;
@@ -1019,44 +1085,35 @@
 	VarSplit.TypeCursorSpectre = _CURSOR_IS_NONE_;
 	VarSplit.BoolPlay = FALSE;
 	VarSplit.PercentActivePlay = 0.0;
-	VarSplit.BoolQueueDrawSpectre = FALSE;
-	VarSplit.BoolQueueDrawChrono = FALSE;
-	VarSplit.BoolQueueDrawTop = FALSE;
 	VarSplit.BoolBlankWithCue = FALSE;
-	
-	// INIT SCROLL
-	AdrScrolledWindow = GTK_SCROLLED_WINDOW (GLADE_GET_OBJECT("scrolledwindow_splitspectre"));
-	VarSplit.AdjScroll = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (AdrScrolledWindow));
-	Adjust.mul = 1;
-	Adjust.with = VarSplit.AdrWidgetSpectre->allocation.width;
-	Adjust.lower = VarSplit.AdjScroll->lower = 0.0;
-	Adjust.upper = VarSplit.AdrWidgetSpectre->allocation.width;
-	Adjust.step_increment = VarSplit.AdjScroll->step_increment = 10.0;
-	Adjust.page_size = VarSplit.AdrWidgetSpectre->allocation.width;
-	Adjust.page_increment = VarSplit.AdrWidgetSpectre->allocation.width;
-	Adjust.value = VarSplit.AdjScroll->value = 0.0;
+		
+	split_realize();
 	SetAjust ();
-	
+
 	gtk_widget_show (GTK_WIDGET (GLADE_GET_OBJECT("button_play_split")));
 	gtk_widget_hide (GTK_WIDGET (GLADE_GET_OBJECT("button_pause_split")));
 	
 	split_set_flag_buttons ();
 	split_set_time ();
 }
+
+
 // 
 // 
 gboolean on_eventbox_splitspectre_event (GtkWidget *widget, GdkEvent *event, gpointer user_data)
 {
 	gboolean		BoolEventTypeScroll = (GDK_SCROLL == event->type) ? TRUE : FALSE;
-	gint			EventTypeScrollDirection = ((GdkEventScroll*)event)->direction;
+	// gint			EventTypeScrollDirection = ((GdkEventScroll*)event)->direction;
 	gint			CursorX, _CursorX, CursorY;
 	GdkModifierType		state;
 	gboolean		bool_click_droit = (((GdkEventButton*)event)->button == 3);
 	gboolean		bool_click_centre = (((GdkEventButton*)event)->button == 2);
 	gboolean		bool_click_gauche = (((GdkEventButton*)event)->button == 1);
-	
+	gdouble			Value;
+	gdouble 		direction_x, direction_y;
+	GtkAllocation	allocation;
+
 	// PRINT_FUNC_LF();
-	
 	// IMPOSER UN REAFFICHAGE COMPLET
 	// g_print( "event->type = %d\n", event->type );
 	if( 29 == event->type ) {
@@ -1069,21 +1126,27 @@
 		return FALSE;
 	}
 	
+	gtk_widget_get_allocation( VarSplit.AdrWidgetSpectre, &allocation );
+	
+	Adjust.value = 
+	Value = gtk_adjustment_get_value( VarSplit.AdjScroll );
 	Adjust.with = SplitSpectre_get_with();
-	Adjust.lower = VarSplit.AdjScroll->lower;
+	Adjust.lower = gtk_adjustment_get_lower( VarSplit.AdjScroll );
 	Adjust.upper = Adjust.with;
-	Adjust.step_increment = VarSplit.AdjScroll->step_increment;
-	Adjust.page_size = VarSplit.AdrWidgetSpectre->allocation.width;
-	Adjust.page_increment = VarSplit.AdrWidgetSpectre->allocation.width;
-	Adjust.value = VarSplit.AdjScroll->value;
+	Adjust.step_increment = gtk_adjustment_get_step_increment( VarSplit.AdjScroll );
+	Adjust.page_size = allocation.width;
+	Adjust.page_increment = allocation.width;
 	while( Adjust.value + Adjust.page_size > Adjust.upper )
-		Adjust.value --;
+		Adjust.value --; 
 	SetAjust ();
 	
- 	// GET EMPLACEMENT CURSOR MOUSE
- 	gdk_window_get_pointer (((GdkEventButton*)event)->window, &CursorX, &CursorY, &state);	
-	_CursorX = CursorX + (gint)VarSplit.AdjScroll->value;
-	
+	// Si pas de selection a cet endroit retour
+	GdkDeviceManager *manager = gdk_display_get_device_manager( gdk_display_get_default() );
+	GdkDevice		 *device = gdk_device_manager_get_client_pointer( manager );
+	gdk_window_get_device_position( ((GdkEventButton*)event)->window, device, &CursorX, &CursorY, &state );
+ 	// gdk_window_get_pointer (((GdkEventButton*)event)->window, &CursorX, &CursorY, &state);	
+	_CursorX = CursorX + (gint)gtk_adjustment_get_value( VarSplit.AdjScroll );
+
 	// CHERCHE SI SELECTION
 	if (FALSE == VarSplit.BoolEventButtonPressSpectre) {
 		if (VarSplit.NbrSelecteurs > 0) {
@@ -1117,27 +1180,33 @@
 			VarSplit.TypeCursorSpectre = _CURSOR_IS_NONE_;
 		}
 	}
+
+	gdk_event_get_scroll_deltas( (const GdkEvent *)event, &direction_x, &direction_y );
 	
 	// SCROLL
 	if( TRUE == BoolEventTypeScroll && VarSplit.NbrSelecteurs > 0 ) {
 		if( TRUE == keys.BoolGDK_Control_L_R ) {
-			if (GDK_SCROLL_UP == EventTypeScrollDirection) {
+			if( direction_y == -1. ) {
 				page_plus_scrolled( CursorX );
 				gtk_widget_queue_draw( VarSplit.AdrWidgetSpectre );
 				gtk_widget_queue_draw( VarSplit.AdrWidgetSpectreTop );
 			}
-			else if (GDK_SCROLL_DOWN == EventTypeScrollDirection) {
+			else if( direction_y == 1. ) {
 				page_moins_scrolled( CursorX );
 				gtk_widget_queue_draw( VarSplit.AdrWidgetSpectre );
 				gtk_widget_queue_draw( VarSplit.AdrWidgetSpectreTop );
 			}
 		}
 		else {
-			if (GDK_SCROLL_UP == EventTypeScrollDirection) {
+			if( direction_y == -1. ) {
 				rigtht_plus_scrolled ();
+				gtk_widget_queue_draw( VarSplit.AdrWidgetSpectre );
+				gtk_widget_queue_draw( VarSplit.AdrWidgetSpectreTop );
 			}
-			else if (GDK_SCROLL_DOWN == EventTypeScrollDirection) {
+			else if( direction_y == 1. ) {
 				left_plus_scrolled ();
+				gtk_widget_queue_draw( VarSplit.AdrWidgetSpectre );
+				gtk_widget_queue_draw( VarSplit.AdrWidgetSpectreTop );
 			}
 		}
 	}
@@ -1212,17 +1281,17 @@
 	// MOVE CURSEUR
 	if (TRUE == VarSplit.BoolEventButtonPressSpectre && TRUE == bool_click_gauche) {
 	
-		gint	end = VARSPLIT_SPECTRE_WITH + (gint)VarSplit.AdjScroll->value;
+		gint	end = VARSPLIT_SPECTRE_WITH + (gint)Value;
 	
 		// SCROLL RIGHT
-		if( (gint)VarSplit.AdjScroll->value >= 0 && _CursorX >= end ) {
+		if( (gint)Value >= 0 && _CursorX >= end ) {
 			rigtht_plus_scrolled ();
 			rigtht_plus_scrolled ();
 			gtk_widget_queue_draw( VarSplit.AdrWidgetSpectre );
 			gtk_widget_queue_draw( VarSplit.AdrWidgetSpectreTop );
 		}
 		// SCROLL LEFT
-		else if( (gint)VarSplit.AdjScroll->value > 0 && _CursorX < (gint)VarSplit.AdjScroll->value ) {
+		else if( (gint)Value > 0 && _CursorX < (gint)Value ) {
 			left_plus_scrolled ();
 			left_plus_scrolled ();
 			gtk_widget_queue_draw( VarSplit.AdrWidgetSpectre );
@@ -1250,30 +1319,35 @@
 	split_set_flag_buttons ();
 	
 	if( 4 == event->type || 7 == event->type || 29 == event->type ) {
-		// gtk_widget_queue_draw( VarSplit.AdrWidgetSpectre );
+		gtk_widget_queue_draw( VarSplit.AdrWidgetSpectre );
 	}
 	gtk_widget_queue_draw( VarSplit.AdrWidgetSpectreChrono );
+	gtk_widget_queue_draw( VarSplit.AdrWidgetSpectre );
 
 	return FALSE;
 }
 // 
 // 
-gboolean on_eventbox_splitspectre_expose_event (GtkWidget *drawing, GdkEventExpose *e, gpointer data)
+gboolean on_eventbox_splitspectre_draw( GtkWidget *widget, cairo_t *p_cr, gpointer user_data )
 {
-	SplitSpectre_draw_lines();
-	return TRUE;
+	SplitSpectre_draw_lines( VarSplit.AdrWidgetSpectre, p_cr );
+	return FALSE;
+}
+// 
+// 
+void on_scrollbar_split_realize( GtkWidget *widget, gpointer user_data )
+{
+	VarSplit.RangeAdjScroll = GTK_RANGE(widget);
+	split_realize();
 }
 // SCROLLEDWINDOW
 // 
-gboolean on_scrolledwindow_splitspectre_event (GtkWidget *widget, GdkEvent *event, gpointer user_data)
+gboolean on_scrollbar_split_event( GtkWidget *widget, GdkEvent *event, gpointer user_data )
 {
-	// PRINT_FUNC_LF();
-	Adjust.value = VarSplit.AdjScroll->value;
-	if (GDK_EXPOSE == event->type) {		
-		gtk_widget_queue_draw( VarSplit.AdrWidgetSpectre );
-		gtk_widget_queue_draw( VarSplit.AdrWidgetSpectreTop );
-		gtk_widget_queue_draw( VarSplit.AdrWidgetSpectreChrono );
-	}
+	Adjust.value = gtk_adjustment_get_value( VarSplit.AdjScroll );
+	gtk_widget_queue_draw( VarSplit.AdrWidgetSpectre );
+	gtk_widget_queue_draw( VarSplit.AdrWidgetSpectreTop );
+	gtk_widget_queue_draw( VarSplit.AdrWidgetSpectreChrono );
 
 	return FALSE;
 }
@@ -1289,7 +1363,3 @@
 
 
 
-
-
-
-

xcfa-4.2.8.tar.gz/src/split.h -> xcfa-5.0.2.tar.gz/src/split.h Changed

@@ -1,9 +1,9 @@
  /*
  *  file      : split.h
  *  project   : xcfa
- *  with      : Gtk-2
+ *  with      : Gtk-3
  *
- *  copyright : (C) 2003 - 2012 by Claude Bulin
+ *  copyright : (C) 2003 - 2015 by Claude Bulin
  *
  *  xcfa - GTK+ implementation of the GNU shell command
  *  GNU General Public License
@@ -28,128 +28,29 @@
 #ifndef split_h
 #define split_h 1
 
-#define FOND_BLANC \
-	gdk_color.red = 65535; \
-	gdk_color.green = 65535; \
-	gdk_color.blue = 65535; \
-	gdk_color_alloc (colormap, &gdk_color); \
-	gdk_window_set_background (VarSplit.AdrWidgetSpectre->window, &gdk_color);
-
-#define FOND_NOIR \
-	gdk_color.red = 0; \
-	gdk_color.green = 0; \
-	gdk_color.blue = 0; \
-	gdk_color_alloc (colormap, &gdk_color); \
-	gdk_window_set_background (VarSplit.AdrWidgetSpectre, &gdk_color);
-
-#define FOND_BLEU \
-	gdk_color.red = 0; \
-	gdk_color.green = 0; \
-	gdk_color.blue = 65535; \
-	gdk_color_alloc (colormap, &gdk_color); \
-	gdk_window_set_background (VarSplit.AdrWidgetSpectre->window, &gdk_color);
-
-#define CRAYON_NOIR \
-	gdk_color.red = 0; \
-	gdk_color.green = 0; \
-	gdk_color.blue = 0; \
-	gdk_color_alloc (colormap, &gdk_color); \
-	gdk_gc_set_foreground (gc, &gdk_color);
-
-#define CRAYON_GRIS \
-	gdk_color.red = 21845; \
-	gdk_color.green = 21845; \
-	gdk_color.blue = 21845; \
-	gdk_color_alloc (colormap, &gdk_color); \
-	gdk_gc_set_foreground (gc, &gdk_color);
-
-#define CRAYON_GRIS_CLAIR \
-	gdk_color.red = 30767; \
-	gdk_color.green = 30767; \
-	gdk_color.blue = 30767; \
-	gdk_color_alloc (colormap, &gdk_color); \
-	gdk_gc_set_foreground (gc, &gdk_color);
-
-#define CRAYON_BLANC \
-	gdk_color.red = 65535; \
-	gdk_color.green = 65535; \
-	gdk_color.blue = 65535; \
-	gdk_color_alloc (colormap, &gdk_color); \
-	gdk_gc_set_foreground (gc, &gdk_color);
-
-#define CRAYON_BLEU \
-	gdk_color.red = 0; \
-	gdk_color.green = 0; \
-	gdk_color.blue = 65535; \
-	gdk_color_alloc (colormap, &gdk_color); \
-	gdk_gc_set_foreground (gc, &gdk_color);
-
-#define CRAYON_BLEU_CLAIR \
-	gdk_color.red = 0; \
-	gdk_color.green = 32000; \
-	gdk_color.blue = 65535; \
-	gdk_color_alloc (colormap, &gdk_color); \
-	gdk_gc_set_foreground (gc, &gdk_color);
-
-#define CRAYON_BLEU_CLAIR_PLUS \
-	gdk_color.red = 0; \
-	gdk_color.green = 49000; \
-	gdk_color.blue = 65535; \
-	gdk_color_alloc (colormap, &gdk_color); \
-	gdk_gc_set_foreground (gc, &gdk_color);
-
-#define CRAYON_ROUGE \
-	gdk_color.red = 65535; \
-	gdk_color.green = 0; \
-	gdk_color.blue = 0; \
-	gdk_color_alloc (colormap, &gdk_color); \
-	gdk_gc_set_foreground (gc, &gdk_color);
-
-#define CRAYON_VERT \
-	gdk_color.red = 0; \
-	gdk_color.green = 65500; \
-	gdk_color.blue = 0; \
-	gdk_color_alloc (colormap, &gdk_color); \
-	gdk_gc_set_foreground (gc, &gdk_color);
-
-#define CRAYON_JAUNE \
-	gdk_color.red = 65535; \
-	gdk_color.green = 65535; \
-	gdk_color.blue = 0; \
-	gdk_color_alloc (colormap, &gdk_color); \
-	gdk_gc_set_foreground (gc, &gdk_color);
-
-#define CRAYON_ORANGE \
-	gdk_color.red = 0xffff; \
-	gdk_color.green = 0x9999; \
-	gdk_color.blue = 0; \
-	gdk_color_alloc (colormap, &gdk_color); \
-	gdk_gc_set_foreground (gc, &gdk_color);
-
-
 
 #include "file.h"
 
-typedef struct {								// DEFINITION D'UN POINT POUR LA LECTURE DU FICHIER WAV
-	float		Max;							// Partie haute
-	float		Min;							// Partie basse
+typedef struct {											// DEFINITION D'UN POINT POUR LA LECTURE DU FICHIER WAV
+	float		Max;										// Partie haute
+	float		Min;										// Partie basse
 } POINTS_FILE;
 
 
-typedef struct {								// SPECIFICATION D'UN SELECTEUR
-	gint	Nmr;								// Numero du selecteur
-	float	BeginPaint;							// Position debut
-	float	EndPaint;							// Position fin
-	float	PercentBegin;							// Pourcentage debut
-	float	PercentEnd;							// Pourcentage fin
+typedef struct {											// SPECIFICATION D'UN SELECTEUR
+	gint	Nmr;											// Numero du selecteur
+	float	BeginPaint;										// Position debut
+	float	EndPaint;										// Position fin
+	float	PercentBegin;									// Pourcentage debut
+	float	PercentEnd;										// Pourcentage fin
 } SELECTEUR;
 
 
 typedef enum {
-	_CURSOR_IS_NONE_ = 0,							// 
-	_CURSOR_IS_LEFT_,							// 
-	_CURSOR_IS_RIGHT_,							// 
-	_CURSOR_IS_HAND_							// 
+	_CURSOR_IS_NONE_ = 0,									// 
+	_CURSOR_IS_LEFT_,										// 
+	_CURSOR_IS_RIGHT_,										// 
+	_CURSOR_IS_HAND_										// 
 } TYPE_CURSOR;
 
 /*
@@ -167,76 +68,73 @@
 
 
 typedef struct {
-	GtkWidget		*AdrWidgetSpectre;				// Adr Widget Spectre
-	GtkWidget		*AdrWidgetSpectreChrono;			// Adr Widget Spectre Chrono
-	GtkWidget		*AdrWidgetSpectreTop;				// Adr Widget Spectre Chrono
-	GtkButton		*Adr_button_destination;			// Adr du widget de la destinations des decoupes
-	gint			NbrSelecteurs;					// Nombre total de selecteurs
-	SELECTEUR		Selecteur [ MAX_SELECTEURS_SPLIT +2 ];		// Tableau des selecteurs
-	gint			SelecteurActif;					// Le selecteur actif si NbrSelecteurs > -1
-	gboolean		BoolReadFileSpectre;				// TRUE = BoolReadFileSpectre else NONE
-	gdouble			TimeSongSec;					// Duree totale du fichier en secondes
-	void			(*FuncExternBegin) (gdouble Percent);		// Rappel modif pointeur DEBUT
+	GtkWidget		*AdrWidgetSpectre;						// Adr Widget Spectre
+	GtkWidget		*AdrWidgetSpectreChrono;				// Adr Widget Spectre Chrono
+	GtkWidget		*AdrWidgetSpectreTop;					// Adr Widget Spectre Chrono
+	GtkButton		*Adr_button_destination;				// Adr du widget de la destinations des decoupes
+	gint			NbrSelecteurs;							// Nombre total de selecteurs
+	SELECTEUR		Selecteur [ MAX_SELECTEURS_SPLIT +2 ];	// Tableau des selecteurs
+	gint			SelecteurActif;							// Le selecteur actif si NbrSelecteurs > -1
+	gboolean		BoolReadFileSpectre;					// TRUE = BoolReadFileSpectre else NONE
+	gdouble			TimeSongSec;							// Duree totale du fichier en secondes
+	void			(*FuncExternBegin) (gdouble Percent);	// Rappel modif pointeur DEBUT
 	void			(*FuncExternEnd) (gdouble Percent);		// Rappel modif pointeur FIN
 	void			(*FuncExternWaitPlay) (void);			// Rappel selection d'ecoute
 	void			(*FuncExternStopPlay) (void);			// Rappel fin d'ecoute
-	gdouble			PercentActivePlay;				// Pointeur de lecture audio
+	gdouble			PercentActivePlay;						// Pointeur de lecture audio
 	gboolean		BoolEventButtonPressSpectre;			// 
-	POINTS_FILE		*Tab;						// Tableau des amplitudes du fichier actif
-	glong			TotalAllocation;				// Longeur du tableau Tab
-	gint			MaxPointsInTab;					// 
-	GdkPoint		*MaxScale_0;					// 
-	GdkPoint		*MinScale_0;					// 
-	GdkPoint		*MaxScale_1;					// 
-	GdkPoint		*MinScale_1;					// 
-	GdkPoint		*MaxScale_2;					// 
-	GdkPoint		*MinScale_2;					// 
-	glong			TotalAllocationTabScreen;			// Longeur du tableau TabScreen
-	gshort			nBitsPerSample;					// 8 16 24 et 32
-	gint			nTotalChunckSize;				// Taille des données
-	gchar			*PathNameFile;					// Nom complet du fichier
-	gchar			*PathNameFileReal;				// Nom reel du fichier
-	TYPE_FILE_IS		TypeFileIs;					// WAV,  MP3, OGG, FLAC, SHN, WAVPACK
-	INFO_WAV		*Tags;						// 
-	gboolean		BoolInThread;					//
-	guint			HandlerTimeoutDo;				//
-	TYPE_CURSOR		TypeCursorSpectre;				// NONE | LEFT | RIGHT
-	gboolean		BoolPlay;					// FALSE -> TRUE -> FALSE
-	gboolean		BoolQueueDrawSpectre;				// 
-	gboolean		BoolQueueDrawChrono;				// 
-	gboolean		BoolQueueDrawTop;				// 
-	GtkAdjustment		*AdjScroll;					//
-	gboolean		BoolBlankWithCue;				// 
+	POINTS_FILE		*Tab;									// Tableau des amplitudes du fichier actif
+	glong			TotalAllocation;						// Longeur du tableau Tab
+	gint			MaxPointsInTab;							// 
+	glong			TotalAllocationTabScreen;				// Longeur du tableau TabScreen
+	gshort			nBitsPerSample;							// 8 16 24 et 32
+	gint			nTotalChunckSize;						// Taille des données
+	gchar			*PathNameFile;							// Nom complet du fichier
+	gchar			*PathNameFileReal;						// Nom reel du fichier
+	TYPE_FILE_IS	TypeFileIs;								// WAV,  MP3, OGG, FLAC, SHN, WAVPACK
+	
+	INFO_WAV		*Tags;									// 
+	guint			sec_in_time;
+	
+	gboolean		BoolInThread;							//
+	guint			HandlerTimeoutDo;						//
+	TYPE_CURSOR		TypeCursorSpectre;						// NONE | LEFT | RIGHT
+	gboolean		BoolPlay;								// FALSE -> TRUE -> FALSE
+	
+	GtkAdjustment	*AdjScroll;								//
+	GtkRange		*RangeAdjScroll;
+	
+	gboolean		BoolBlankWithCue;						// 
 } VAR_SPLIT;
 
 
 #define VARSPLIT_CHRONO_X	( 0 )
 #define VARSPLIT_CHRONO_Y	( 0 )
-#define VARSPLIT_CHRONO_W	( VarSplit.AdrWidgetSpectreChrono->allocation.width - 1 )
-#define VARSPLIT_CHRONO_H	( VarSplit.AdrWidgetSpectreChrono->allocation.height - 1 )
+#define VARSPLIT_CHRONO_W	( allocation.width - 1 )
+#define VARSPLIT_CHRONO_H	( allocation.height - 1 )
 	
 #define VARSPLIT_SPECTRE_TOP_X	( 0 )
 #define VARSPLIT_SPECTRE_TOP_Y	( 0 )
-#define VARSPLIT_SPECTRE_TOP_W	( VarSplit.AdrWidgetSpectreTop->allocation.width - 1 )
-#define VARSPLIT_SPECTRE_TOP_H	( VarSplit.AdrWidgetSpectreTop->allocation.height - 1 )
+#define VARSPLIT_SPECTRE_TOP_W	( allocation.width - 1 )
+#define VARSPLIT_SPECTRE_TOP_H	( allocation.height - 1 )
 	
 #define VARSPLIT_SPECTRE_X	( 0 )
 #define VARSPLIT_SPECTRE_Y	( 0 )
-#define VARSPLIT_SPECTRE_W	( VarSplit.AdrWidgetSpectre->allocation.width - 1 )
-#define VARSPLIT_SPECTRE_H	( VarSplit.AdrWidgetSpectre->allocation.height - 1 )
+#define VARSPLIT_SPECTRE_W	( allocation.width - 1 )
+#define VARSPLIT_SPECTRE_H	( allocation.height - 1 )
 
-#define VARSPLIT_SPECTRE_WITH	( VarSplit.AdrWidgetSpectre->allocation.width )
+#define VARSPLIT_SPECTRE_WITH	( allocation.width )
 
 
 typedef struct {
-	gfloat	value;								// 
-	gfloat	lower;								// 
-	gfloat	upper;								// 
-	gfloat	step_increment;							// 
-	gfloat	page_size;							// 
-	gfloat	page_increment;							// 
-	gint	with;								// 
-	gint	mul;								// 
+	gfloat	value;											// 
+	gfloat	lower;											// 
+	gfloat	upper;											// 
+	gfloat	step_increment;									// 
+	gfloat	page_size;										// 
+	gfloat	page_increment;									// 
+	gint	with;											// 
+	gint	mul;											// 
 } ADJUST;
 
 // 
@@ -244,13 +142,12 @@
 //  SPLIT_SPECTRE.C
 // ---------------------------------------------------------------------------
 // 
-void		SplitSpectre_draw_lines_play( void );
 gboolean	SplitSpectre_read_file_spectre (gchar *PathNameFile);
-void		SplitSpectre_draw_lines (void);
 void		SplitSpectre_realize (GtkWidget *widget);
 void		split_draw (void);
-void		SplitSpectre_draw_chrono ( GtkWidget *widget );
-void		SplitSpectre_draw_top ( GtkWidget *widget );
+void		SplitSpectre_draw_chrono ( GtkWidget *widget, cairo_t *p_cr );
+void		SplitSpectre_draw_top ( GtkWidget *widget, cairo_t *p_cr );
+void		SplitSpectre_draw_lines (GtkWidget *widget, cairo_t *p_cr);
 gint		SplitSpectre_get_with (void);
 void		SplitSpectre_remove (void);
 //

xcfa-4.2.8.tar.gz/src/split_conv.c -> xcfa-5.0.2.tar.gz/src/split_conv.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : split_conv.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <glib.h>
 #include <glib/gstdio.h>
@@ -128,24 +123,28 @@
 	PARAM_FILELC	param_filelc;
 	gint		pos;
 	gboolean	BoolPassSox = FALSE;
+	gchar		**PtrTabArgs = NULL;
 	
+printf("---------------------------- SplitConv_thread( \n" );
+
 	conv.bool_thread_conv = TRUE;
 	
 	if (FILE_IS_WAV == VarSplitConv.TypeFileIs) {
-		pos = filelc_get_command_line_nice ();
-		conv.ArgConv [ pos++ ] = g_strdup ("mplayer");
-		conv.ArgConv [ pos++ ] = g_strdup ("-nojoystick");
-		conv.ArgConv [ pos++ ] = g_strdup ("-nolirc");
-		conv.ArgConv [ pos++ ] = g_strdup (VarSplitConv.SrcPathnameFile);
-		conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-		conv.ArgConv [ pos++ ] = g_strdup ("pcm");
-		conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-		conv.ArgConv [ pos++ ] = g_strdup_printf ("pcm:file=%s",SPLIT_FILE_TMP_WAV_SOX);
-		conv.ArgConv [ pos++ ] = g_strdup ("-srate");
-		conv.ArgConv [ pos++ ] = g_strdup ("44100");
-		conv.ArgConv [ pos++ ] = NULL;
-		conv_to_convert (FALSE, MPLAYER_WAV_TO_WAV, "MPLAYER_WAV_TO_WAV");
-		filelc_get_command_line_remove ();
+		PtrTabArgs = filelc_AllocTabArgs();
+		pos = 3;
+		PtrTabArgs [ pos++ ] = g_strdup ("mplayer");
+		PtrTabArgs [ pos++ ] = g_strdup ("-nojoystick");
+		PtrTabArgs [ pos++ ] = g_strdup ("-nolirc");
+		PtrTabArgs [ pos++ ] = g_strdup (VarSplitConv.SrcPathnameFile);
+		PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+		PtrTabArgs [ pos++ ] = g_strdup ("pcm");
+		PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+		PtrTabArgs [ pos++ ] = g_strdup_printf ("pcm:file=%s",SPLIT_FILE_TMP_WAV_SOX);
+		PtrTabArgs [ pos++ ] = g_strdup ("-srate");
+		PtrTabArgs [ pos++ ] = g_strdup ("44100");
+		PtrTabArgs [ pos++ ] = NULL;
+		conv_to_convert( PtrTabArgs, FALSE, MPLAYER_WAV_TO_WAV, "MPLAYER_WAV_TO_WAV");
+		PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 		BoolPassSox = TRUE;
 	}
 	else if (FILE_IS_FLAC == VarSplitConv.TypeFileIs) {
@@ -158,9 +157,9 @@
 		param_filelc.num_track = NULL;
 		param_filelc.BoolSetBitrate = FALSE;
 		param_filelc.PtrStrBitrate = NULL;
-		filelc_get_command_line (&param_filelc);
-		conv_to_convert (FALSE, FLAC_FLAC_TO_WAV, "FLAC_FLAC_TO_WAV");
-		filelc_get_command_line_remove ();
+		PtrTabArgs = filelc_get_command_line (&param_filelc);
+		conv_to_convert( PtrTabArgs, FALSE, FLAC_FLAC_TO_WAV, "FLAC_FLAC_TO_WAV");
+		PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 		BoolPassSox = TRUE;
 	}
 	else if (FILE_IS_APE == VarSplitConv.TypeFileIs) {
@@ -173,26 +172,27 @@
 		param_filelc.num_track = NULL;
 		param_filelc.BoolSetBitrate = FALSE;
 		param_filelc.PtrStrBitrate = NULL;
-		filelc_get_command_line (&param_filelc);
-		conv_to_convert (FALSE, MAC_APE_TO_WAV, "MAC_APE_TO_WAV");
-		filelc_get_command_line_remove ();
+		PtrTabArgs = filelc_get_command_line (&param_filelc);
+		conv_to_convert( PtrTabArgs, FALSE, MAC_APE_TO_WAV, "MAC_APE_TO_WAV");
+		PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 		BoolPassSox = TRUE;
 	}
 	else if (FILE_IS_WAVPACK == VarSplitConv.TypeFileIs) {
 	}
 	else if (FILE_IS_OGG == VarSplitConv.TypeFileIs) {
-		pos = filelc_get_command_line_nice ();
-		conv.ArgConv [ pos++ ] = g_strdup ("mplayer");
-		conv.ArgConv [ pos++ ] = g_strdup ("-nojoystick");
-		conv.ArgConv [ pos++ ] = g_strdup ("-nolirc");
-		conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-		conv.ArgConv [ pos++ ] = g_strdup ("pcm");
-		conv.ArgConv [ pos++ ] = g_strdup (VarSplitConv.SrcPathnameFile);
-		conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-		conv.ArgConv [ pos++ ] = g_strdup_printf ("pcm:file=%s", SPLIT_FILE_TMP_WAV_SOX);
-		conv.ArgConv [ pos++ ] = NULL;
-		conv_to_convert (FALSE, MPLAYER_OGG_TO_WAV, "MPLAYER_OGG_TO_WAV");
-		filelc_get_command_line_remove ();
+		PtrTabArgs = filelc_AllocTabArgs();
+		pos = 3;
+		PtrTabArgs [ pos++ ] = g_strdup ("mplayer");
+		PtrTabArgs [ pos++ ] = g_strdup ("-nojoystick");
+		PtrTabArgs [ pos++ ] = g_strdup ("-nolirc");
+		PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+		PtrTabArgs [ pos++ ] = g_strdup ("pcm");
+		PtrTabArgs [ pos++ ] = g_strdup (VarSplitConv.SrcPathnameFile);
+		PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+		PtrTabArgs [ pos++ ] = g_strdup_printf ("pcm:file=%s", SPLIT_FILE_TMP_WAV_SOX);
+		PtrTabArgs [ pos++ ] = NULL;
+		conv_to_convert( PtrTabArgs, FALSE, MPLAYER_OGG_TO_WAV, "MPLAYER_OGG_TO_WAV");
+		PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 		BoolPassSox = TRUE;
 	}
 	else if (FILE_IS_M4A == VarSplitConv.TypeFileIs) {
@@ -200,37 +200,39 @@
 	else if (FILE_IS_MPC == VarSplitConv.TypeFileIs) {
 	}
 	else if (FILE_IS_MP3 == VarSplitConv.TypeFileIs) {
-		pos = filelc_get_command_line_nice ();
-		conv.ArgConv [ pos++ ] = g_strdup ("mplayer");
-		conv.ArgConv [ pos++ ] = g_strdup ("-nojoystick");
-		conv.ArgConv [ pos++ ] = g_strdup ("-nolirc");
-		conv.ArgConv [ pos++ ] = g_strdup (VarSplitConv.SrcPathnameFile);
-		conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-		conv.ArgConv [ pos++ ] = g_strdup ("pcm");
-		conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-		conv.ArgConv [ pos++ ] = g_strdup_printf ("pcm:file=%s", SPLIT_FILE_TMP_WAV_SOX);
-		conv.ArgConv [ pos++ ] = NULL;
-		conv_to_convert (FALSE, MPLAYER_MP3_TO_WAV, "MPLAYER_MP3_TO_WAV");
-		filelc_get_command_line_remove ();
+		PtrTabArgs = filelc_AllocTabArgs();
+		pos = 3;
+		PtrTabArgs [ pos++ ] = g_strdup ("mplayer");
+		PtrTabArgs [ pos++ ] = g_strdup ("-nojoystick");
+		PtrTabArgs [ pos++ ] = g_strdup ("-nolirc");
+		PtrTabArgs [ pos++ ] = g_strdup (VarSplitConv.SrcPathnameFile);
+		PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+		PtrTabArgs [ pos++ ] = g_strdup ("pcm");
+		PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+		PtrTabArgs [ pos++ ] = g_strdup_printf ("pcm:file=%s", SPLIT_FILE_TMP_WAV_SOX);
+		PtrTabArgs [ pos++ ] = NULL;
+		conv_to_convert( PtrTabArgs, FALSE, MPLAYER_MP3_TO_WAV, "MPLAYER_MP3_TO_WAV");
+		PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 		BoolPassSox = TRUE;
 	}
 	else if (FILE_IS_WMA == VarSplitConv.TypeFileIs) {
-		pos = filelc_get_command_line_nice ();
-		conv.ArgConv [ pos++ ] = g_strdup ("mplayer");
-		conv.ArgConv [ pos++ ] = g_strdup ("-nojoystick");
-		conv.ArgConv [ pos++ ] = g_strdup ("-nolirc");
-		conv.ArgConv [ pos++ ] = g_strdup (VarSplitConv.SrcPathnameFile);
-		conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-		conv.ArgConv [ pos++ ] = g_strdup ("pcm");
-		conv.ArgConv [ pos++ ] = g_strdup ("-ao");
-		conv.ArgConv [ pos++ ] = g_strdup_printf ("pcm:file=%s", SPLIT_FILE_TMP_WAV_SOX);
-		conv.ArgConv [ pos++ ] = g_strdup ("-af");
-		conv.ArgConv [ pos++ ] = g_strdup ("channels=2");
-		conv.ArgConv [ pos++ ] = g_strdup ("-srate");
-		conv.ArgConv [ pos++ ] = g_strdup ("44100");
-		conv.ArgConv [ pos++ ] = NULL;
-		conv_to_convert (FALSE, MPLAYER_WMA_TO_WAV, "MPLAYER_WMA_TO_WAV");
-		filelc_get_command_line_remove ();
+		PtrTabArgs = filelc_AllocTabArgs();
+		pos = 3;
+		PtrTabArgs [ pos++ ] = g_strdup ("mplayer");
+		PtrTabArgs [ pos++ ] = g_strdup ("-nojoystick");
+		PtrTabArgs [ pos++ ] = g_strdup ("-nolirc");
+		PtrTabArgs [ pos++ ] = g_strdup (VarSplitConv.SrcPathnameFile);
+		PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+		PtrTabArgs [ pos++ ] = g_strdup ("pcm");
+		PtrTabArgs [ pos++ ] = g_strdup ("-ao");
+		PtrTabArgs [ pos++ ] = g_strdup_printf ("pcm:file=%s", SPLIT_FILE_TMP_WAV_SOX);
+		PtrTabArgs [ pos++ ] = g_strdup ("-af");
+		PtrTabArgs [ pos++ ] = g_strdup ("channels=2");
+		PtrTabArgs [ pos++ ] = g_strdup ("-srate");
+		PtrTabArgs [ pos++ ] = g_strdup ("44100");
+		PtrTabArgs [ pos++ ] = NULL;
+		conv_to_convert( PtrTabArgs, FALSE, MPLAYER_WMA_TO_WAV, "MPLAYER_WMA_TO_WAV");
+		PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 		BoolPassSox = TRUE;
 	}
 	else if (FILE_IS_SHN == VarSplitConv.TypeFileIs) {
@@ -244,9 +246,9 @@
 	
 	// CONVERSION AVEC SOX
 	if (TRUE == BoolPassSox) {
-		conv_with_sox_get_param (SPLIT_FILE_TMP_WAV_SOX, SPLIT_FILE_TMP_WAV, "44100", "2", "16");
-		conv_to_convert (FALSE, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
-		filelc_get_command_line_remove ();
+		PtrTabArgs = conv_with_sox_get_param (SPLIT_FILE_TMP_WAV_SOX, SPLIT_FILE_TMP_WAV, "44100", "2", "16");
+		conv_to_convert( PtrTabArgs, FALSE, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
+		PtrTabArgs = filelc_RemoveTab( PtrTabArgs );
 	}
 	
 	PRINT("FIN THREAD SPLITCONV");
@@ -295,10 +297,11 @@
 	else if (TRUE == conv.bool_thread_conv) {
 	}
 	else if (FALSE == conv.bool_thread_conv) {
+printf("---------------------------- FIN SplitConv_timeout( \n" );
 		PRINT("FIN TIMEOUT SPLITCONV");
 		if( TRUE == OptionsCommandLine.BoolVerboseMode )
 			g_print ("\n");
-		gtk_timeout_remove (conv.handler_timeout_conv);
+		g_source_remove (conv.handler_timeout_conv);
 		// WindScan_close ();
 		while (gtk_events_pending()) gtk_main_iteration();
 		if (NULL != VarSplitConv.DestPathnameFile) {
@@ -308,11 +311,12 @@
 			else {
 				WindScan_close ();
 				if( FALSE == WindScan_close_request()) {
-					wininfo_create (
-						_("Erreur SOX"),
-						_("Le programme SOX de votre distribution"),
+					wind_info_init (
+						WindMain,
+						_("SOX Error"),
+						_("The SOX program on your distribution"),
 						"\n",
-						_("a generer une erreur pendant la conversion."),
+						_("has generated an error during conversion."),
 						"");
 				}
 			}
@@ -324,11 +328,12 @@
 			else {
 				WindScan_close ();
 				if( FALSE == WindScan_close_request()) {
-					wininfo_create (
-						_("Erreur SOX"),
-						_("Le programme SOX de votre distribution"),
+					wind_info_init (
+						WindMain,
+						_("SOX Error"),
+						_("The SOX program on your distribution"),
 						"\n",
-						_("a generer une erreur pendant la conversion."),
+						_("has generated an error during conversion."),
 						"");
 				}
 			}
@@ -339,12 +344,14 @@
 }
 // 
 // 
-void SplitConv_to (gchar *p_PathNameFile)
+void SplitConv_to( gchar *p_PathNameFile )
 {
 	gint		Channels;
 	gint		Hertz;
 	gint		Bits;
 	pthread_t	nmr_tid;
+	
+printf("---------------------------- SplitConv_to( %s\n", p_PathNameFile );
 	
 	VarSplitConv.TypeFileIs = GetInfo_file_is (p_PathNameFile);
 	
@@ -400,11 +407,21 @@
 		conv.total_convert = 2;
 	}
 	if (FILE_IS_NONE != VarSplitConv.TypeFileIs) {
-		WindScan_open ("SOX files", WINDSCAN_PULSE);
+		// WindScan_open ("SOX files", WINDSCAN_PULSE);
+		wind_scan_init(
+			WindMain,
+			"SOX files",
+			WINDSCAN_PULSE
+			);
 		WindScan_set_label ("SOX files ...");
 	}
 	else {
-		WindScan_open ("Analyse du fichier", WINDSCAN_PULSE);
+		// WindScan_open ("Analyse du fichier", WINDSCAN_PULSE);
+		wind_scan_init(
+			WindMain,
+			"Analyse du fichier",
+			WINDSCAN_PULSE
+			);
 		WindScan_set_label ("Analyse du fichier ...");
 	}
 
@@ -412,7 +429,7 @@
 	PRINT("DEBUT TIMEOUT SPLITCONV");
 	PRINT("DEBUT THREAD SPLITCONV");
 	pthread_create (&nmr_tid, NULL ,(void *)SplitConv_thread, (void *)NULL);
-	conv.handler_timeout_conv = gtk_timeout_add (20, SplitConv_timeout, 0);
+	conv.handler_timeout_conv = g_timeout_add (20, SplitConv_timeout, 0);
 }

xcfa-4.2.8.tar.gz/src/split_cue.c -> xcfa-5.0.2.tar.gz/src/split_cue.c Changed

@@ -1,25 +1,25 @@
 /*
 * file : split_cue.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
 *
 * This file is part of XCFA.
- * 
+ *
 * XCFA is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * at your option) any later version.
- * 
+ *
 * XCFA is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with XCFA. If not, see <http://www.gnu.org/licenses/>.
 */
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <glib.h>
 #include <glib/gstdio.h>
@@ -60,10 +55,10 @@
 extern VAR_SPLIT VarSplit;
 
 
-// 
-// 
-// 
-// 
+//
+//
+//
+//
 float SplitCue_get_time_in_sec (gchar *p_str)
 {
 	gchar		*Ptr = NULL;
@@ -85,20 +80,20 @@
 			if ((Ptr = strrchr (p_str, ':')) != NULL) {
 				Ptr ++;
 				Hundr = atoi (Ptr);
-				
+
 				// Temps Total en secondes
 				SecondesTempsActuel = ((float)Min * 60.0) + (float)Sec + ((float)Hundr / 100.0);
 			}
 		}
 	}
-	
+
 	return (SecondesTempsActuel);
 }
-// 
+//
 // TEST LA COHERENCE DU FICHIER CUE
 // LECTURE DES INFOS DU FICHIER
 // RETOURNE LE NOM DU FICHIER DE MUSIQUE ASSOCIE
-// 
+//
 gchar *SplitCue_read_cue_file (gchar *p_pathname)
 {
 	FILE		*fp;
@@ -111,26 +106,26 @@
 	gint		IndicePoints = -1;
 	gint		FileTimeSec;
 	gboolean	BoolResultOk;
-	
-	// 
+
+	//
 	// TEST LA COHERENCE DU FICHIER CUE
-	// 
-	
+	//
 	if (NULL == (fp = fopen (p_pathname, "r"))) {
-		wininfo_create (
-			_("Erreur de lecture !"),
+		wind_info_init (
+			WindMain,
+			_("Misreading !"),
 			 "");
 		return (NULL);
 	}
-	
+
 	// PERFORMER "Rita Mitsouko / Rita Mitsouko"
 	// TITLE "Rita Mitsouko / Rita Mitsouko"
 	// FILE "XCFA_CUE.wav" WAVE
-	// 
+	//
 	// PERFORMER "José de Divina"
 	// TITLE "Ibiza World Tour @ Space"
 	// FILE "Ibiza1.mp3" WAVE
-	// 
+	//
 	// REM GENRE Jazz
 	// REM DATE 1966
 	// REM DISCID 120F4902
@@ -143,9 +138,9 @@
 	// PERFORMER "Rita Mitsouko"
 	// TITLE "Rita Mitsouko"
 	// FILE "01 - Restez Avec Moi.wav" WAVE
-	
+
 	while (fgets (buf, MAX_CARS_SPLIT_CUE_FILE, fp) != NULL) {
-		
+
 		// Si debut de ligne ok
 		if (NULL != (Ptr = strstr (buf, "FILE \""))) {
 
@@ -159,13 +154,13 @@
 				return (NULL);
 			}
 			*Ptr = '\0';
-			
+
 			// Path contiendra le chemin
 			Path = g_strdup (p_pathname);
 			if ((Ptr = strrchr (Path, '/')) != NULL) {
 				*Ptr = '\0';
 			}
-			
+
 			// PathNameSong contiendra: chemin + nom du fichier musical
 			PathNameSong = g_strdup_printf ("%s/%s", Path, StrNameSong);
 			g_free (Path);		Path = NULL;
@@ -174,80 +169,89 @@
 		}
 	}
 	fclose (fp);
-	
+
 	// LES TESTS
 	if (NULL == PathNameSong) {
-		wininfo_create (
-			_("Erreur"),
-			_("Aucun fichier de musique associe au cue-file !"),
+		wind_info_init (
+			WindMain,
+			_("Error"),
+			_("No music file associated with the cue-file"),
 			 "");
 		return (NULL);
 	}
 	if (FALSE == FileIs_g_str_has_suffix (PathNameSong, ".WAV")) {
 		if( TRUE == OptionsCommandLine.BoolVerboseMode )
 			g_print ("====\n%s\n----\n%s\t%s\n\t\tFILE NOT IN: .wav\n====\n", p_pathname, buf, PathNameSong);
-		wininfo_create (
-			_("Erreur"),
-			_("Pas de fichier WAV dans le cue-file !"),
+		wind_info_init (
+			WindMain,
+			_("Error"),
+			_("No WAV file in the cue-file"),
 			 "");
 		g_free (PathNameSong);	PathNameSong = NULL;
 		return (NULL);
 	}
 	if (FALSE == libutils_test_file_exist (PathNameSong)) {
-		PRINT("AUCUN FICHIER DE MUSIQUE ASSOCIE DANS LE DOSSIER");
-		wininfo_create (
-			_("Erreur"),
-			_("Aucun fichier de musique associe dans le dossier"),
+		wind_info_init (
+			WindMain,
+			_("Error"),
+			_("No music file in the folder associated"),
 			 "\n",
-			_("du cue-file"),
+			_("of cue-file"),
 			 "");
 		return (NULL);
 	}
-	
-	// 
+
+	//
 	// LECTURE DES INFOS DU FICHIER
-	// 
-	
+	//
 	FileTimeSec = tagswav_get_time_sec (PathNameSong);
-	
-	fp = fopen (p_pathname, "r");
-	while (fgets (buf, MAX_CARS_SPLIT_CUE_FILE, fp) != NULL) {
-		
-		if (strstr (buf, "TRACK ")) {
-			// g_print("TRACK ->%s", buf);
-		}
-		
-		// DEBUT
-		
-		else if (strstr (buf, "INDEX 01")) {
-			IndicePoints ++;
-			VarSplit.Selecteur [ IndicePoints ] . Nmr = IndicePoints;
-			VarSplit.Selecteur [ IndicePoints ] . BeginPaint = SplitCue_get_time_in_sec (buf);
-			VarSplit.Selecteur [ IndicePoints ] . PercentBegin = ((gdouble)VarSplit.Selecteur [ IndicePoints ] . BeginPaint / (gdouble)FileTimeSec) * 100.0;
-		} 
-		
-		// FIN
-		
-		else if (strstr (buf, "INDEX 00")) {
-			VarSplit.Selecteur [ IndicePoints ] . Nmr = IndicePoints;
-			VarSplit.Selecteur [ IndicePoints ] . EndPaint = SplitCue_get_time_in_sec (buf);
-			VarSplit.Selecteur [ IndicePoints ] . PercentEnd = ((gdouble)VarSplit.Selecteur [ IndicePoints ] . EndPaint / (gdouble)FileTimeSec) * 100.0;
+
+	if( NULL != ( fp = fopen( p_pathname, "r" )) ) {
+
+		while (fgets (buf, MAX_CARS_SPLIT_CUE_FILE, fp) != NULL) {
+
+			if (strstr (buf, "TRACK ")) {
+				// g_print("TRACK ->%s", buf);
+			}
+
+			// DEBUT
+
+			else if (strstr (buf, "INDEX 01")) {
+
+				IndicePoints ++;
+
+				VarSplit.Selecteur [ IndicePoints ] . Nmr = IndicePoints;
+				VarSplit.Selecteur [ IndicePoints ] . BeginPaint = SplitCue_get_time_in_sec (buf);
+				VarSplit.Selecteur [ IndicePoints ] . PercentBegin = ((gdouble)VarSplit.Selecteur [ IndicePoints ] . BeginPaint / (gdouble)FileTimeSec) * 100.0;
+			}
+
+			// FIN
+
+			else if (strstr (buf, "INDEX 00")) {
+
+				// SOLVED Sun, 03 Feb 2013 22:17:05 +0100
+				if( -1 == IndicePoints ) IndicePoints = 0;
+
+				VarSplit.Selecteur [ IndicePoints ] . Nmr = IndicePoints;
+				VarSplit.Selecteur [ IndicePoints ] . EndPaint = SplitCue_get_time_in_sec (buf);
+				VarSplit.Selecteur [ IndicePoints ] . PercentEnd = ((gdouble)VarSplit.Selecteur [ IndicePoints ] . EndPaint / (gdouble)FileTimeSec) * 100.0;
+			}
+
+			else if (strstr (buf, "TITLE ")) {
+				// g_print("TITLE ->%s", buf);
+			}
+
 		}
-		
-		else if (strstr (buf, "TITLE ")) {
-			// g_print("TITLE ->%s", buf);
-		} 
-		
+		fclose (fp);
 	}
-	fclose (fp);
-	
+
 	// AJUSTER LE DEBUT
 	VarSplit.Selecteur [ 0 ] . BeginPaint = 1;
-	
+
 	// AJUSTER LA FIN
 	VarSplit.Selecteur [ IndicePoints ] . PercentEnd = 99.99;
 	VarSplit.Selecteur [ IndicePoints ] . EndPaint = FileTimeSec;
-	
+
 	// TESTER LA COHERENCE DES DATAS
 	BoolResultOk = TRUE;
 	if( TRUE == OptionsCommandLine.BoolVerboseMode )
@@ -277,47 +281,49 @@
 	}
 	if( TRUE == OptionsCommandLine.BoolVerboseMode )
 		g_print ("\n");
-	
+
 	// ERREUR DE DATAS DANS LE FICHIER CUE !!!
 	if (FALSE == BoolResultOk) {
 		if (NULL != PathNameSong) {
 			g_free (PathNameSong);
 			PathNameSong = NULL;
-			
-			wininfo_create (
-				_("Erreur de donnees dans le fichier CUE"),
-				_("La solution est d'importer le fichier de"),
+
+			wind_info_init (
+				WindMain,
+				_("Data errors in the CUE file"),
+				_("The solution is to import the file"),
 				 "\n",
-				_("musique qui sera reconnu et pre-decoupe"),
+				_("music that will be recognized and pre-cutting"),
 				 "\n",
-				_("dans le module Split."),
+				_("in the split module."),
 				 "\n\n",
-				_("Il ne restera qu'a ajuster les plages pour"),
+				_("We will just adjust to the beaches"),
 				 "\n",
-				_("generer un nouveau cue-file ou des decoupes"),
+				_("generate a new cue-file or cuts"),
 				 "\n",
-				_("correspondant aux plages."),
+				_("corresponding to the beaches."),
 				 "");
 		}
 	}
-	
-	// 
+
+	//
 	// RETOURNE LE NOM DU FICHIER DE MUSIQUE ASSOCIE
-	// 
+	//
 	return ((gchar *)PathNameSong);
 }
-// 
-// 
-// 
+//
+//
+//
 void on_button_gen_cue_split_clicked (GtkButton *button, gpointer user_data)
 {
 	gint		IndicePoints;
 	gdouble		Percent;
-	gint		H, M, S, C;
+	// gint		H;
+	gint		M, S, C;
+	gint		hundr;
 	gint		sec;
 	gdouble		dsec;
 	gdouble		TimeSongSec;
-	gint		hundr;
 	gchar		*Ptr = NULL;
 	gchar		*PathNameFileCue = NULL;
 	gchar		*NameFileWav = NULL;
@@ -325,44 +331,44 @@
 	gchar		*NameFileCue = NULL;
 	gint		NumFileCue;
 	FILE		*fp;
-	
+
 	PRINT_FUNC_LF();
 	TimeSongSec = VarSplit.Tags->SecTime;
 
 	for (IndicePoints = 0; VarSplit.Selecteur [ IndicePoints ] . Nmr != -1; IndicePoints ++) {
-		
+
 		Percent = VarSplit.Selecteur [ IndicePoints ] . PercentBegin;
 		sec = (gint) (((gdouble)TimeSongSec * (gdouble)Percent) / 100.0);
 		dsec = ((gdouble)TimeSongSec *(gdouble)Percent) / 100.0;
 		hundr = ((gdouble)dsec - (gdouble)sec) * 100.0;
-		H = (sec / 60) / 60;
+		// H = (sec / 60) / 60;
 		M = (sec / 60) % 60;
 		S = sec % 60;
 		C = hundr;
-		
+
 		if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
 			g_print ("[ %02d ] ", IndicePoints);
 			g_print ("%02d:%02d:%02d ", M, S, C);
 		}
-		
+
 		Percent = VarSplit.Selecteur [ IndicePoints ] . PercentEnd;
 		sec = (gint) (((gdouble)TimeSongSec * (gdouble)Percent) / 100.0);
 		dsec = ((gdouble)TimeSongSec *(gdouble)Percent) / 100.0;
 		hundr = ((gdouble)dsec - (gdouble)sec) * 100.0;
-		H = (sec / 60) / 60;
+		// H = (sec / 60) / 60;
 		M = (sec / 60) % 60;
 		S = sec % 60;
 		C = hundr;
-		
+
 		if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
 			g_print ("%02d:%02d:%02d", M, S, C);
 			g_print ("\n");
 		}
 	}
-	
+
 	if( TRUE == OptionsCommandLine.BoolVerboseMode )
 		g_print ("\n");
-	
+
 	// NOM DU CUE
 	/*PathNameFileCue = g_strdup (VarSplit.PathNameFile);
 	Ptr = strrchr (PathNameFileCue, '.');
@@ -379,12 +385,12 @@
 	*Ptr ++ = 'u';
 	*Ptr ++ = 'e';
 	*Ptr ++ = '\0';
-	
+
 	// NOM DU WAV
 	Ptr = strrchr (VarSplit.PathNameFile, '/');
 	Ptr ++;
 	NameFileWav = g_strdup (Ptr);
-	
+
 	// DEBUG
 	if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
 		g_print ("PathNameFileCue = %s\n", PathNameFileCue);
@@ -393,13 +399,13 @@
 	// CHANGER LE NOM DU FICHIER CUE SI IL EXIST
 	if (TRUE == libutils_test_file_exist (PathNameFileCue)) {
 		PRINT("PathNameFileCue EXIST");
-		
+
 		// PATH CUE FILE
 		PathFileCue = g_strdup (PathNameFileCue);
 		Ptr = strrchr (PathFileCue, '/');
 		Ptr ++;
 		*Ptr = '\0';
-		
+
 		// NAME CUE FILE
 		Ptr = strrchr (PathNameFileCue, '/');
 		Ptr ++;
@@ -414,10 +420,10 @@
 		g_free (NameFileCue);		NameFileCue = NULL;
 		if( TRUE == OptionsCommandLine.BoolVerboseMode )
 			g_print ("NOUVEAU PathNameFileCue = %s\n", PathNameFileCue);
-	}	
-	
+	}
+
 	fp = fopen (PathNameFileCue, "w");
-	
+
 	// PRODUCTION DU FICHIER CUE
 	if( TRUE == OptionsCommandLine.BoolVerboseMode )
 		g_print ("\n");
@@ -425,96 +431,101 @@
 	fprintf (fp, "PERFORMER \"%s\"\n", "CHANTEUR");
 	fprintf (fp, "TITLE \"%s\"\n", "TITRE DISQUE");
 	fprintf (fp, "FILE \"%s\" WAVE\n", NameFileWav);
-	
+
 	// DUREE TOTALE EXPRIMEE EN SECONDES
 	TimeSongSec = VarSplit.Tags->SecTime;
-	
+
 	for (IndicePoints = 0; VarSplit.Selecteur [ IndicePoints ] . Nmr != -1; IndicePoints ++) {
-		
+
 		fprintf (fp, " TRACK %02d AUDIO\n", IndicePoints +1);
 		fprintf (fp, " PERFORMER \"\"\n");
 		fprintf (fp, " TITLE \"Track_%02d\"\n", IndicePoints +1);
 		if (IndicePoints > 0) {
-			
+
 			// INDEX DE FIN
-			
+
 			Percent = VarSplit.Selecteur [ IndicePoints -1 ] . PercentEnd;
 			sec = (gint) (((gdouble)TimeSongSec * (gdouble)Percent) / 100.0);
 			dsec = ((gdouble)TimeSongSec *(gdouble)Percent) / 100.0;
 			hundr = ((gdouble)dsec - (gdouble)sec) * 100.0;
-			H = (sec / 60) / 60;
+			// H = (sec / 60) / 60;
 			M = (sec / 60) % 60;
 			S = sec % 60;
 			C = hundr;
-			
+
 			fprintf (fp, " INDEX 00 %02d:%02d:%02d\n", M, S, C);
 		}
-		
+
 		// INDEX DE DEBUT
-		
+
 		Percent = VarSplit.Selecteur [ IndicePoints ] . PercentBegin;
 		sec = (gint) (((gdouble)TimeSongSec * (gdouble)Percent) / 100.0);
 		dsec = ((gdouble)TimeSongSec *(gdouble)Percent) / 100.0;
 		hundr = ((gdouble)dsec - (gdouble)sec) * 100.0;
-		H = (sec / 60) / 60;
+		// H = (sec / 60) / 60;
 		M = (sec / 60) % 60;
 		S = sec % 60;
 		C = hundr;
-		
+
 		fprintf (fp, " INDEX 01 %02d:%02d:%02d\n", M, S, C);
 	}
 	fprintf (fp, "\n");
-	
+
 	fclose (fp);
-	
+
 	g_free (PathNameFileCue);	PathNameFileCue = NULL;
 	g_free (NameFileWav);		NameFileWav = NULL;
 }
-// 
-// 
-// 
+//
+//
+//
 void SplitCue_thread (void)
 {
 	SplitWav_extract();
-	
+
 	PRINT("FIN THREAD SPLIT EXTRACT");
 	conv.bool_thread_conv = FALSE;
 	pthread_exit(0);
 }
-// 
-// 
-// 
+//
+//
+//
 static gint SplitCue_timeout (gpointer data)
 {
 	if (TRUE == conv.bool_thread_conv) {
-	
+
 	}
-	else {		
+	else {
 		PRINT("FIN TIMEOUT SPLIT EXTRACT");
-		gtk_timeout_remove (conv.handler_timeout_conv);
-		
+		g_source_remove (conv.handler_timeout_conv);
+
 		WindScan_close ();
 	}
 	return (TRUE);
 }
-// 
-// 
-// 
+//
+//
+//
 void on_button_action_split_clicked (GtkButton *button, gpointer user_data)
 {
 	pthread_t nmr_tid;
-	
+
 	PRINT_FUNC_LF();
-		
-	WindScan_open ("Split file", WINDSCAN_PULSE);
+
+	// WindScan_open ("Split file", WINDSCAN_PULSE);
+	wind_scan_init(
+		WindMain,
+		"Split file",
+		WINDSCAN_PULSE
+		);
 	WindScan_set_label ("Split file ...");
 	conv_reset_struct (WindScan_close_request);
-	
+
 	conv.bool_thread_conv = TRUE;
 	PRINT("DEBUT THREAD SPLIT EXTRACT");
 	pthread_create (&nmr_tid, NULL ,(void *)SplitCue_thread, (void *)NULL);
 	PRINT("DEBUT TIMEOUT SPLIT EXTRACT");
-	conv.handler_timeout_conv = gtk_timeout_add (300, SplitCue_timeout, 0);
+	conv.handler_timeout_conv = g_timeout_add (300, SplitCue_timeout, 0);
 }

xcfa-4.2.8.tar.gz/src/split_selector.c -> xcfa-5.0.2.tar.gz/src/split_selector.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : split_selector.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <stdio.h>
 
@@ -138,7 +133,7 @@
 	else if (VarSplit.NbrSelecteurs > 1) {
 		
 		if (TRUE == AlsaPlay_is_play ()) {
-			StatusBar_set_mess( NOTEBOOK_SPLIT, _STATUSBAR_WARN_, _("Suppression pendant la lecture impossible") );
+			StatusBar_set_mess( NOTEBOOK_SPLIT, _STATUSBAR_WARN_, _("Deleting not during playback") );
 		}
 		else {
 			gint	Zone = 0;
@@ -215,6 +210,7 @@
 	gint			Cpt; 	
 	gdouble			PercentCursorX;
 	gint			Len;
+	GtkAllocation	allocation;
 
 	// PRINT_FUNC_LF();
 		
@@ -222,6 +218,7 @@
 	// 
 	// CAS 1 : CursorX < BEGIN_MIN
 	// 
+	gtk_widget_get_allocation( VarSplit.AdrWidgetSpectre, &allocation );
 	if (CursorX < SplitSelector_get_pos_begin (0)) {
 		
 		PRINT("CAS 1 : CursorX < BEGIN_MIN");
@@ -231,13 +228,13 @@
 		PercentCursorX = ((gdouble)CursorX / (gdouble)SplitSpectre_get_with() ) * 100.0;
 		Len = SplitSelector_get_diff_sec (0.0, PercentCursorX);
 		if (Len < 5) {
-			StatusBar_set_mess( NOTEBOOK_SPLIT, _STATUSBAR_WARN_, _("Temps inferieur a 5 secondes entre marqueur et curseur !") );
+			StatusBar_set_mess( NOTEBOOK_SPLIT, _STATUSBAR_WARN_, _("Time of less than 5 seconds between marker and cursor !") );
 			return;
 		}
 		
 		Len = SplitSelector_get_diff_sec (PercentCursorX, VarSplit.Selecteur [ 0 ] . PercentBegin);
 		if (Len < 5) {
-			StatusBar_set_mess( NOTEBOOK_SPLIT, _STATUSBAR_WARN_, _("Temps inferieur a 5 secondes entre marqueur et curseur !") );
+			StatusBar_set_mess( NOTEBOOK_SPLIT, _STATUSBAR_WARN_, _("Time of less than 5 seconds between marker and cursor !") );
 			return;
 		}
 		
@@ -291,13 +288,13 @@
 		PercentCursorX = ((gdouble)CursorX / (gdouble)SplitSpectre_get_with() ) * 100.0;
 		Len = SplitSelector_get_diff_sec (VarSplit.Selecteur [ 0 ] . PercentEnd, PercentCursorX);
 		if (Len < 5) {
-			StatusBar_set_mess( NOTEBOOK_SPLIT, _STATUSBAR_WARN_, _("Temps inferieur a 5 secondes entre marqueur et curseur !") );
+			StatusBar_set_mess( NOTEBOOK_SPLIT, _STATUSBAR_WARN_, _("Time of less than 5 seconds between marker and cursor !") );
 			return;
 		}
 		
 		Len = SplitSelector_get_diff_sec (PercentCursorX, 100.0);
 		if (Len < 5) {
-			StatusBar_set_mess( NOTEBOOK_SPLIT, _STATUSBAR_WARN_, _("Temps inferieur a 5 secondes entre marqueur et curseur !") );
+			StatusBar_set_mess( NOTEBOOK_SPLIT, _STATUSBAR_WARN_, _("Time of less than 5 seconds between marker and cursor !") );
 			return;
 		}
 		
@@ -354,14 +351,14 @@
 				Len = SplitSelector_get_diff_sec (VarSplit.Selecteur [ Cpt ] . PercentBegin, PercentCursorX);
 				if (Len < 5) {
 				PRINT("1- if (Len < 5) {");
-					StatusBar_set_mess( NOTEBOOK_SPLIT, _STATUSBAR_WARN_, _("Temps inferieur a 5 secondes entre marqueur et curseur !") );
+					StatusBar_set_mess( NOTEBOOK_SPLIT, _STATUSBAR_WARN_, _("Time of less than 5 seconds between marker and cursor !") );
 					return;
 				}
 				
 				Len = SplitSelector_get_diff_sec (PercentCursorX, VarSplit.Selecteur [ Cpt ] . PercentEnd);
 				if (Len < 5) {
 				PRINT("2- if (Len < 5) {");
-					StatusBar_set_mess( NOTEBOOK_SPLIT, _STATUSBAR_WARN_, _("Temps inferieur a 5 secondes entre marqueur et curseur !") );
+					StatusBar_set_mess( NOTEBOOK_SPLIT, _STATUSBAR_WARN_, _("Time of less than 5 seconds between marker and cursor !") );
 					return;
 				}
 		
@@ -431,13 +428,13 @@
 				PercentCursorX = ((gdouble)CursorX / (gdouble)SplitSpectre_get_with() ) * 100.0;
 				Len = SplitSelector_get_diff_sec (VarSplit.Selecteur [ Cpt ] . PercentEnd, PercentCursorX);
 				if (Len < 5) {
-					StatusBar_set_mess( NOTEBOOK_SPLIT, _STATUSBAR_WARN_, _("Temps inferieur a 5 secondes entre marqueur et curseur !") );
+					StatusBar_set_mess( NOTEBOOK_SPLIT, _STATUSBAR_WARN_, _("Time of less than 5 seconds between marker and cursor !") );
 					return;
 				}
 				
 				Len = SplitSelector_get_diff_sec (PercentCursorX, VarSplit.Selecteur [ Cpt +1 ] . PercentBegin);
 				if (Len < 5) {
-					StatusBar_set_mess( NOTEBOOK_SPLIT, _STATUSBAR_WARN_, _("Temps inferieur a 5 secondes entre marqueur et curseur !") );
+					StatusBar_set_mess( NOTEBOOK_SPLIT, _STATUSBAR_WARN_, _("Time of less than 5 seconds between marker and cursor !") );
 					return;
 				}
 		
@@ -492,12 +489,11 @@
 {	
 	gint		Cpt;
 	gint		sec;
-	gdouble		dsec;
+	// gdouble		dsec;
 	gdouble		TimeSongSec;
 	gdouble		Percent = 0.0;
-	gint		H, M, S, C;
-	// gchar		*Str = NULL;
-	gint		hundr;
+	gint		H, M, S;
+	// gint		hundr, C;
 	gint		Len = -1;
 	
 	if (NULL == VarSplit.Tags || VarSplit.NbrSelecteurs <= 0) {
@@ -512,12 +508,12 @@
 	for (Cpt = 0; ; Cpt ++) {
 		
 		sec = (gint) (((gdouble)TimeSongSec * (gdouble)Percent) / 100.0);
-		dsec = ((gdouble)TimeSongSec *(gdouble)Percent) / 100.0;
-		hundr = ((gdouble)dsec - (gdouble)sec) * 100.0;
+		// dsec = ((gdouble)TimeSongSec *(gdouble)Percent) / 100.0;
+		// hundr = ((gdouble)dsec - (gdouble)sec) * 100.0;
 		H = (sec / 60) / 60;
 		M = (sec / 60) % 60;
 		S = sec % 60;
-		C = hundr;
+		// C = hundr;
 		if (H == 0 && M == 0 && S == 5) {
 			Len = (gint)(((gdouble)SplitSpectre_get_with() * Percent) / 100.0);
 			break;
@@ -534,11 +530,11 @@
 {	
 	gint		Cpt;
 	gint		sec;
-	gdouble		dsec;
+	// gdouble		dsec;
 	gdouble		TimeSongSec;
 	gdouble		Percent = 0.0;
-	gint		H, M, S, C;
-	gint		hundr;
+	gint		H, M, S;
+	// gint		hundr, C;
 	
 	if (NULL == VarSplit.Tags || VarSplit.NbrSelecteurs <= 0) {
 		return (-1);
@@ -552,12 +548,12 @@
 	for (Cpt = 0; ; Cpt ++) {
 		
 		sec = (gint) (((gdouble)TimeSongSec * (gdouble)Percent) / 100.0);
-		dsec = ((gdouble)TimeSongSec *(gdouble)Percent) / 100.0;
-		hundr = ((gdouble)dsec - (gdouble)sec) * 100.0;
+		// dsec = ((gdouble)TimeSongSec *(gdouble)Percent) / 100.0;
+		// hundr = ((gdouble)dsec - (gdouble)sec) * 100.0;
 		H = (sec / 60) / 60;
 		M = (sec / 60) % 60;
 		S = sec % 60;
-		C = hundr;
+		// C = hundr;
 		if (H == 0 && M == 0 && S == p_secondes) {
 			return (Percent);
 		}
@@ -699,7 +695,9 @@
 	if (VarSplit.PercentActivePlay >= 0.0) {
 		
 		gint	SelPlay = SplitSelector_get_pos_play ();
+		GtkAllocation	allocation;
 		
+		gtk_widget_get_allocation( VarSplit.AdrWidgetSpectre, &allocation );
 		if (p_cursor_x > SelPlay -6 && p_cursor_x < SelPlay +7)
 			if (p_cursor_y > VARSPLIT_SPECTRE_Y + VARSPLIT_SPECTRE_H -12 && p_cursor_y < VARSPLIT_SPECTRE_Y + VARSPLIT_SPECTRE_H)
 				return (TRUE);
@@ -712,8 +710,10 @@
 {
 	if (VarSplit.PercentActivePlay >= 0.0) {
 		
+		GtkAllocation	allocation;
 		gint	SelPlay = SplitSelector_get_pos_play ();
-		
+	
+		gtk_widget_get_allocation( VarSplit.AdrWidgetSpectre, &allocation );
 		if (p_cursor_x == SelPlay ||
 		 p_cursor_x +1 == SelPlay ||
 		 p_cursor_x -1 == SelPlay) {
@@ -725,13 +725,12 @@
 }
 // 
 // 
-void SplitSelector_set_pos_play (gint p_play)
+void SplitSelector_set_pos_play( gint p_play )
 {
-	gint	With = SplitSpectre_get_with();
+	gint	With = SplitSpectre_get_with();
 	
 	if( p_play < 0 ) p_play = 0;
 	if( p_play > With ) p_play = With;
-	
 	VarSplit.PercentActivePlay = ((gdouble)p_play / (gdouble)With ) * 100.0;
 }

xcfa-4.2.8.tar.gz/src/split_spectre.c -> xcfa-5.0.2.tar.gz/src/split_spectre.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : split_spectre.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <math.h>
 #ifdef ENABLE_STATIC_LIBRARY
@@ -61,457 +56,216 @@
 // 
 gint SplitSpectre_get_with (void)
 {
-	return( VarSplit.AdrWidgetSpectre->allocation.width * Adjust.mul );
-	/*
-	if( 1 == Adjust.mul )
-		return( VarSplit.AdrWidgetSpectre->allocation.width * Adjust.mul );
-	return( VarSplit.MaxPointsInTab * Adjust.mul );
-	*/
+	GtkAllocation	allocation;
+	
+	gtk_widget_get_allocation( VarSplit.AdrWidgetSpectre, &allocation );
+	return( (allocation.width -1) * Adjust.mul );
 }
 // AFFICHAGE IMAGE CHRONO
 // 
-void SplitSpectre_draw_chrono ( GtkWidget *widget )
+void SplitSpectre_draw_chrono ( GtkWidget *widget, cairo_t *p_cr )
 {
-	GdkColor		gdk_color;
-	GdkColormap		*colormap;
-	GdkGC			*gc;
-	GdkPoint		poly [ 10 ];
-	PangoContext		*p_context = NULL;
-	PangoLayout		*layout = NULL;
-	PangoFontDescription	*fontdesc;
-	gint			layoutX = 0;
-	gint			layoutY = 0;
-	gint			CursorX, CursorY;
-	GdkModifierType		state;
+	GtkAllocation	allocation;
 	gint			ChronoX;
-	
+	gint			CursorX, CursorY;
+	gint			H, M, S;
+	gchar			*Str = NULL;
 	gint			sec;
-	gdouble			dsec;
 	gdouble			TimeSongSec;
 	gdouble			Percent;
-	gint			H, M, S, C;
-	gchar			*Str = NULL;
-	gint			hundr;
-	
-	/*
-	cairo_t		*cr;
-	
+
 	if (NULL == widget) return;
+
+	gtk_widget_get_allocation( widget, &allocation );
 	
-	cr = gdk_cairo_create( widget->window );
-	cairo_scale( cr, 1.0, 1.0 );
-	cairo_translate( cr, 0.0, 0.0 );
+	cairo_scale( p_cr, 1.0, 1.0 );
+	cairo_translate( p_cr, 0.0, 0.0 );
 	
-	// COLOR: 0 .. 255 -> PRG: colorname
-	gdouble	red, blue, green;
-		
 	// CLEAR PREVIEW SURFACE
-	// CRAYON_GRIS
-	red = 99
-	blue = 99
-	green = 99
-	cairo_set_source_rgb( cr, red/255.0, green/255.0, blue/255.0 );
-	cairo_rectangle( cr,
+	cairo_set_source_rgb( p_cr, 0.4, 0.4, 0.4 );
+	cairo_rectangle( p_cr,
 			 0,
 			 0,
-			 widget ->allocation.width,
-			 widget->allocation.height
+			 allocation.width,
+			 allocation.height
 			 );			
-	cairo_fill( cr );
+	cairo_fill( p_cr );
 	
-	// ECRITURE BARRE CHRONOLOGIQUE
-	// CRAYON_BLANC
-	red = 255
-	blue = 255
-	green = 255
-	cairo_set_source_rgb( cr, red/255.0, green/255.0, blue/255.0 );
-	
-#define SPLIT_TIME_CHRONO_ 80
-	for (ChronoX = 2; ChronoX +60 <= VARSPLIT_CHRONO_W +80; ChronoX += SPLIT_TIME_CHRONO_) {
-		if (ChronoX > 2) {
-			gdk_draw_line (
-				widget->window,
-				gc,
-				ChronoX -2,
-				VARSPLIT_CHRONO_Y,
-				ChronoX -2,
-				VARSPLIT_CHRONO_Y + VARSPLIT_CHRONO_H
-				);
-		}
-	}
-	
-	
-	cairo_paint( cr );
-	*/
-	
-	if (NULL == widget) return;
-
-	colormap = gdk_drawable_get_colormap (widget->window);
-	gc = gdk_gc_new (widget->window);
-	
-	// CLEAR
-	poly [ 0 ] . x = VARSPLIT_CHRONO_X;
-	poly [ 0 ] . y = VARSPLIT_CHRONO_Y;
-	poly [ 1 ] . x = VARSPLIT_CHRONO_X + VARSPLIT_CHRONO_W +1;
-	poly [ 1 ] . y = VARSPLIT_CHRONO_Y;
-	poly [ 2 ] . x = VARSPLIT_CHRONO_X + VARSPLIT_CHRONO_W +1;
-	poly [ 2 ] . y = VARSPLIT_CHRONO_Y + VARSPLIT_CHRONO_H +1;
-	poly [ 3 ] . x = VARSPLIT_CHRONO_Y;
-	poly [ 3 ] . y = VARSPLIT_CHRONO_Y + VARSPLIT_CHRONO_H +1;
-	poly [ 4 ] . x = VARSPLIT_CHRONO_X;
-	poly [ 4 ] . y = VARSPLIT_CHRONO_Y;
-	
-	CRAYON_GRIS
-	gdk_draw_polygon (
-		widget->window,
-		gc,
-		TRUE,
-		poly,
-		4
-		);
 #define SPLIT_TIME_CHRONO_ 80
-	// ECRITURE BARRE CHRONOLOGIQUE
-	CRAYON_BLANC
 	for (ChronoX = 2; ChronoX +60 <= VARSPLIT_CHRONO_W +80; ChronoX += SPLIT_TIME_CHRONO_) {
-		if (ChronoX > 2) {
-			gdk_draw_line (
-				widget->window,
-				gc,
-				ChronoX -2,
-				VARSPLIT_CHRONO_Y,
-				ChronoX -2,
-				VARSPLIT_CHRONO_Y + VARSPLIT_CHRONO_H
-				);
-		}
-		p_context = gtk_widget_get_pango_context (widget);
-		layout = pango_layout_new (p_context);
-		fontdesc = pango_font_description_from_string ("Times New Roman 8");
-		pango_layout_set_font_description (layout, fontdesc);
-		layoutX = ChronoX;
-		layoutY = VARSPLIT_CHRONO_Y + 3;
-
-		CursorX = (gint)VarSplit.AdjScroll->value;
-		CursorX += ChronoX;
-		CursorX -= 2;
+		if (ChronoX > 1) {
+			// CRAYON_BLANC
+			cairo_set_source_rgb( p_cr, 1.0, 1.0, 1.0 );
+			// EPAISSEUR
+			cairo_set_line_width( p_cr, 0.5 );
+			// HAUT
+			cairo_move_to( p_cr, ChronoX -2, 0.0 );
+			// BAS
+			cairo_rel_line_to( p_cr, 0.0, VARSPLIT_CHRONO_Y + VARSPLIT_CHRONO_H );
+			cairo_stroke ( p_cr );
+		
+			// TEXTE
+			CursorX = (gint)gtk_adjustment_get_value( VarSplit.AdjScroll );
+			CursorX += ChronoX;
+			CursorX -= 2;
+			
+			if (NULL != VarSplit.Tags) {
+				TimeSongSec = VarSplit.sec_in_time;
+			}
+			else {
+				TimeSongSec = 300;
+			}
+			Percent = ((gdouble)CursorX / (gdouble)SplitSpectre_get_with() ) * 100.0;
+			sec = (gint) (((gdouble)TimeSongSec * (gdouble)Percent) / 100.0);
+			// dsec = ((gdouble)TimeSongSec *(gdouble)Percent) / 100.0;
+			// hundr = ((gdouble)dsec - (gdouble)sec) * 100.0;
+			H = (sec / 60) / 60;
+			M = (sec / 60) % 60;
+			S = sec % 60;
+			Str = g_strdup_printf ("%02d:%02d:%02d", H, M, S);
+			
+			cairo_select_font_face( p_cr, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL );
+			cairo_set_font_size( p_cr, 10 );
+			cairo_move_to( p_cr, ChronoX +0, 13.);
+			cairo_show_text( p_cr, Str );
+			
+			g_free( Str );
+			Str = NULL;
 		
-		if (NULL != VarSplit.Tags) {
-			TimeSongSec = VarSplit.Tags->SecTime;
-		}
-		else {
-			TimeSongSec = 300;
 		}
-		Percent = ((gdouble)CursorX / (gdouble)SplitSpectre_get_with() ) * 100.0;
-		sec = (gint) (((gdouble)TimeSongSec * (gdouble)Percent) / 100.0);
-		dsec = ((gdouble)TimeSongSec *(gdouble)Percent) / 100.0;
-		hundr = ((gdouble)dsec - (gdouble)sec) * 100.0;
-		H = (sec / 60) / 60;
-		M = (sec / 60) % 60;
-		S = sec % 60;
-		C = hundr;
-		Str = g_strdup_printf ("%02d:%02d:%02d", H, M, S);
-
-		pango_layout_set_markup (layout, Str, -1);
-		gdk_draw_layout (
-			widget->window,
-			gc,
-			layoutX,
-			layoutY,
-			layout
-			);
-		g_object_unref (layout);
-		g_free (Str);
-		Str = NULL;
 	}
 	
-	gdk_window_get_pointer (widget->window, &CursorX, &CursorY, &state);
-	if (CursorX < VARSPLIT_CHRONO_X)
-		CursorX = VARSPLIT_CHRONO_X;
-	else if (CursorX > (VARSPLIT_CHRONO_X + VARSPLIT_CHRONO_W) -1)
-		CursorX = VARSPLIT_CHRONO_X + VARSPLIT_CHRONO_W;
-	
-	if (CursorY < VARSPLIT_CHRONO_Y)
-		CursorY = VARSPLIT_CHRONO_Y;
-	else if (CursorY > (VARSPLIT_CHRONO_Y + VARSPLIT_CHRONO_H) -1)
-		CursorY = VARSPLIT_CHRONO_Y + VARSPLIT_CHRONO_H;
-	
 	// REPAIR VERTICAL PARTIE HAUTE
-	if (VarSplit.NbrSelecteurs > 0) {
-		CRAYON_ROUGE
-		gdk_draw_line (
-			widget->window,
-			gc,
-			CursorX,
-			VARSPLIT_CHRONO_Y,
-			CursorX,
-			VARSPLIT_CHRONO_Y + VARSPLIT_CHRONO_H
-			);
-	}
-	gdk_gc_destroy (gc);
-	
-	// POSITION DU CURSEUR DANS LA FORME D ONDE
-	/*
-	if (NULL != VarSplit.Tags) {
-		TimeSongSec = VarSplit.Tags->SecTime;
-	}
-	else {
-		TimeSongSec = 300;
-	}
-	CursorX += (gint)Adj->value;
-	Percent = ((gdouble)CursorX / (gdouble)VarSplit.AdrWidgetSpectre->allocation.width) * 100.0;
-	sec = (gint) (((gdouble)TimeSongSec * (gdouble)Percent) / 100.0);
-	dsec = ((gdouble)TimeSongSec *(gdouble)Percent) / 100.0;
-	hundr = ((gdouble)dsec - (gdouble)sec) * 100.0;
-	H = (sec / 60) / 60;
-	M = (sec / 60) % 60;
-	S = sec % 60;
-	C = hundr;
-	gtk_label_set_use_markup (GTK_LABEL(GLADE_GET_OBJECT("label_temps_actuel_curseur_split")), TRUE);
-	if (VarSplit.NbrSelecteurs > 0) {
-		// Str = g_strdup_printf ("Codage en cours ...\n%02d:%02d:%02d.%02d", H, M, S, C);
-		Str = g_strdup_printf ("Codage en cours ...\n%02d:%02d:%02d", H, M, S);
-	}
-	else {
-		// Str = g_strdup ("Codage en cours ...\n00:00:00.00");
-		Str = g_strdup ("Codage en cours ...\n00:00:00");
+	if( VarSplit.NbrSelecteurs > 0 ) {
+		GdkModifierType		state;
+		GdkDeviceManager	*manager = gdk_display_get_device_manager( gdk_display_get_default() );
+		GdkDevice			*device = gdk_device_manager_get_client_pointer( manager );
+		gdk_window_get_device_position( gtk_widget_get_window(widget), device, &CursorX, &CursorY, &state );
+		// gdk_window_get_pointer( widget->window, &CursorX, &CursorY, &state );
+		
+		cairo_set_line_width( p_cr, 2 );
+		// CRAYON_ROUGE
+		cairo_set_source_rgb( p_cr, 1.0, 0.0, 0.0 );
+		cairo_move_to( p_cr, CursorX, 0.0 );
+		cairo_rel_line_to( p_cr, 0.0, VARSPLIT_CHRONO_Y + VARSPLIT_CHRONO_H );
+		cairo_stroke ( p_cr );
 	}
-	gtk_label_set_markup (GTK_LABEL(GLADE_GET_OBJECT("label_temps_actuel_curseur_split")), Str);
-	// g_print("%s\n", Str);
-	g_free (Str);
-	Str = NULL;
-	*/
 }
 // AFFICHAGE IMAGE TOP
 // 
-void SplitSpectre_draw_top ( GtkWidget *widget )
+void SplitSpectre_draw_top ( GtkWidget *widget, cairo_t *p_cr )
 {
-	GdkColor		gdk_color;
-	GdkColormap		*colormap;
-	GdkGC			*gc;
-	GdkPoint		poly [ 10 ];
+	GtkAllocation	allocation;
 	
+
 	if (NULL == widget) return;
+		
+	gtk_widget_get_allocation( widget, &allocation );
 	
-	colormap = gdk_drawable_get_colormap (widget->window);
-	gc = gdk_gc_new (widget->window);
-	
-	// CLEAR
-	poly [ 0 ] . x = VARSPLIT_SPECTRE_TOP_X;
-	poly [ 0 ] . y = VARSPLIT_SPECTRE_TOP_Y;
-	poly [ 1 ] . x = VARSPLIT_SPECTRE_TOP_X + VARSPLIT_SPECTRE_TOP_W +1;
-	poly [ 1 ] . y = VARSPLIT_SPECTRE_TOP_Y;
-	poly [ 2 ] . x = VARSPLIT_SPECTRE_TOP_X + VARSPLIT_SPECTRE_TOP_W +1;
-	poly [ 2 ] . y = VARSPLIT_SPECTRE_TOP_Y + VARSPLIT_SPECTRE_TOP_H +1;
-	poly [ 3 ] . x = VARSPLIT_SPECTRE_TOP_Y;
-	poly [ 3 ] . y = VARSPLIT_SPECTRE_TOP_Y + VARSPLIT_SPECTRE_TOP_H +1;
-	poly [ 4 ] . x = VARSPLIT_SPECTRE_TOP_X;
-	poly [ 4 ] . y = VARSPLIT_SPECTRE_TOP_Y;
+	cairo_scale( p_cr, 1.0, 1.0 );
+	cairo_translate( p_cr, 0.0, 0.0 );
 	
-	CRAYON_GRIS_CLAIR
-	gdk_draw_polygon (
-		widget->window,
-		gc,
-		TRUE,
-		poly,
-		4
-		);
-				
+	// CLEAR PREVIEW SURFACE
+	cairo_set_source_rgb( p_cr, 0.5, 0.5, 0.5 );
+	cairo_rectangle( p_cr,
+			 0,
+			 0,
+			 allocation.width,
+			 allocation.height
+			 );			
+	cairo_fill( p_cr );
 	if (VarSplit.NbrSelecteurs > 0) {
-		
+	
 		gint			begin = 0;
 		gint			Len;
+		gint			Cpt;
 		gint			SelBegin;
 		gint			SelEnd;
-		gint			Cpt;
 		gint			i;
-		PangoContext		*p_context = NULL;
-		PangoLayout		*layout = NULL;
-		PangoFontDescription 	*fontdesc;
-		gint			layoutX = 0;
-		gint			layoutY = 0;
+		GtkAllocation	allocation;
 		gchar			*Str = NULL;
 		
-		// PRINT_FUNC_LF();
-		begin = (gint)VarSplit.AdjScroll->value;
+		gtk_widget_get_allocation( widget, &allocation );
+
+		begin = (gint)gtk_adjustment_get_value( VarSplit.AdjScroll );
 		Len = SplitSpectre_get_with () + begin;
-		
+	
 		// DRAW ALL SELECTEURS
 		for (Cpt = 0; Cpt < MAX_SELECTEURS_SPLIT; Cpt ++) {
-								
-			// if (Cpt == VarSplit.SelecteurActif) continue;
+			
 			if (VarSplit.Selecteur [ Cpt ] . Nmr == -1) break;
 			
 			// FLECHE LIGNE DEBUT
-			SelBegin = SplitSelector_get_pos_begin (Cpt);
+			SelBegin = SplitSelector_get_pos_begin( Cpt );
 			if (SelBegin >= begin && SelBegin <= Len) {
 				
-				poly [ 0 ] . x = SelBegin;
-				CRAYON_NOIR
+				cairo_set_source_rgb( p_cr, 0.0, 0.0, 0.0 );
 				for (i = 0; i < 9; i++) {
-					gdk_draw_line (widget->window,
-							gc,
-							SelBegin - begin + i,
-							(VARSPLIT_SPECTRE_TOP_Y + 1) + i,
-							SelBegin - begin + i,
-							(VARSPLIT_SPECTRE_TOP_Y + 16) - i
-							);
+					cairo_move_to( p_cr, SelBegin - begin + i, 0.0 + i );
+					cairo_rel_line_to( p_cr, 0.0, allocation.height -(i*2) );
+					cairo_stroke ( p_cr );
 				}
-				
-				p_context = gtk_widget_get_pango_context (widget);
-				layout = pango_layout_new (p_context);
-				fontdesc = pango_font_description_from_string ("Times New Roman 9");
-				pango_layout_set_font_description (layout, fontdesc);
-				Str = g_strdup_printf("%d", Cpt +1);
-				layoutX = poly [ 0 ] . x + 10;
-				layoutY = VARSPLIT_SPECTRE_TOP_Y +2;
-				pango_layout_set_markup (layout, Str, -1);
-				CRAYON_NOIR
-				gdk_draw_layout (
-					widget->window,
-					gc,
-					layoutX - begin,
-					layoutY,
-					layout
-					);
-				g_free (Str);
-				Str = NULL;
-				g_object_unref (layout);
+				Str = g_strdup_printf("%d", Cpt );
+				cairo_select_font_face( p_cr, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL );
+				cairo_set_font_size( p_cr, 10 );
+				cairo_move_to( p_cr, SelBegin +10, 13.);
+				cairo_set_source_rgb( p_cr, 1.0, 1.0, 1.0 );
+				cairo_show_text( p_cr, Str );
+				g_free( Str );
+				Str = NULL;			
 			}
-			
 			// FLECHE LIGNE FIN
-			SelEnd = SplitSelector_get_pos_end (Cpt);
+			SelEnd = SplitSelector_get_pos_end( Cpt );
 			if (SelEnd > SelBegin && SelEnd > begin && SelEnd < Len) {
-				
-				poly [ 0 ] . x = SelEnd;
-				CRAYON_NOIR
+				cairo_set_source_rgb( p_cr, 0.0, 0.0, 0.0 );
 				for (i = 0; i < 9; i++) {
-					gdk_draw_line (widget->window,
-							gc,
-							SelEnd - begin - i,
-							(VARSPLIT_SPECTRE_TOP_Y + 1) + i,
-							SelEnd - begin - i,
-							(VARSPLIT_SPECTRE_TOP_Y + 16) - i
-							);
+					cairo_move_to( p_cr, SelEnd - begin - i, 0.0 + i );
+					cairo_rel_line_to( p_cr, 0.0, allocation.height -(i*2) );
+					cairo_stroke ( p_cr );
 				}
-				
-				p_context = gtk_widget_get_pango_context (widget);
-				layout = pango_layout_new (p_context);
-				fontdesc = pango_font_description_from_string ("Times New Roman 9");
-				pango_layout_set_font_description (layout, fontdesc);
-				Str = g_strdup_printf("%d", Cpt +1);
-				if (Cpt +1 < 10)
-					layoutX = poly [ 0 ] . x - 16;
-				else	layoutX = poly [ 0 ] . x - 21;
-				layoutY = VARSPLIT_SPECTRE_TOP_Y +2;
-				pango_layout_set_markup (layout, Str, -1);
-				CRAYON_NOIR
-				gdk_draw_layout (
-					widget->window,
-					gc,
-					layoutX - begin,
-					layoutY,
-					layout
-					);
-				g_free (Str);
-				Str = NULL;
-				g_object_unref (layout);
+				Str = g_strdup_printf("%d", Cpt );
+				cairo_select_font_face( p_cr, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL );
+				cairo_set_font_size( p_cr, 10 );
+				cairo_move_to( p_cr, SelEnd -24, 13.);
+				cairo_set_source_rgb( p_cr, 1.0, 1.0, 1.0 );
+				cairo_show_text( p_cr, Str );
+				g_free( Str );
+				Str = NULL;			
 			}
 		}
-		
 		// DRAW SELECTEUR ACTIF
 		// FLECHE LIGNE DEBUT
 		SelBegin = SplitSelector_get_pos_begin (VarSplit.SelecteurActif);
 		if (SelBegin >= begin && SelBegin < Len) {
-			poly [ 0 ] . x = SelBegin;
-			// 
-			CRAYON_ORANGE
+			cairo_set_source_rgb( p_cr, 244. / 255., 162. / 255., 87. / 255. );
 			for (i = 0; i < 9; i++) {
-				gdk_draw_line (widget->window,
-						gc,
-						SelBegin - begin + i,
-						(VARSPLIT_SPECTRE_TOP_Y + 1) + i,
-						SelBegin - begin + i,
-						(VARSPLIT_SPECTRE_TOP_Y + 16) - i
-						);
+				cairo_move_to( p_cr, SelBegin - begin + i, 0.0 + i );
+				cairo_rel_line_to( p_cr, 0.0, allocation.height -(i*2) );
+				cairo_stroke ( p_cr );
 			}
-			p_context = gtk_widget_get_pango_context (widget);
-			layout = pango_layout_new (p_context);
-			fontdesc = pango_font_description_from_string ("Times New Roman 9");
-			pango_layout_set_font_description (layout, fontdesc);
-			Str = g_strdup_printf("%d", VarSplit.SelecteurActif +1);
-			layoutX = poly [ 0 ] . x + 10;
-			layoutY = VARSPLIT_SPECTRE_TOP_Y +2;
-			pango_layout_set_markup (layout, Str, -1);
-			CRAYON_BLANC
-			gdk_draw_layout (
-				widget->window,
-				gc,
-				layoutX - begin,
-				layoutY,
-				layout
-				);
-			g_free (Str);
-			Str = NULL;
-			g_object_unref (layout);
 		}
-		
 		// FLECHE LIGNE FIN
 		SelEnd = SplitSelector_get_pos_end (VarSplit.SelecteurActif);	
 		if (SelEnd >= begin && SelEnd < Len) {
-			if (VarSplit.SelecteurActif == VarSplit.NbrSelecteurs -1) SelEnd --;
-			poly [ 0 ] . x = SelEnd;
-			// 
-			CRAYON_VERT
+			cairo_set_source_rgb( p_cr, 0.0, 1.0, 0.0 );
 			for (i = 0; i < 9; i++) {
-				gdk_draw_line (widget->window,
-						gc,
-						SelEnd - begin - i,
-						(VARSPLIT_SPECTRE_TOP_Y + 1) + i,
-						SelEnd - begin - i,
-						(VARSPLIT_SPECTRE_TOP_Y + 16) - i
-						);
-				}
-			p_context = gtk_widget_get_pango_context (widget);
-			layout = pango_layout_new (p_context);
-			fontdesc = pango_font_description_from_string ("Times New Roman 9");
-			pango_layout_set_font_description (layout, fontdesc);
-			Str = g_strdup_printf("%d", VarSplit.SelecteurActif +1);
-			if (VarSplit.SelecteurActif +1 < 10)
-				layoutX = poly [ 0 ] . x - 16;
-			else	layoutX = poly [ 0 ] . x - 21;
-			layoutY = VARSPLIT_SPECTRE_TOP_Y +2;
-			pango_layout_set_markup (layout, Str, -1);
-			CRAYON_BLANC
-			gdk_draw_layout (
-				widget->window,
-				gc,
-				layoutX - begin,
-				layoutY,
-				layout
-				);
-			g_free (Str);
-			Str = NULL;
-			g_object_unref (layout);
+				cairo_move_to( p_cr, SelEnd - begin - i, 0.0 + i );
+				cairo_rel_line_to( p_cr, 0.0, allocation.height -(i*2) );
+				cairo_stroke ( p_cr );
+			}
 		}
+			
+			
 	}
-	gdk_gc_destroy (gc);
-}
-// 
-// 
-void SplitSpectre_remove_draw (void)
-{
-	if (NULL != VarSplit.MaxScale_0) {	g_free (VarSplit.MaxScale_0);		VarSplit.MaxScale_0 = NULL; }
-	if (NULL != VarSplit.MinScale_0) {	g_free (VarSplit.MinScale_0);		VarSplit.MinScale_0 = NULL; }
-	if (NULL != VarSplit.MaxScale_1) {	g_free (VarSplit.MaxScale_1);		VarSplit.MaxScale_1 = NULL; }
-	if (NULL != VarSplit.MinScale_1) {	g_free (VarSplit.MinScale_1);		VarSplit.MinScale_1 = NULL; }
-	if (NULL != VarSplit.MaxScale_2) {	g_free (VarSplit.MaxScale_2);		VarSplit.MaxScale_2 = NULL; }
-	if (NULL != VarSplit.MinScale_2) {	g_free (VarSplit.MinScale_2);		VarSplit.MinScale_2 = NULL; }
 }
 // 
 // 
 void SplitSpectre_remove (void)
 {
-	if (NULL != VarSplit.Tab) {	g_free (VarSplit.Tab);	VarSplit.Tab = NULL; }
-	SplitSpectre_remove_draw ();
+	if (NULL != VarSplit.Tab) {
+		g_free( VarSplit.Tab );
+		VarSplit.Tab = NULL;
+	}
 	VarSplit.Tags = tagswav_remove_info (VarSplit.Tags);
 }
 // 
@@ -530,6 +284,9 @@
 // 	C'est peut être une option (un bouton) à cogiter pour une future mouture,
 // 	non ? M'est avis qu'not' Christophe serait pas contre...					
 // 
+// PS:
+// 	Et chose fut faite: MERCI Xavier :-)
+// 
 void SplitSpectre_search_blank_pass (void)
 {
 	gint		IndicePoints = -1;
@@ -667,6 +424,31 @@
 		g_print ("\n");
 	}
 }
+// GET NBR ALLOC
+//
+/**
+gint get_alloc( gchar *p_PathNameFile )
+{
+	WAVE		WaveHeader;
+	gint		Ret;
+	gint		points;
+	unsigned char	devbuf[ BLOCK_SIZE +10 ];
+	gint		Indice;
+	gint		ChannelNext;
+	
+	tagswav_read_file( p_PathNameFile, &WaveHeader );
+	ChannelNext = (WaveHeader.FMT.NumChannels -1) * (WaveHeader.FMT.BitsPerSample / 8);
+	points = 0;
+	while ((Ret = fread (devbuf, 1, BLOCK_SIZE, WaveHeader.file)) > 0) {
+		for (Indice = 0; Indice < Ret; Indice ++ ) {
+			Indice += ChannelNext;
+		}
+		points ++;
+	}
+	tagswav_close_file( &WaveHeader );
+	return( points );
+}
+*/
 // LECTURE FICHIER
 //
 gboolean SplitSpectre_read_file_spectre (gchar *PathNameFile)
@@ -682,18 +464,17 @@
 	unsigned char	devbuf[ BLOCK_SIZE +10 ];
 	WAVE		WaveHeader;
 	TYPE_FILE_IS	TypeFileIs = FILE_IS_NONE;
+	INFO_WAV		*Tags;
 
 	PRINT_FUNC_LF();
 	if( TRUE == OptionsCommandLine.BoolVerboseMode )
 		g_print("\t%s\n\n", PathNameFile);
 	
-	VarSplit.MaxPointsInTab = 0;
+	// VarSplit.MaxPointsInTab = get_alloc( PathNameFile );
+	
 	VarSplit.TypeFileIs = FILE_IS_NONE;
 	if (FILE_IS_WAV != (TypeFileIs = GetInfo_file_is (PathNameFile))) {
 		
-		// 
-		SplitSpectre_remove_draw ();
-		
 		// DEL ALLOC MEMORY
 		if (NULL != VarSplit.Tab) {
 			g_free (VarSplit.Tab);	VarSplit.Tab = NULL;
@@ -752,7 +533,8 @@
 	
 	if (found == TRUE) {
 			
-		VarSplit.TotalAllocation = sizeof(POINTS_FILE) * ((WaveHeader.DATA.Subchunk2Size / BLOCK_SIZE) +10);
+		VarSplit.TotalAllocation = sizeof(POINTS_FILE) * ((WaveHeader.DATA.Subchunk2Size / BLOCK_SIZE));
+		// VarSplit.TotalAllocation = sizeof(POINTS_FILE) * VarSplit.MaxPointsInTab;
 		VarSplit.Tab = (POINTS_FILE *)g_malloc0 (VarSplit.TotalAllocation + 10);
 		
 		points = 0;
@@ -775,7 +557,8 @@
 
 					min = max = 0;
 
-					for (Indice = 0; Indice < Ret; Indice++) {
+					// for (Indice = 0; Indice < Ret; Indice++) {
+					for( Indice = 0; Indice < Ret; ) {
 
 						if (WaveHeader.FMT.BitsPerSample == 8) {
 							
@@ -785,15 +568,14 @@
 						else if (WaveHeader.FMT.BitsPerSample == 16) {
 							
 							tmp = (gchar)devbuf [ Indice +1 ] << 8 | (gchar)devbuf [ Indice ];
-							Indice ++;
+							// Indice ++;
 						}
 						else if (WaveHeader.FMT.BitsPerSample == 24) {
 							
 							tmp = (gchar)devbuf [ Indice +0 ] >> 16;
 							tmp += (gchar)devbuf [ Indice +1 ] >> 8;
 							tmp += (gchar)devbuf [ Indice +2 ];
-														
-							Indice += 2;
+							// Indice += 2;
 						}
 						else if (WaveHeader.FMT.BitsPerSample == 32) {
 							
@@ -801,24 +583,20 @@
 							tmp += (gchar)devbuf [ Indice +1 ] >> 16;
 							tmp += (gchar)devbuf [ Indice +2 ] >> 8;
 							tmp += (gchar)devbuf [ Indice +3 ];
-							
-							Indice += 2;
+							// Indice += 2;
 						}
 						
-						if (tmp > max) {
-							
+						if( tmp > max )
 							max = tmp;
-						} else if (tmp <= min) {
-							
+						else if( tmp <= min )
 							min = tmp;
-						}
 
 						// skip over any extra channels
 						Indice += ChannelNext;
 					}
 					VarSplit.Tab [ points ].Min = min;
 					VarSplit.Tab [ points ].Max = max;
-
+					
 					points ++;
 				}
 				break;
@@ -853,8 +631,10 @@
 		}
 	}
 	
-	VarSplit.Tags = tagswav_remove_info (VarSplit.Tags);
-	VarSplit.Tags = (INFO_WAV *)tagswav_get_info (PathNameFile);
+	Tags = (INFO_WAV *)tagswav_get_info( PathNameFile );
+	VarSplit.sec_in_time = Tags->SecTime;
+	Tags = tagswav_remove_info( Tags );
+	Tags = NULL;
 	
 	// RECHEFCHE DES PLAGES SELON L IDEE DE @Dzef ;-)
 	SplitSpectre_search_blank_pass ();
@@ -870,427 +650,308 @@
 // 13 juillet 2009
 // 12 mars 2010
 // 
-void SplitSpectre_draw_lines (void)
+void SplitSpectre_draw_lines( GtkWidget *widget, cairo_t *p_cr )
 {
-	GdkColor		gdk_color;
-	GdkColormap		*colormap;
-	GdkGC			*gc;
+	GtkAllocation	allocation;
+	gint			points;
 	gint			y_min;
 	gint			y_max;
 	gint			xaxis;
 	gint			scale;
-	gint			points = 0;
 	gint			k;
 	gdouble			Percent;
-	gint			AdjValue;
-	gint			begin = 0;
-	gint			end = 0;
-	gint			save_begin = 0;
-	gboolean		BoolAllocateMemory = FALSE;
+	gdouble			SpectreGetWith;
+	gdouble			MaxScale_0_y;
+	gdouble			MinScale_0_y;
+	gint			Begin;
+	gint			save_begin;
+	gint			End;
 	gint			SelBegin = 0;
 	gint			SelEnd = 0;
 	gint			Len;
-	GdkPoint		poly [ 10 ];
-	gdouble			SpectreGetWith;
-	// static gint		Nbr = 0;
+	gboolean 		bool_cairo_stroke = FALSE;
+typedef struct {
+	gdouble r;
+	gdouble v;
+	gdouble b;
+} TAB_COLOR;
+TAB_COLOR tab_color[ 4 ] = 
+{
+	{ 23./255., 55./255., 93./255. },
+	{ 83./255., 142./255., 213./255. },
+	{ 141./255., 180./255., 227./255. },
+	{ 128./255., 128./255., 128./255. }
+};
+
+	if (NULL == widget) return;
 	
-	// PRINT_FUNC_LF();
+	gtk_widget_get_allocation( widget, &allocation );
+	cairo_scale( p_cr, 1.0, 1.0 );
+	cairo_translate( p_cr, allocation.x, allocation.y );
 	
-	// WAV if bitrate == 8 16 24 32
-	if (VarSplit.Tab != NULL && VarSplit.TypeFileIs == FILE_IS_WAV && VarSplit.MaxPointsInTab > 0) {
-		
-		// PRINT_FUNC_LF();
-		// g_print( "\tNbr = %d\n", Nbr++ );
-		
-		// OPEN DRAW
-		colormap = gdk_window_get_colormap (VarSplit.AdrWidgetSpectre->window);
-		gc = gdk_gc_new (VarSplit.AdrWidgetSpectre->window);
+	// CLEAR PREVIEW SURFACE
+	// CRAYON_GRIS
+	cairo_set_source_rgb( p_cr, 1.0, 1.0, 1.0 );
+	cairo_rectangle( p_cr,
+			 0,
+			 0,
+			 allocation.width,
+			 allocation.height
+			 );			
+	cairo_fill( p_cr );
+	cairo_paint( p_cr );
 	
-		// 
-		// NE PAS REALLOUER A CHAQUE FOIS !!!
-		// 
-		if (NULL == VarSplit.MaxScale_0) {
-			BoolAllocateMemory = TRUE;
+	if( NULL == VarSplit.Tab ) return;
+	
+	SpectreGetWith = SplitSpectre_get_with();
+	
+	xaxis = (allocation.height -1) / 2;
+
+	if (xaxis != 0) {
+		if (VarSplit.nBitsPerSample == 16) {
+			scale = SHRT_MAX / (xaxis -1);
+		} 
+		else {
+			scale = UCHAR_MAX / (xaxis -1);
 		}
-		if (VarSplit.TotalAllocationTabScreen < (sizeof(GdkPoint) * (VARSPLIT_SPECTRE_WITH + 20))) {
-			BoolAllocateMemory = TRUE;
+		if (scale == 0) {
+			scale = 1;
 		}
-		if (TRUE == BoolAllocateMemory) {
-			
-			SplitSpectre_remove_draw ();
+	} else {
+		scale = 1;
+	}
+	
+	// cairo_set_source_rgb( p_cr, 0.4, 0.4, 0.4 );
+	// EPAISSEUR
+	cairo_set_line_width( p_cr, 1 );
 
-			VarSplit.TotalAllocationTabScreen = sizeof(GdkPoint) * (VARSPLIT_SPECTRE_WITH + 20);
-			
-			VarSplit.MaxScale_0 = (GdkPoint *)g_malloc0 (VarSplit.TotalAllocationTabScreen);
-			VarSplit.MinScale_0 = (GdkPoint *)g_malloc0 (VarSplit.TotalAllocationTabScreen);
-			VarSplit.MaxScale_1 = (GdkPoint *)g_malloc0 (VarSplit.TotalAllocationTabScreen);
-			VarSplit.MinScale_1 = (GdkPoint *)g_malloc0 (VarSplit.TotalAllocationTabScreen);
-			VarSplit.MaxScale_2 = (GdkPoint *)g_malloc0 (VarSplit.TotalAllocationTabScreen);
-			VarSplit.MinScale_2 = (GdkPoint *)g_malloc0 (VarSplit.TotalAllocationTabScreen);
-		}
+/**
+	save_begin =
+	Begin = gtk_adjustment_get_value( VarSplit.AdjScroll );
+	Len = 
+	End = Begin + SpectreGetWith;
+	SelBegin = SplitSelector_get_pos_begin( VarSplit.SelecteurActif );
+	SelEnd = SplitSelector_get_pos_end( VarSplit.SelecteurActif );
+	
+	for( points = 0; Begin < End; Begin ++, points ++ ) {
 		
-		// LA LIGNE MEDIANE DU GRAPHE
-		// xaxis = HAUTEUR_WIDGET / 2;
-		xaxis = (VARSPLIT_SPECTRE_H) / 2;
-
-		if (xaxis != 0) {
-			if (VarSplit.nBitsPerSample == 16)
-				scale = SHRT_MAX / (xaxis -1);
-			else	scale = UCHAR_MAX / (xaxis -1);
-			if (scale == 0) {
-				scale = 1;
-			}
-		} else {
-			scale = 1;
+		if( points > VarSplit.MaxPointsInTab ) {
+			// printf("------------------------------- BREAK \n");
+			break;
 		}
+		Percent = ( (gdouble)Begin / SpectreGetWith ) * 100.;
+		k = ( Percent * (gdouble)VarSplit.MaxPointsInTab ) / 100.;
 		
-		// 
-		begin = 
-		save_begin =
-		AdjValue = (gint)VarSplit.AdjScroll->value;
-		Len = 
-		end = begin + VARSPLIT_SPECTRE_WITH;
-
-		// PRE - CALCUL
-		// 4.0.8~beta1
-		// Fri, 22 Apr 2011 15:03:02 +0200
-		SpectreGetWith = SplitSpectre_get_with();
+		if( k >= VarSplit.MaxPointsInTab )
+			k = VarSplit.MaxPointsInTab ;
 		
-		// Thu, 23 Sep 2010 21:32:41 +0200
-		for( points = 0; begin < end; begin ++, points ++ ) {
-			
-			Percent = ( (gdouble)begin / SpectreGetWith ) * 100.;
-			k = ( Percent * (gdouble)VarSplit.MaxPointsInTab ) / 100.;
+		y_max = xaxis - VarSplit.Tab[ k ].Max / scale;
+		y_min = xaxis + fabs( VarSplit.Tab[ k ].Min ) / scale;
+		
+		if (Begin >= SelBegin && Begin <= SelEnd) {
+			cairo_set_source_rgb( p_cr, tab_color[ 0 ].r, tab_color[ 0 ].v, tab_color[ 0 ].b );
+			MaxScale_0_y = y_max - (y_max - xaxis) * 0 / SAMPLE_SHADES;
+			MinScale_0_y = y_min + (xaxis - y_min) * 0 / SAMPLE_SHADES;		
+			cairo_move_to( p_cr, points, MinScale_0_y );
+			cairo_rel_line_to( p_cr, 0.0, (MaxScale_0_y - MinScale_0_y) <= 0 ? MaxScale_0_y - MinScale_0_y : 1 );
+			cairo_stroke ( p_cr );
 			
-			y_max = xaxis - VarSplit.Tab[ k ].Max / scale;
-			y_min = xaxis + fabs( VarSplit.Tab[ k ].Min ) / scale;
+			cairo_set_source_rgb( p_cr, tab_color[ 1 ].r, tab_color[ 1 ].v, tab_color[ 1 ].b );
+			MaxScale_0_y = y_max - (y_max - xaxis) * 1 / SAMPLE_SHADES - 1;
+			MinScale_0_y = y_min + (xaxis - y_min) * 1 / SAMPLE_SHADES - 1;			
+			cairo_move_to( p_cr, points, MinScale_0_y );
+			cairo_rel_line_to( p_cr, 0.0, (MaxScale_0_y - MinScale_0_y) <= 0 ? MaxScale_0_y - MinScale_0_y : 1 );
+			cairo_stroke ( p_cr );
 			
-			// shade = 0;
-			VarSplit.MaxScale_0 [ points ] . x = begin;
-			VarSplit.MaxScale_0 [ points ] . y = y_max - (y_max - xaxis) * 0 / SAMPLE_SHADES;
-			VarSplit.MinScale_0 [ points ] . x = begin;
-			VarSplit.MinScale_0 [ points ] . y = y_min + (xaxis - y_min) * 0 / SAMPLE_SHADES;
-
-			// shade = 1;
-			VarSplit.MaxScale_1 [ points ] . x = begin;
-			VarSplit.MaxScale_1 [ points ] . y = y_max - (y_max - xaxis) * 1 / SAMPLE_SHADES;
-			VarSplit.MinScale_1 [ points ] . x = begin;
-			VarSplit.MinScale_1 [ points ] . y = y_min + (xaxis - y_min) * 1 / SAMPLE_SHADES;
+			cairo_set_source_rgb( p_cr, tab_color[ 2 ].r, tab_color[ 2 ].v, tab_color[ 2 ].b );
+			MaxScale_0_y = y_max - (y_max - xaxis) * 2 / SAMPLE_SHADES - 1;
+			MinScale_0_y = y_min + (xaxis - y_min) * 2 / SAMPLE_SHADES - 1;			
+			cairo_move_to( p_cr, points, MinScale_0_y );
+			cairo_rel_line_to( p_cr, 0.0, (MaxScale_0_y - MinScale_0_y) <= 0 ? MaxScale_0_y - MinScale_0_y : 1 );
+			cairo_stroke ( p_cr );
+		}
+		else {
+			cairo_set_source_rgb( p_cr, 128./255., 128./255., 128./255. );
+			MaxScale_0_y = y_max - (y_max - xaxis) * 0 / SAMPLE_SHADES;
+			MinScale_0_y = y_min + (xaxis - y_min) * 0 / SAMPLE_SHADES;		
+			cairo_move_to( p_cr, points, MinScale_0_y );
+			cairo_rel_line_to( p_cr, 0.0, (MaxScale_0_y - MinScale_0_y) <= 0 ? MaxScale_0_y - MinScale_0_y : 1 );
+			cairo_stroke ( p_cr );
+		}
+	}
 
-			// shade = 2;
-			VarSplit.MaxScale_2 [ points ] . x = begin;
-			VarSplit.MaxScale_2 [ points ] . y = y_max - (y_max - xaxis) * 2 / SAMPLE_SHADES;
-			VarSplit.MinScale_2 [ points ] . x = begin;
-			VarSplit.MinScale_2 [ points ] . y = y_min + (xaxis - y_min) * 2 / SAMPLE_SHADES;
-			
-			// RECTIF HAUT
-			if (VarSplit.MaxScale_0 [ points ] . y < VARSPLIT_SPECTRE_Y) {
-				VarSplit.MaxScale_0 [ points ] . y = VARSPLIT_SPECTRE_Y;
-			}
-			// RECTIF BAS
-			if (VarSplit.MinScale_0 [ points ] . y > VARSPLIT_SPECTRE_H) {
-				VarSplit.MinScale_0 [ points ] . y = VARSPLIT_SPECTRE_H -1;
+*/
+
+	// 
+	// SELECT
+	// ... 0 / SAMPLE_SHADES
+	// 
+	save_begin =
+	Begin = gtk_adjustment_get_value( VarSplit.AdjScroll );
+	Len = 
+	End = Begin + SpectreGetWith;
+	SelBegin = SplitSelector_get_pos_begin( VarSplit.SelecteurActif );
+	SelEnd = SplitSelector_get_pos_end( VarSplit.SelecteurActif );
+	
+	cairo_set_source_rgb( p_cr, tab_color[ 0 ].r, tab_color[ 0 ].v, tab_color[ 0 ].b );
+	for( points = 0; Begin < End; Begin ++, points ++ ) {
+		
+		if( Begin >= SelBegin && Begin <= SelEnd ) {
+			if( points > VarSplit.MaxPointsInTab ) {
+				// printf("------------------------------- BREAK \n");
+				// break;
 			}
+			Percent = ( (gdouble)Begin / SpectreGetWith ) * 100.;
+			k = ( Percent * (gdouble)VarSplit.MaxPointsInTab ) / 100.;
 			
-			// RECTIF HAUT
-			if (VarSplit.MaxScale_1 [ points ] . y < VARSPLIT_SPECTRE_Y) {
-				VarSplit.MaxScale_1 [ points ] . y = VARSPLIT_SPECTRE_Y;
-			}
-			// RECTIF BAS
-			if (VarSplit.MinScale_1 [ points ] . y > VARSPLIT_SPECTRE_H) {
-				VarSplit.MinScale_1 [ points ] . y = VARSPLIT_SPECTRE_H -1;
-			}
+			if( k >= VarSplit.MaxPointsInTab )
+				k = VarSplit.MaxPointsInTab ;
 			
-			// RECTIF HAUT
-			if (VarSplit.MaxScale_2 [ points ] . y < VARSPLIT_SPECTRE_Y) {
-				VarSplit.MaxScale_2 [ points ] . y = VARSPLIT_SPECTRE_Y;
-			}
-			// RECTIF BAS
-			if (VarSplit.MinScale_2 [ points ] . y > VARSPLIT_SPECTRE_H) {
-				VarSplit.MinScale_2 [ points ] . y = VARSPLIT_SPECTRE_H -1;
-			}
-		}
+			y_max = xaxis - VarSplit.Tab[ k ].Max / scale;
+			y_min = xaxis + fabs( VarSplit.Tab[ k ].Min ) / scale;
 		
-		// (CLEAR) NETTOYER LA SURFACE
-		poly [ 0 ] . x = VARSPLIT_SPECTRE_X;
-		poly [ 0 ] . y = VARSPLIT_SPECTRE_Y;
-		poly [ 1 ] . x = VARSPLIT_SPECTRE_X + VARSPLIT_SPECTRE_W +1;
-		poly [ 1 ] . y = VARSPLIT_SPECTRE_Y;
-		poly [ 2 ] . x = VARSPLIT_SPECTRE_X + VARSPLIT_SPECTRE_W +1;
-		poly [ 2 ] . y = VARSPLIT_SPECTRE_Y + VARSPLIT_SPECTRE_H +1;
-		poly [ 3 ] . x = VARSPLIT_SPECTRE_X;
-		poly [ 3 ] . y = VARSPLIT_SPECTRE_Y + VARSPLIT_SPECTRE_H +1;
-		poly [ 4 ] . x = VARSPLIT_SPECTRE_X;
-		poly [ 4 ] . y = VARSPLIT_SPECTRE_Y;
-		CRAYON_BLANC
-		gdk_draw_polygon (
-			VarSplit.AdrWidgetSpectre->window,
-			gc,
-			TRUE,
-			poly,
-			4
-			);
+			MaxScale_0_y = y_max - (y_max - xaxis) * 0 / SAMPLE_SHADES;
+			MinScale_0_y = y_min + (xaxis - y_min) * 0 / SAMPLE_SHADES;		
+			cairo_move_to( p_cr, points, MinScale_0_y );
+			cairo_rel_line_to( p_cr, 0.0, (MaxScale_0_y - MinScale_0_y) <= 0 ? MaxScale_0_y - MinScale_0_y : 1 );
+			bool_cairo_stroke = TRUE;
+		}	
+	}
+	if( bool_cairo_stroke )
+		cairo_stroke ( p_cr );
+	// 
+	// SELECT
+	// ... 1 / SAMPLE_SHADES
+	// 
+	bool_cairo_stroke = FALSE;
+	Begin = save_begin;
+	cairo_set_source_rgb( p_cr, tab_color[ 1 ].r, tab_color[ 1 ].v, tab_color[ 1 ].b );
+	for( points = 0; Begin < End; Begin ++, points ++ ) {
 		
-		SelBegin = SplitSelector_get_pos_begin (VarSplit.SelecteurActif);
-		SelEnd = SplitSelector_get_pos_end (VarSplit.SelecteurActif);
-		begin = save_begin;
-				
-		for (points = 0; begin < end; begin ++, points ++) { 		
-			
-			// MaxScale_0
-			if (begin >= SelBegin && begin <= SelEnd) {
-				CRAYON_BLEU		// LA SELECTION
-			} else {
-				CRAYON_NOIR		// LA NON SELECTION
+		if (Begin >= SelBegin && Begin <= SelEnd) {
+			if( points > VarSplit.MaxPointsInTab ) {
+				// printf("------------------------------- BREAK \n");
+				// break;
 			}
-			gdk_draw_line (VarSplit.AdrWidgetSpectre->window,
-					gc,
-					points,
-					VarSplit.MaxScale_0 [ points ] . y,
-					points,
-					VarSplit.MinScale_0 [ points ] . y
-					);
+			Percent = ( (gdouble)Begin / SpectreGetWith ) * 100.;
+			k = ( Percent * (gdouble)VarSplit.MaxPointsInTab ) / 100.;
 			
-			// MaxScale_1
-			if (begin >= SelBegin && begin <= SelEnd) {
-				CRAYON_BLEU_CLAIR	// LA SELECTION
-			} else {
-				CRAYON_GRIS		// LA NON SELECTION
-			}
-			gdk_draw_line (VarSplit.AdrWidgetSpectre->window,
-					gc,
-					points,
-					VarSplit.MaxScale_1 [ points ] . y,
-					points,
-					VarSplit.MinScale_1 [ points ] . y
-					);
+			if( k >= VarSplit.MaxPointsInTab )
+				k = VarSplit.MaxPointsInTab ;
 			
-			// MaxScale_2
-			if (begin >= SelBegin && begin <= SelEnd) {
-				CRAYON_BLEU_CLAIR_PLUS	// LA SELECTION
-			} else {
-				CRAYON_GRIS_CLAIR	// LA NON SELECTION
-			}
-			gdk_draw_line (VarSplit.AdrWidgetSpectre->window,
-					gc,
-					points,
-					VarSplit.MaxScale_2 [ points ] . y,
-					points,
-					VarSplit.MinScale_2 [ points ] . y
-					);
-		}
-				
-		// AFFICHE CURSEUR DEBUT
-		if (SelBegin >= save_begin && SelBegin < Len) {
-			CRAYON_ORANGE
-			gdk_draw_line (
-				VarSplit.AdrWidgetSpectre->window,
-				gc,
-				SelBegin -save_begin,
-				VARSPLIT_SPECTRE_Y,
-				SelBegin - save_begin,
-				VARSPLIT_SPECTRE_Y + VARSPLIT_SPECTRE_H
-				);
-		}
+			y_max = xaxis - VarSplit.Tab[ k ].Max / scale;
+			y_min = xaxis + fabs( VarSplit.Tab[ k ].Min ) / scale;
 		
-		// AFFICHE CURSEUR FIN
-		if (VarSplit.SelecteurActif == VarSplit.NbrSelecteurs -1) SelEnd --;
-		if (SelEnd >= save_begin && SelEnd < Len) {
-			CRAYON_VERT
-			gdk_draw_line (
-				VarSplit.AdrWidgetSpectre->window,
-				gc,
-				SelEnd - save_begin,
-				VARSPLIT_SPECTRE_Y,
-				SelEnd - save_begin,
-				VARSPLIT_SPECTRE_Y + VARSPLIT_SPECTRE_H
-				);
-		}
+			MaxScale_0_y = y_max - (y_max - xaxis) * 1 / SAMPLE_SHADES - 1;
+			MinScale_0_y = y_min + (xaxis - y_min) * 1 / SAMPLE_SHADES - 1;			
+			cairo_move_to( p_cr, points, MinScale_0_y );
+			cairo_rel_line_to( p_cr, 0.0, (MaxScale_0_y - MinScale_0_y) <= 0 ? MaxScale_0_y - MinScale_0_y : 1 );
+			bool_cairo_stroke = TRUE;
+		}	
+	}
+	if( bool_cairo_stroke )
+		cairo_stroke ( p_cr );
+	// 
+	// SELECT
+	// ... 2 / SAMPLE_SHADES
+	// 
+	bool_cairo_stroke = FALSE;
+	Begin = save_begin;
+	cairo_set_source_rgb( p_cr, tab_color[ 2 ].r, tab_color[ 2 ].v, tab_color[ 2 ].b );
+	for( points = 0; Begin < End; Begin ++, points ++ ) {
 		
-		// AFFICHE LE CURSEUR AUDIO
-		if (VarSplit.PercentActivePlay >= 0.0) {
-			MarkerOld = (gint)(((gdouble)SplitSpectre_get_with() * VarSplit.PercentActivePlay) / 100.0);
-			if (MarkerOld >= save_begin && MarkerOld < Len) {
-				CRAYON_ROUGE
-				gdk_draw_line (
-					VarSplit.AdrWidgetSpectre->window,
-					gc,
-					MarkerOld - save_begin,
-					VARSPLIT_SPECTRE_Y,
-					MarkerOld - save_begin,
-					VARSPLIT_SPECTRE_Y + VARSPLIT_SPECTRE_H -2
-					);
-				gdk_draw_rectangle (
-					VarSplit.AdrWidgetSpectre->window,
-					gc,
-					TRUE,
-					MarkerOld - save_begin -6,
-					VARSPLIT_SPECTRE_Y + VARSPLIT_SPECTRE_H -12,
-					14,
-					12
-					);
+		if (Begin >= SelBegin && Begin <= SelEnd) {
+			if( points > VarSplit.MaxPointsInTab ) {
+				// printf("------------------------------- BREAK \n");
+				// break;
 			}
-		}
-		
-		// CLOSE DRAW
-		gdk_gc_destroy (gc);
-	}
-}
-// AFFICHAGE DU CURSEUR EN MODE PLAY: GAIN DE TEMPS POUR LE CPU
-//
-void SplitSpectre_draw_lines_play( void )
-{
-	GdkColor		gdk_color;
-	GdkColormap		*colormap;
-	GdkGC			*gc;
-	gint			points = 0;
-	gint			AdjValue;
-	gint			begin = 0;
-	gint			end = 0;
-	gint			save_begin = 0;
-	gint			SelBegin = 0;
-	gint			SelEnd = 0;
-	gint			Len;
-	gint			Marker;
-	
-	// WAV if bitrate == 8 16 24 32
-	if (VarSplit.Tab != NULL && VarSplit.TypeFileIs == FILE_IS_WAV && VarSplit.MaxPointsInTab > 0) {
+			Percent = ( (gdouble)Begin / SpectreGetWith ) * 100.;
+			k = ( Percent * (gdouble)VarSplit.MaxPointsInTab ) / 100.;
 			
-		// PRINT_FUNC_LF();
-		
-		// OPEN DRAW
-		colormap = gdk_window_get_colormap (VarSplit.AdrWidgetSpectre->window);
-		gc = gdk_gc_new (VarSplit.AdrWidgetSpectre->window);
+			if( k >= VarSplit.MaxPointsInTab )
+				k = VarSplit.MaxPointsInTab ;
 			
-		// 
-		begin = 
-		save_begin =
-		AdjValue = (gint)VarSplit.AdjScroll->value;
-		Len = 
-		end = begin + VARSPLIT_SPECTRE_WITH;
+			y_max = xaxis - VarSplit.Tab[ k ].Max / scale;
+			y_min = xaxis + fabs( VarSplit.Tab[ k ].Min ) / scale;
 		
-		Marker = (gint)(((gdouble)SplitSpectre_get_with() * VarSplit.PercentActivePlay) / 100.0);
-		SelBegin = SplitSelector_get_pos_begin (VarSplit.SelecteurActif);
-		SelEnd = SplitSelector_get_pos_end (VarSplit.SelecteurActif);
-		begin = save_begin;
+			MaxScale_0_y = y_max - (y_max - xaxis) * 2 / SAMPLE_SHADES - 1;
+			MinScale_0_y = y_min + (xaxis - y_min) * 2 / SAMPLE_SHADES - 1;			
+			cairo_move_to( p_cr, points, MinScale_0_y );
+			cairo_rel_line_to( p_cr, 0.0, (MaxScale_0_y - MinScale_0_y) <= 0 ? MaxScale_0_y - MinScale_0_y : 1 );
+			bool_cairo_stroke = TRUE;
+		}	
+	}
+	if( bool_cairo_stroke )
+		cairo_stroke ( p_cr );
+	// 
+	// NO SELECT
+	// ... 2 / SAMPLE_SHADES
+	// 
+	Begin = save_begin;
+	cairo_set_source_rgb( p_cr, tab_color[ 3 ].r, tab_color[ 3 ].v, tab_color[ 3 ].b );
+	for( points = 0; Begin < End; Begin ++, points ++ ) {
 		
-		if( -1 == MarkerOld )
-			MarkerOld = ( Marker - 20 );
-		else	MarkerOld -= 20;
-
-		for (points = 0; begin < end; begin ++, points ++) { 
-			
-			if( begin < MarkerOld || begin > Marker +20 ) {
-				continue;
-			}
-			
-			CRAYON_BLANC
-			gdk_draw_line (VarSplit.AdrWidgetSpectre->window,
-					gc,
-					points,
-					VARSPLIT_SPECTRE_Y,
-					points,
-					VARSPLIT_SPECTRE_Y + VARSPLIT_SPECTRE_H +1
-					);
-			
-			// MaxScale_0
-			if (begin >= SelBegin && begin <= SelEnd) {
-				CRAYON_BLEU		// LA SELECTION
-			} else {
-				CRAYON_NOIR		// LA NON SELECTION
+		if (Begin < SelBegin || Begin > SelEnd) {
+			if( points > VarSplit.MaxPointsInTab ) {
+				// printf("------------------------------- BREAK \n");
+				// break;
 			}
-			gdk_draw_line (VarSplit.AdrWidgetSpectre->window,
-					gc,
-					points,
-					VarSplit.MaxScale_0 [ points ] . y,
-					points,
-					VarSplit.MinScale_0 [ points ] . y
-					);
+			Percent = ( (gdouble)Begin / SpectreGetWith ) * 100.;
+			k = ( Percent * (gdouble)VarSplit.MaxPointsInTab ) / 100.;
 			
-			// MaxScale_1
-			if (begin >= SelBegin && begin <= SelEnd) {
-				CRAYON_BLEU_CLAIR	// LA SELECTION
-			} else {
-				CRAYON_GRIS		// LA NON SELECTION
-			}
-			gdk_draw_line (VarSplit.AdrWidgetSpectre->window,
-					gc,
-					points,
-					VarSplit.MaxScale_1 [ points ] . y,
-					points,
-					VarSplit.MinScale_1 [ points ] . y
-					);
+			if( k >= VarSplit.MaxPointsInTab )
+				k = VarSplit.MaxPointsInTab ;
 			
-			// MaxScale_2
-			if (begin >= SelBegin && begin <= SelEnd) {
-				CRAYON_BLEU_CLAIR_PLUS	// LA SELECTION
-			} else {
-				CRAYON_GRIS_CLAIR	// LA NON SELECTION
-			}
-			gdk_draw_line (VarSplit.AdrWidgetSpectre->window,
-					gc,
-					points,
-					VarSplit.MaxScale_2 [ points ] . y,
-					points,
-					VarSplit.MinScale_2 [ points ] . y
-					);
-		}
-				
-		// AFFICHE CURSEUR DEBUT
-		if (SelBegin >= save_begin && SelBegin < Len) {
-			CRAYON_ORANGE
-			gdk_draw_line (
-				VarSplit.AdrWidgetSpectre->window,
-				gc,
-				SelBegin -save_begin,
-				VARSPLIT_SPECTRE_Y,
-				SelBegin - save_begin,
-				VARSPLIT_SPECTRE_Y + VARSPLIT_SPECTRE_H
-				);
-		}
-		
-		// AFFICHE CURSEUR FIN
-		if (VarSplit.SelecteurActif == VarSplit.NbrSelecteurs -1) SelEnd --;
-		if (SelEnd >= save_begin && SelEnd < Len) {
-			CRAYON_VERT
-			gdk_draw_line (
-				VarSplit.AdrWidgetSpectre->window,
-				gc,
-				SelEnd - save_begin,
-				VARSPLIT_SPECTRE_Y,
-				SelEnd - save_begin,
-				VARSPLIT_SPECTRE_Y + VARSPLIT_SPECTRE_H
-				);
-		}
+			y_max = xaxis - VarSplit.Tab[ k ].Max / scale;
+			y_min = xaxis + fabs( VarSplit.Tab[ k ].Min ) / scale;
 		
-		// AFFICHE LE CURSEUR AUDIO
-		if (VarSplit.PercentActivePlay >= 0.0) {
-			if (Marker >= save_begin && Marker < Len) {
-				CRAYON_ROUGE
-				gdk_draw_line (
-					VarSplit.AdrWidgetSpectre->window,
-					gc,
-					Marker - save_begin,
-					VARSPLIT_SPECTRE_Y,
-					Marker - save_begin,
-					VARSPLIT_SPECTRE_Y + VARSPLIT_SPECTRE_H -2
-					);
-				gdk_draw_rectangle (
-					VarSplit.AdrWidgetSpectre->window,
-					gc,
-					TRUE,
-					Marker - save_begin -6,
-					VARSPLIT_SPECTRE_Y + VARSPLIT_SPECTRE_H -12,
-					14,
-					12
-					);
+			MaxScale_0_y = y_max - (y_max - xaxis) * 0 / SAMPLE_SHADES;
+			MinScale_0_y = y_min + (xaxis - y_min) * 0 / SAMPLE_SHADES;		
+			cairo_move_to( p_cr, points, MinScale_0_y );
+			cairo_rel_line_to( p_cr, 0.0, (MaxScale_0_y - MinScale_0_y) <= 0 ? MaxScale_0_y - MinScale_0_y : 1 );
+			bool_cairo_stroke = TRUE;
+		}	
+	}
+	if( bool_cairo_stroke )
+		cairo_stroke ( p_cr );
+
+	// 	SelBegin = SplitSelector_get_pos_begin (VarSplit.SelecteurActif);
+	// 	SelEnd = SplitSelector_get_pos_end (VarSplit.SelecteurActif);
+	
+	// LIGNE SELECTEUR ACTIF DEBUT
+	if (SelBegin >= save_begin && SelBegin < Len) {
+		cairo_set_source_rgb( p_cr, 244. / 255., 162. / 255., 87. / 255. );
+		cairo_move_to( p_cr, SelBegin - save_begin, 0.0 );
+		cairo_rel_line_to( p_cr, 0.0, allocation.height );
+		cairo_stroke ( p_cr );
+	}
+	
+	// LIGNE SELECTEUR ACTIF FIN
+	if (VarSplit.SelecteurActif == VarSplit.NbrSelecteurs -1) SelEnd --;
+	if (SelEnd >= save_begin && SelEnd < Len) {
+		cairo_set_source_rgb( p_cr, 0.0, 1.0, 0.0 );
+		cairo_move_to( p_cr, SelEnd - save_begin, 0.0 );
+		cairo_rel_line_to( p_cr, 0.0, allocation.height );
+		cairo_stroke ( p_cr );
+	}
+	
+	// AFFICHE LE CURSEUR AUDIO
+	if (VarSplit.PercentActivePlay >= 0.0) {
+		MarkerOld = (gint)(((gdouble)SplitSpectre_get_with() * VarSplit.PercentActivePlay) / 100.0);
+		if( MarkerOld < save_begin ) MarkerOld = save_begin + 1;
+		if( MarkerOld > Len-4 ) MarkerOld = Len - 4;
+		if (MarkerOld >= save_begin && MarkerOld < Len ) {
+			cairo_set_source_rgb( p_cr, 1.0, 0.0, 0.0 );
+			cairo_move_to( p_cr, MarkerOld - save_begin, 0.0 );
+			cairo_rel_line_to( p_cr, 0.0, allocation.height );
+			cairo_stroke ( p_cr );
+			MarkerOld -= 6;
+			for( points = 0; points <= 12; points ++ ) {
+				cairo_move_to( p_cr, points + (MarkerOld - save_begin ), allocation.height -12 );
+				cairo_rel_line_to( p_cr, 0.0, 12 );
+				cairo_stroke ( p_cr );
 			}
 		}
-		
-		// CLOSE DRAW
-		gdk_gc_destroy (gc);
-
-		MarkerOld = Marker;
 	}
 }
 
@@ -1314,3 +975,4 @@
 
 
 
+

xcfa-4.2.8.tar.gz/src/split_wav.c -> xcfa-5.0.2.tar.gz/src/split_wav.c Changed

xcfa-4.2.8.tar.gz/src/statusbar.c -> xcfa-5.0.2.tar.gz/src/statusbar.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : statusbar.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <sys/time.h>
 
@@ -75,7 +70,7 @@
 	
 	if( VarStatusBar.stop.tv_sec - VarStatusBar.start.tv_sec > 3 ) {
 		
-		gtk_timeout_remove( VarStatusBar.handler_timeout_conv );
+		g_source_remove( VarStatusBar.handler_timeout_conv );
 		
 		if( _STATUSBAR_ERR_ == VarStatusBar.StatusMess ) {
 			g_free( StatusBar [ VarStatusBar.NoteBook_which ] . MessError );	StatusBar [ VarStatusBar.NoteBook_which ] . MessError = NULL;
@@ -98,7 +93,7 @@
 		VarStatusBar.StatusMess = p_StatusMess;
 		VarStatusBar.bool_timer_activate = TRUE;
 		gettimeofday( &VarStatusBar.start, NULL );
-		VarStatusBar.handler_timeout_conv = gtk_timeout_add( 2, StatusBar_timeout, 0 );
+		VarStatusBar.handler_timeout_conv = g_timeout_add( 2, StatusBar_timeout, 0 );
 	}
 }
 //

xcfa-4.2.8.tar.gz/src/statusbar.h -> xcfa-5.0.2.tar.gz/src/statusbar.h Changed

@@ -1,9 +1,9 @@
  /*
  *  file      : statusbar.h
  *  project   : xcfa
- *  with      : Gtk-2
+ *  with      : Gtk-3
  *
- *  copyright : (C) 2003 - 2012 by Claude Bulin
+ *  copyright : (C) 2003 - 2015 by Claude Bulin
  *
  *  xcfa - GTK+ implementation of the GNU shell command
  *  GNU General Public License
@@ -33,30 +33,30 @@
 
 typedef enum
 {
-	_STATUSBAR_SIMPLE_ = 0,				// 
-	_STATUSBAR_WARN_,				// 
-	_STATUSBAR_ERR_					// 
+	_STATUSBAR_SIMPLE_ = 0,					// 
+	_STATUSBAR_WARN_,						// 
+	_STATUSBAR_ERR_							// 
 } STATUS_BAR_MESS;
 
 typedef struct {
-	gchar		*Mess;				// Type: _STATUSBAR_SIMPLE_
-	gchar		*MessWarn;			// Type: _STATUSBAR_WARN_
-	gchar		*MessError;			// Type: _STATUSBAR_ERR_
+	gchar		*Mess;						// Type: _STATUSBAR_SIMPLE_
+	gchar		*MessWarn;					// Type: _STATUSBAR_WARN_
+	gchar		*MessError;					// Type: _STATUSBAR_ERR_
 } STATUSBAR_MESS;
 
 STATUSBAR_MESS	StatusBar [ NOTEBOOK_PRGEXTERNES +2 ];	// #define NOTEBOOK_DVD_AUDIO	0
-							// #define NOTEBOOK_CD_AUDIO	1
-							// #define NOTEBOOK_FICHIERS	2
-							// #define NOTEBOOK_SPLIT	3
-							// #define NOTEBOOK_POCHETTE	4
-							// #define NOTEBOOK_OPTIONS	5
-							// #define NOTEBOOK_PRGEXTERNES	6
+											// #define NOTEBOOK_CD_AUDIO	1
+											// #define NOTEBOOK_FICHIERS	2
+											// #define NOTEBOOK_SPLIT	3
+											// #define NOTEBOOK_POCHETTE	4
+											// #define NOTEBOOK_OPTIONS	5
+											// #define NOTEBOOK_PRGEXTERNES	6
 
 void	StatusBar_remove( void );
 void 	StatusBar_set_mess(
-			gint		p_which,	// NOTEBOOK_DVD_AUDIO .. NOTEBOOK_PRGEXTERNES
+			gint		p_which,			// NOTEBOOK_DVD_AUDIO .. NOTEBOOK_PRGEXTERNES
 			STATUS_BAR_MESS	p_StatusMess,	// _STATUSBAR_SIMPLE_ || _STATUSBAR_WARN_ || _STATUSBAR_ERR_
-			gchar		*p_mess		// Message
+			gchar		*p_mess				// Message
 			);
 void	StatusBar_puts( void );

xcfa-4.2.8.tar.gz/src/tags.c -> xcfa-5.0.2.tar.gz/src/tags.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : tags.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <pthread.h>
 #include <sys/types.h>
@@ -166,7 +161,7 @@
 gchar *tags_get_time (gchar *namefile)
 {
 	TagLib_File *file;
-	TagLib_Tag *tag;
+	// TagLib_Tag *tag;
 	const TagLib_AudioProperties *properties;
 	gint seconds;
 	gint minutes;
@@ -175,7 +170,8 @@
 	if ((file = taglib_file_new (namefile))) {
 	
 		taglib_set_strings_unicode(FALSE);
-		tag = taglib_file_tag(file);
+		// tag = taglib_file_tag(file);
+		taglib_file_tag(file);
 		properties = taglib_file_audioproperties(file);
 		
 		seconds = taglib_audioproperties_length(properties) % 60;
@@ -406,8 +402,7 @@
 	gint i;
 	
 	for (i=0; StructTagsFileMp3[ i ].num != -1; i++)
-		gtk_combo_box_append_text (GTK_COMBO_BOX (widget), StructTagsFileMp3[ i ].name);
-	
+		gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), StructTagsFileMp3[ i ].name);
 }
 // 
 //

xcfa-4.2.8.tar.gz/src/tags.h -> xcfa-5.0.2.tar.gz/src/tags.h Changed

@@ -1,9 +1,9 @@
  /*
  *  file    : tags.h
  *  project   : xcfa
- *  with      : Gtk-2
+ *  with      : Gtk-3
  *
- *  copyright :( C) 2003 - 2012 by Claude Bulin
+ *  copyright : (C) 2003 - 2015 by Claude Bulin
  *
  *  xcfa - GTK+ implementation of the GNU shell command
  *  GNU General Public License
@@ -33,39 +33,48 @@
 #include "file.h"
 
 
+typedef enum {
+	TAG_WAVE_IS_NONE = 0,
+	TAG_WAVE_IS_FMT,
+	TAG_WAVE_IS_BEXT
+} TAG_WAV_IS_FMT_BEXT;
+
+
 typedef struct {  
 
 	struct {  
-		char	ChunkID[4];	//(  4 octets) : contient les lettres "RIFF" pour indiquer que le fichier est codé selon la norme RIFF  
-		guint32 ChunkSize;	//(  4 octets) : taille du fichier entier en octets( sans compter les 8 octets de ce champ et le champ précédent CunkID  
-		char	Format[4];	//(  4 octets) : correspond au format du fichier donc ici, contient les lettres "WAVE" car fichier est au format wave  
+		char	ChunkID[4];		//(  4 octets) : contient les lettres "RIFF" pour indiquer que le fichier est codé selon la norme RIFF  
+		guint32 ChunkSize;		//(  4 octets) : taille du fichier entier en octets( sans compter les 8 octets de ce champ et le champ précédent CunkID  
+		char	Format[4];		//(  4 octets) : correspond au format du fichier donc ici, contient les lettres "WAVE" car fichier est au format wave  
 	} RIFF;  
-
+	
+	TAG_WAV_IS_FMT_BEXT	TagWavIsFmtBext;
+	
 	struct {  
 		char	Subchunk1ID[4];	//(  4 octets) : contient les lettres "fmt " pour indiquer les données à suivre décrivent le format des données audio  
 		guint32 Subchunk1Size;	//(  4 octets) : taille en octet des données à suivre( qui suivent cette variable) 16 Pour un fichier PCM  
 		short	AudioFormat;	//(  2 octets) : format de compression( une valeur autre que 1 indique une compression)  
 		short	NumChannels;	//(  2 octets) : nombre de canaux
-					// 	1 pour mono,
-					// 	2 pour stéréo
-					// 	3 pour gauche, droit et centre
-					// 	4 pour face gauche, face droit, arrière gauche, arrière droit
-					// 	5 pour gauche, centre, droit, surround( ambiant)
-					// 	6 pour centre gauche, gauche, centre, centre droit, droit, surround( ambiant)
-		guint32 SampleRate;	//(  4 octets) : fréquence d'échantillonage, ex 44100, 44800( nombre d'échantillons par secondes)  
-		guint32 ByteRate;	//(  4 octets) : nombre d'octects par secondes  
-		short	Blockalign;	//(  2 octets) : nombre d'octects pour coder un échantillon  
+								// 	1 pour mono,
+								// 	2 pour stéréo
+								// 	3 pour gauche, droit et centre
+								// 	4 pour face gauche, face droit, arrière gauche, arrière droit
+								// 	5 pour gauche, centre, droit, surround( ambiant)
+								// 	6 pour centre gauche, gauche, centre, centre droit, droit, surround( ambiant)
+		guint32 SampleRate;		//(  4 octets) : fréquence d'échantillonage, ex 44100, 44800( nombre d'échantillons par secondes)  
+		guint32 ByteRate;		//(  4 octets) : nombre d'octects par secondes  
+		short	Blockalign;		//(  2 octets) : nombre d'octects pour coder un échantillon  
 		short	BitsPerSample;	//(  2 octets) : nombre de bits pour coder un échantillon  
 	} FMT;  
 
 	struct {  
 		char	Subchunk2ID[4];	//(  4 octets) : contient les lettres "data" pour indiquer que les données à suivre sont les données audio( les échantillons et)  
 		guint32 Subchunk2Size;	//(  4 octets) : taille des données audio( nombre total d'octets codant les données audio)  
-		short	*data;		//(  4 octets) : données audio... les échantillons  
-					//     DATAS[] : [Octets du Sample 1 du Canal 1] [Octets du Sample 1 du Canal 2] [Octets du Sample 2 du Canal 1] [Octets du Sample 2 du Canal 2]
+		short	*data;			//(  4 octets) : données audio... les échantillons  
+								//     DATAS[] : [Octets du Sample 1 du Canal 1] [Octets du Sample 1 du Canal 2] [Octets du Sample 2 du Canal 1] [Octets du Sample 2 du Canal 2]
 	} DATA;  
 	
-	FILE	*file;			// Handle du fichier si different de NULL
+	FILE	*file;				// Handle du fichier si different de NULL
 } WAVE;
 
 //

xcfa-4.2.8.tar.gz/src/tags_aac.c -> xcfa-5.0.2.tar.gz/src/tags_aac.c Changed

xcfa-4.2.8.tar.gz/src/tags_ac3.c -> xcfa-5.0.2.tar.gz/src/tags_ac3.c Changed

xcfa-4.2.8.tar.gz/src/tags_aiff.c -> xcfa-5.0.2.tar.gz/src/tags_aiff.c Changed

xcfa-4.2.8.tar.gz/src/tags_ape.c -> xcfa-5.0.2.tar.gz/src/tags_ape.c Changed

xcfa-4.2.8.tar.gz/src/tags_dts.c -> xcfa-5.0.2.tar.gz/src/tags_dts.c Changed

xcfa-4.2.8.tar.gz/src/tags_flac.c -> xcfa-5.0.2.tar.gz/src/tags_flac.c Changed

@@ -1,39 +1,34 @@
 /*
 * file : tags_flac.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
 *
 * This file is part of XCFA.
- * 
+ *
 * XCFA is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * at your option) any later version.
- * 
+ *
 * XCFA is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with XCFA. If not, see <http://www.gnu.org/licenses/>.
 */
- 
- 
+
+
 #ifdef HAVE_CONFIG_H
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <glib/gstdio.h>
 #include <pthread.h>
@@ -94,13 +89,13 @@
 	ptrinfo = (INFO_FLAC *)g_malloc0 (sizeof (INFO_FLAC));
 	if (ptrinfo == NULL) return (NULL);
 	ptrinfo->tags = (TAGS *)tags_alloc (FALSE);
-	
+
 	if ((file = taglib_file_new (detail->namefile))) {
-	
+
 		taglib_set_strings_unicode(FALSE);
 		tag = taglib_file_tag(file);
 		properties = taglib_file_audioproperties(file);
-		
+
 		ptrinfo->tags->Title = g_strdup (taglib_tag_title(tag));
 		ptrinfo->tags->Artist = g_strdup (taglib_tag_artist(tag));
 		ptrinfo->tags->Album = g_strdup (taglib_tag_album(tag));
@@ -112,7 +107,7 @@
 		ptrinfo->tags->Genre = g_strdup (taglib_tag_genre(tag));
 		ptrinfo->tags->IntGenre = tags_get_genre_by_value (ptrinfo->tags->Genre);
 		ptrinfo->SecTime = taglib_audioproperties_length(properties);
-		
+
 		sec = taglib_audioproperties_length(properties);
 		s = sec % 60; sec /= 60;
 		m = sec % 60; sec /= 60;
@@ -133,7 +128,7 @@
 		printf("channels - %i\n", taglib_audioproperties_channels(properties));
 		printf("length - %i:%02i\n", minutes, seconds);
 		*/
-		
+
 		taglib_tag_free_strings();
 		taglib_file_free (file);
 	}

xcfa-4.2.8.tar.gz/src/tags_m4a.c -> xcfa-5.0.2.tar.gz/src/tags_m4a.c Changed

xcfa-4.2.8.tar.gz/src/tags_mp3.c -> xcfa-5.0.2.tar.gz/src/tags_mp3.c Changed

@@ -1,39 +1,34 @@
 /*
 * file : tags_mp3.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
 *
 * This file is part of XCFA.
- * 
+ *
 * XCFA is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * at your option) any later version.
- * 
+ *
 * XCFA is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with XCFA. If not, see <http://www.gnu.org/licenses/>.
 */
- 
- 
+
+
 #ifdef HAVE_CONFIG_H
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <glib/gstdio.h>
 #include <pthread.h>
@@ -122,11 +117,11 @@
 	if (NULL == (gstr = GetInfo_checkmp3 (namefile))) {
 		return (-1);
 	}
-	
+
 	Lout = gstr->str;
 	for (i = 0; i < 3; i ++) {
 		if ((ptr = strstr (Lout, term[ i ]))) {
-			
+
 			/* Init la chaine de stockage */
 			for (cpt=0; cpt < MAX_STR; cpt++) str [ cpt ] = '\0';
 
@@ -161,10 +156,32 @@
 	}
 	g_string_free (gstr, TRUE);
 	Lout = NULL;
-	
+
 	return (Ret);
 }
 
+void tagsmp3_print( gchar *p_PathNameFile, INFO_MP3 *ptrinfo )
+{
+	if( TRUE == OptionsCommandLine.BoolVerboseMode && NULL != ptrinfo ) {
+		g_print( "\n");
+		g_print ("\t%s\n", p_PathNameFile );
+		g_print( "\tptrinfo->tags->Title = %s\n", ptrinfo->tags->Title );
+		g_print( "\tptrinfo->tags->Artist = %s\n", ptrinfo->tags->Artist );
+		g_print( "\tptrinfo->tags->Album = %s\n", ptrinfo->tags->Album );
+		g_print( "\tptrinfo->tags->IntYear = %d\n", ptrinfo->tags->IntYear );
+		g_print( "\tptrinfo->tags->Year = %s\n", ptrinfo->tags->Year );
+		g_print( "\tptrinfo->tags->Comment = %s\n", ptrinfo->tags->Comment );
+		g_print( "\tptrinfo->tags->IntNumber= %d\n", ptrinfo->tags->IntNumber );
+		g_print( "\tptrinfo->tags->Number = %s\n", ptrinfo->tags->Number );
+		g_print( "\tptrinfo->tags->Genre = %s\n", ptrinfo->tags->Genre );
+		g_print( "\tptrinfo->tags->IntGenre = %d\n", ptrinfo->tags->IntGenre );
+		g_print( "\tptrinfo->time = %s\n", ptrinfo->time );
+		g_print( "\tptrinfo->bitrate = %s\n", ptrinfo->bitrate );
+		g_print( "\tptrinfo->mpeg_is = %d\n", ptrinfo->mpeg_is );
+		g_print( "\tptrinfo->size = %s\n", ptrinfo->size );
+	}
+}
+
 INFO_MP3 *tagsmp3_get_info (DETAIL *detail)
 {
 	INFO_MP3 *ptrinfo = NULL;
@@ -174,65 +191,67 @@
 	gint		m;
 	gint		s;
 	gint		sec;
-	
+
 	/* PRINT_FUNC_LF();*/
-	
+
 	ptrinfo = (INFO_MP3 *)g_malloc0 (sizeof (INFO_MP3));
 	if (ptrinfo == NULL) return (NULL);
 	ptrinfo->tags = (TAGS *)tags_alloc (FALSE);
-	
+
 	if ((file = taglib_file_new (detail->namefile))) {
-	
+
 		taglib_set_strings_unicode(FALSE);
 		tag = taglib_file_tag(file);
 		properties = taglib_file_audioproperties(file);
-		
+
 		ptrinfo->tags->Title = g_strdup (taglib_tag_title(tag));
 		// ptrinfo->tags->Title = utils_convert_string (taglib_tag_title(tag), TRUE);
-		
-		
+
+
 		ptrinfo->tags->Artist = g_strdup (taglib_tag_artist(tag));
 		// ptrinfo->tags->Artist = utils_convert_string (taglib_tag_artist(tag), TRUE);
-		
-		
+
+
 		ptrinfo->tags->Album = g_strdup (taglib_tag_album(tag));
 		// ptrinfo->tags->Album = utils_convert_string (taglib_tag_album(tag), TRUE);
-		
-		
+
+
 		ptrinfo->tags->IntYear = taglib_tag_year(tag);
 		ptrinfo->tags->Year = g_strdup_printf ("%d", ptrinfo->tags->IntYear);
 		ptrinfo->tags->Comment = g_strdup (taglib_tag_comment(tag));
 		// ptrinfo->tags->Comment = utils_convert_string (taglib_tag_comment(tag), TRUE);
-		
+
 		ptrinfo->tags->IntNumber = taglib_tag_track(tag);
 		ptrinfo->tags->Number = g_strdup_printf ("%d", ptrinfo->tags->IntNumber);
 		ptrinfo->tags->Genre = g_strdup (taglib_tag_genre(tag));
 		// ptrinfo->tags->Genre = utils_convert_string (taglib_tag_genre(tag), TRUE);
-		
-		
+
+
 		ptrinfo->tags->IntGenre = tags_get_genre_by_value (ptrinfo->tags->Genre);
-		
+
 		ptrinfo->SecTime =
 		sec = taglib_audioproperties_length(properties);
 		s = sec % 60; sec /= 60;
 		m = sec % 60; sec /= 60;
 		if (sec > 0) ptrinfo->time = g_strdup_printf ("%02d:%02d:%02d", sec, m, s);
 		else ptrinfo->time = g_strdup_printf ("%02d:%02d", m, s);
-		
+
 		ptrinfo->bitrate = g_strdup_printf ("%d", taglib_audioproperties_bitrate(properties));
 		ptrinfo->mpeg_is = tagsmp3_type_mpeg (detail->namefile);
 		ptrinfo->size = g_strdup_printf ("%d Ko", (gint)libutils_get_size_file (detail->namefile) / 1024);
-			
+
 		taglib_tag_free_strings();
 		taglib_file_free (file);
 	}
 	/*
 	ptrinfo->level = level_get_from (FILE_IS_MP3, namefile);
-g_print ("%s\t%d\n", namefile, ptrinfo->level);
+	g_print ("%s\t%d\n", namefile, ptrinfo->level);
 	*/
 	ptrinfo->LevelDbfs.level = -1;
 	ptrinfo->LevelDbfs.NewLevel = -1;
 
+	tagsmp3_print( detail->namefile, ptrinfo );
+
 	return (ptrinfo);
 }

xcfa-4.2.8.tar.gz/src/tags_mpc.c -> xcfa-5.0.2.tar.gz/src/tags_mpc.c Changed

@@ -1,39 +1,34 @@
 /*
 * file : tags_mpc.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
 *
 * This file is part of XCFA.
- * 
+ *
 * XCFA is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * at your option) any later version.
- * 
+ *
 * XCFA is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with XCFA. If not, see <http://www.gnu.org/licenses/>.
 */
- 
- 
+
+
 #ifdef HAVE_CONFIG_H
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <glib/gstdio.h>
 #include <pthread.h>
@@ -217,12 +212,12 @@
 	ptrinfo = (INFO_MPC *)g_malloc0 (sizeof (INFO_MPC));
 	if (ptrinfo == NULL) return (NULL);
 	ptrinfo->tags = (TAGS *)tags_alloc (FALSE);
-	
+
 	if ((file = taglib_file_new (detail->namefile))) {
-	
+
 		taglib_set_strings_unicode(FALSE);
 		tag = taglib_file_tag(file);
-		
+
 		ptrinfo->tags->Title = g_strdup (taglib_tag_title(tag));
 		ptrinfo->tags->Artist = g_strdup (taglib_tag_artist(tag));
 		ptrinfo->tags->Album = g_strdup (taglib_tag_album(tag));
@@ -249,7 +244,7 @@
 		ptrinfo->tags = (TAGS *)tags_alloc (FALSE);
 		tags_set (detail->namefile, ptrinfo->tags);
 	}
-	
+
 	return (ptrinfo);
 }

xcfa-4.2.8.tar.gz/src/tags_ogg.c -> xcfa-5.0.2.tar.gz/src/tags_ogg.c Changed

xcfa-4.2.8.tar.gz/src/tags_rm.c -> xcfa-5.0.2.tar.gz/src/tags_rm.c Changed

xcfa-4.2.8.tar.gz/src/tags_shn.c -> xcfa-5.0.2.tar.gz/src/tags_shn.c Changed

xcfa-4.2.8.tar.gz/src/tags_wav.c -> xcfa-5.0.2.tar.gz/src/tags_wav.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : tags_wav.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <glib/gstdio.h>
 #include <pthread.h>
@@ -81,35 +76,212 @@
 	WaveHeader->DATA.Subchunk2Size = 0;
 	WaveHeader->DATA.data = NULL;
 	WaveHeader->file = NULL;
+	WaveHeader->TagWavIsFmtBext = TAG_WAVE_IS_NONE;
 }
 // 
 // 
-gboolean tagswav_read_file (gchar *wave_file, WAVE *WaveHeader)
-{ 
+void tagswav_print_header( gchar *p_PathNameFile, WAVE	 *WaveHeader)
+{
+	if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
+		
+		g_print ("\n" );
+		g_print ("\t%s\n", p_PathNameFile );
+		g_print ("\tChunkID = %c%c%c%c\n", WaveHeader->RIFF.ChunkID [ 0 ], WaveHeader->RIFF.ChunkID [ 1 ], WaveHeader->RIFF.ChunkID [ 2 ], WaveHeader->RIFF.ChunkID [ 3 ] );
+		g_print ("\tChunkSize = %d\n", WaveHeader->RIFF.ChunkSize);
+		g_print ("\tFormat = %c%c%c%c\n", WaveHeader->RIFF.Format [ 0 ], WaveHeader->RIFF.Format [ 1 ], WaveHeader->RIFF.Format [ 2 ], WaveHeader->RIFF.Format [ 3 ] );
+		
+		g_print( "\t%s\n", (WaveHeader->TagWavIsFmtBext == TAG_WAVE_IS_FMT) ? "[ 'fmt ' ]" : "[ 'bext' | 'qlty' | 'levl' | 'link' | 'axml' ]" );
+
+		g_print ("\tSubchunk1ID = %c%c%c%c\n", WaveHeader->FMT.Subchunk1ID [ 0 ], WaveHeader->FMT.Subchunk1ID [ 1 ], WaveHeader->FMT.Subchunk1ID [ 2 ], WaveHeader->FMT.Subchunk1ID [ 3 ] );
+		g_print ("\tSubchunk1Size = %d\n", WaveHeader->FMT.Subchunk1Size); 
+		g_print ("\tAudioFormat = %d\n", WaveHeader->FMT.AudioFormat); 
+		g_print ("\tNumChannels = %d\n", WaveHeader->FMT.NumChannels); 
+		g_print ("\tSampleRate = %d\n", WaveHeader->FMT.SampleRate); 
+		g_print ("\tByteRate = %d\n", WaveHeader->FMT.ByteRate); 
+		g_print ("\tBlockalign = %d\n", WaveHeader->FMT.Blockalign); 
+		g_print ("\tBitsPerSample = %d\n", WaveHeader->FMT.BitsPerSample);
+		g_print ("\tSubchunk2ID = %c%c%c%c\n", WaveHeader->DATA.Subchunk2ID [ 0 ], WaveHeader->DATA.Subchunk2ID [ 1 ], WaveHeader->DATA.Subchunk2ID [ 2 ], WaveHeader->DATA.Subchunk2ID [ 3 ] );
+		g_print ("\tSubchunk2Size = %d\n", WaveHeader->DATA.Subchunk2Size);
+		g_print ("\n");
+	}
+}
+// 
+// 
+void tagswav_print( gchar *p_PathNameFile )
+{
+	if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
+		
+		WAVE	WaveHeader;
+	
+		if (TRUE == tagswav_read_file( p_PathNameFile, &WaveHeader )) {
+			tagswav_print_header( p_PathNameFile, &WaveHeader );
+		}
+		tagswav_close_file( &WaveHeader );
+	}
+}
+// 
+// 
+gint tagswav_get_pos( gchar *p_PathNameFile, gchar p_1, gchar p_2, gchar p_3, gchar p_4 )
+{
+	FILE		*file = NULL;
 	unsigned char 	devbuf[ BLOCK_SIZE +10 ];
 	gint		n_read;
 	gint		tt_read = 0;
 	gint		cpt;
-	gboolean	BoolFound = FALSE;
 	
-	// PRINT_FUNC_LF();
-	// g_print("\t%s\n", wave_file);
+	if( NULL != (file = fopen( p_PathNameFile, "rb" ))) { 
+	
+		do {
+			// LECTURE D UN BLOCK
+			n_read = fread( devbuf, BLOCK_SIZE, 1, file );
+		
+			// RECHERCHE DE: data
+			for( cpt = 0; cpt < BLOCK_SIZE; cpt ++ ) {
+				if( devbuf [ cpt +0 ] == p_1 && devbuf [ cpt +1 ] == p_2 && devbuf [ cpt +2 ] == p_3 && devbuf [ cpt +3 ] == p_4 ) {
+					return( tt_read + cpt );
+				}
+			}
+		
+			// VARIABLE TOTAL OCTECTS LU MOINS 8 AU CAS OU data SOIS COUPE EN FIN DE BLOCK
+			tt_read += BLOCK_SIZE;
+			tt_read -= 8;
+		
+			// POINTEUR AU DEBUT DU FICHIER
+			rewind( file );
+		
+			// POINTEUR DE LECTURE SUR tt_read
+			fseek( file, tt_read, SEEK_CUR );
+		
+		} while( n_read > 0 );
+	
+		fclose( file );
+	}
+	
+	return( -1 );
+}
+// 
+// MODIF DU 02 MAI 2013 A LA DEMANDE DE CHRISTOPHE MARILLAT POUR TENIR COMPTE DE : Broadcast Wave Format
+// VERSION DE TEST:
+//	xcfa-4.3.4~beta0
+//	xcfa-4.3.4~beta1
+// 
+/*
+
+broadcast_audio_extension typedef struct {
+ DWORD ckID; 	 // (broadcastextension)ckID=bext.
+ DWORD ckSize; 	 // size of extension chunk
+ BYTE ckData[ckSize]; 	 // data of the chunk
+}
+
+
+Quality_chunk typedef struct {
+ DWORD ckID; 	// (quality_chunk) ckID='qlty'
+ DWORD ckSize; 	// size of quality chunk
+ BYTE ckData[ckSize]; 	// data of the chunk
+}
+
+
+typedef struct peak_envelope
+{
+ CHAR ckID[4];		// {'l','e','v','l'}
+ DWORD ckSize;		// size of chunk
+ DWORD dwVersion;		// version information
+ DWORD dwFormat;		// format of a peak point
+					// 1 = unsigned char
+					// 2 = unsigned short
+ DWORD dwPointsPerValue;	// 1 = only positive peak point
+					// 2 = positive AND negative peak point
+ DWORD dwBlockSize;		// frames per value
+ DWORD dwPeakChannels;	// number of channels
+ DWORD dwNumPeakFrames;	// number of peak frames
+ DWORD dwPosPeakOfPeaks;	// audio sample frame index
+					// or 0xFFFFFFFF if unknown
+ DWORD dwOffsetToPeaks;	// should usually be equal to the size of this header, but
+ could also be higher
+ CHAR strTimestamp[28];	// ASCII: time stamp of the peak data
+ CHAR reserved[60];		// reserved set to 0x00
+ CHAR peak_envelope_data[]	// the peak point data
+}
+levl_chunk;
+
+
+typedef struct link
+{
+ CHAR CkID[4];		// 'link'
+ DWORD CkSize;		// size of chunk
+ CHAR XmlData[ ];		// text data in XML
+}
+link_chunk;
+
+
+typedef struct axml
+{
+ CHAR ckID[4];		// {'a','x','m','l'}
+ DWORD ckSize;			// size of chunk
+ CHAR xmlData[ ];		// text data in XML
+}
+axml_chunk;
+
+*/
+gboolean tagswav_read_file (gchar *wave_file, WAVE *WaveHeader)
+{
+/*
+	gint	seek_bext = -1;
+	gint	seek_qlty = -1;
+	gint	seek_levl = -1;
+	gint	seek_link = -1;
+	gint	seek_axml = -1;
+	gint	seek_fmt = -1;
+	gint	seek_data = -1;
+ 	gint	n_read;
 	
-	// INIT STRUCTURE
 	tagswav_init (WaveHeader);
 	
-	// ouverture/lecture du fichier wave_file en mode binaire (rb) : lecture en octets 
-	if (NULL == (WaveHeader->file = fopen(wave_file, "rb"))) { 
-		// gestion d'erreurs 
-		g_print ("\nERREUR: fichier %s introuvable\n", wave_file); 
-		return (FALSE);
-	} 
- 
-	// lecture des données du fichier .wav et stockage de celle-ci dans les champs adéquats de la structure WAVE
+	if (NULL == (WaveHeader->file = fopen(wave_file, "rb"))) return (FALSE);
+	
+	seek_fmt = tagswav_get_pos( wave_file, 'f', 'm', 't', ' ' );
+	seek_data = tagswav_get_pos( wave_file, 'd', 'a', 't', 'a' );
+	if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
+		seek_bext = tagswav_get_pos( wave_file, 'b', 'e', 'x', 't' );
+		seek_qlty = tagswav_get_pos( wave_file, 'q', 'l', 't', 'y' );
+		seek_levl = tagswav_get_pos( wave_file, 'l', 'e', 'v', 'l' );
+		seek_link = tagswav_get_pos( wave_file, 'l', 'i', 'n', 'k' );
+		seek_axml = tagswav_get_pos( wave_file, 'a', 'x', 'm', 'l' );
+	}
+	
+	if( -1 == seek_fmt || -1 == seek_data ) {
+		if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
+			g_print("Entete incorrecte du fichier [ %s ]\n", wave_file );
+			g_print ("\tseek_bext = %d\n", seek_bext );
+			g_print ("\tseek_qlty = %d\n", seek_qlty );
+			g_print ("\tseek_levl = %d\n", seek_levl );
+			g_print ("\tseek_link = %d\n", seek_link );
+			g_print ("\tseek_axml = %d\n", seek_axml );
+			g_print ("\tseek_fmt = %d\n", seek_fmt );
+			g_print ("\tseek_data = %d\n", seek_data );
+		}
+		tagswav_close_file( WaveHeader );
+		return( FALSE );
+	}
+	
+	// LECTURE ENTETE
 	n_read = fread(&WaveHeader->RIFF.ChunkID, 4, 1, WaveHeader->file);		// RIFF
 	n_read = fread(&WaveHeader->RIFF.ChunkSize, 4, 1, WaveHeader->file);		// taille du fichier entier en octets (sans compter les 8 octets de ce champ et le champ précédent
 	n_read = fread(&WaveHeader->RIFF.Format, 4, 1, WaveHeader->file);		// WAVE
-	n_read = fread(&WaveHeader->FMT.Subchunk1ID, 4, 1, WaveHeader->file);		// 'fmt '
+	n_read = fread(&WaveHeader->FMT.Subchunk1ID, 4, 1, WaveHeader->file);		// 'fmt ' | 'bext'
+	
+	if( 0 == strncmp( WaveHeader->FMT.Subchunk1ID, "fmt ", 4 )) {
+		
+		WaveHeader->TagWavIsFmtBext = TAG_WAVE_IS_FMT;		
+	}
+	else {
+		
+		WaveHeader->TagWavIsFmtBext = TAG_WAVE_IS_BEXT;
+		
+		n_read = fseek( WaveHeader->file, seek_fmt + 4, SEEK_SET );
+	}
+	
+	// FMT
 	n_read = fread(&WaveHeader->FMT.Subchunk1Size, 4, 1, WaveHeader->file);		// taille en octet des données à suivre
 	n_read = fread(&WaveHeader->FMT.AudioFormat, 2, 1, WaveHeader->file);		// format de compression (une valeur autre que 1 indique une compression) 
 	n_read = fread(&WaveHeader->FMT.NumChannels, 2, 1, WaveHeader->file);		// nombre de canaux
@@ -118,113 +290,80 @@
 	n_read = fread(&WaveHeader->FMT.Blockalign, 2, 1, WaveHeader->file);		// nombre d'octects pour coder un échantillon
 	n_read = fread(&WaveHeader->FMT.BitsPerSample, 2, 1, WaveHeader->file);		// nombre de bits pour coder un échantillon
 	
-	// FICHIER WAV ?
-	if ((0 != strncmp (WaveHeader->RIFF.ChunkID, "RIFF", 4)) || (0 != strncmp (WaveHeader->RIFF.Format, "WAVE", 4)) || (0 != strncmp (WaveHeader->FMT.Subchunk1ID, "fmt ", 4))) {
-		g_print ("%s n'est pas un fichier wav\n", wave_file); 
-		// fclose(WaveHeader->file); 
-		// WaveHeader->file = NULL;
-		tagswav_close_file( WaveHeader );
-		return (FALSE);
+	// DATA
+	n_read = fseek( WaveHeader->file, seek_data, SEEK_SET );
+	n_read = fread( &WaveHeader->DATA.Subchunk2ID, 4, 1, WaveHeader->file );
+	n_read = fread( &WaveHeader->DATA.Subchunk2Size, 4, 1, WaveHeader->file );
+	
+	tagswav_print_header( wave_file, WaveHeader );
+	if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
+		g_print ("\tseek_bext = %d\n", seek_bext );
+		g_print ("\tseek_qlty = %d\n", seek_qlty );
+		g_print ("\tseek_levl = %d\n", seek_levl );
+		g_print ("\tseek_link = %d\n", seek_link );
+		g_print ("\tseek_axml = %d\n", seek_axml );
+		g_print ("\tseek_fmt = %d\n", seek_fmt );
+		g_print ("\tseek_data = %d\n", seek_data );
 	}
+	return( TRUE );
+*/
+	gint	seek_fmt = -1;
+	gint	seek_data = -1;
+ 	gint	n_read;
 	
-	// POINTEUR AU DEBUT DU FICHIER
-	rewind (WaveHeader->file);
-	do {
-		// LECTURE D UN BLOCK
-		n_read = fread (devbuf, BLOCK_SIZE, 1, WaveHeader->file);
-		// RECHERCHE DE: data
-		for (cpt = 0; cpt < BLOCK_SIZE; cpt ++) {
-			if (devbuf [ cpt +0 ] == 'd' && devbuf [ cpt +1 ] == 'a' && devbuf [ cpt +2 ] == 't' && devbuf [ cpt +3 ] == 'a') {
-				BoolFound = TRUE;
-				break;
-			}
-		}
-		if (TRUE == BoolFound) break;
-		// VARIABLE TOTAL OCTECTS LU MOINS 8 AU CAS OU data SOIS COUPE EN FIN DE BLOCK
-		tt_read += BLOCK_SIZE;
-		tt_read -= 8;
-		// POINTEUR AU DEBUT DU FICHIER
-		rewind (WaveHeader->file);
-		// POINTEUR DE LECTURE SUR tt_read
-		fseek (WaveHeader->file, tt_read, SEEK_CUR);
-	} while (n_read > 0);
-	
-	if (TRUE == BoolFound) {
-		
-		rewind (WaveHeader->file);
-		n_read = fseek( WaveHeader->file, cpt + tt_read, SEEK_CUR );
-		n_read = fread( &WaveHeader->DATA.Subchunk2ID, 4, 1, WaveHeader->file );
-		n_read = fread( &WaveHeader->DATA.Subchunk2Size, 4, 1, WaveHeader->file );
+	seek_fmt = tagswav_get_pos( wave_file, 'f', 'm', 't', ' ' );
+	seek_data = tagswav_get_pos( wave_file, 'd', 'a', 't', 'a' );
+	if( -1 == seek_fmt || -1 == seek_data ) return( FALSE );
+	
+	if( NULL == ( WaveHeader->file = fopen( wave_file, "rb" ))) return (FALSE);
+	// LECTURE ENTETE
+	n_read = fread( &WaveHeader->RIFF.ChunkID, 4, 1, WaveHeader->file );		// RIFF
+	n_read = fread( &WaveHeader->RIFF.ChunkSize, 4, 1, WaveHeader->file );		// taille du fichier entier en octets (sans compter les 8 octets de ce champ et le champ précédent
+	n_read = fread( &WaveHeader->RIFF.Format, 4, 1, WaveHeader->file );		// WAVE
+	n_read = fread( &WaveHeader->FMT.Subchunk1ID, 4, 1, WaveHeader->file );		// 'fmt ' | 'bext'
+	
+	if( 0 == strncmp( WaveHeader->FMT.Subchunk1ID, "fmt ", 4 )) {
 		
-		if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
-			g_print( "\n%s\n", wave_file );
-			g_print ("\tBoolFound DATA = %s\n", BoolFound ? "TRUE" : "FALSE");
-			g_print ("\tChunkID = %c%c%c%c\n", WaveHeader->RIFF.ChunkID [ 0 ], WaveHeader->RIFF.ChunkID [ 1 ], WaveHeader->RIFF.ChunkID [ 2 ], WaveHeader->RIFF.ChunkID [ 3 ] );
-			g_print ("\tChunkSize = %d\n", WaveHeader->RIFF.ChunkSize);
-			g_print ("\tFormat = %c%c%c%c\n", WaveHeader->RIFF.Format [ 0 ], WaveHeader->RIFF.Format [ 1 ], WaveHeader->RIFF.Format [ 2 ], WaveHeader->RIFF.Format [ 3 ] );
-			g_print ("\tSubchunk1ID = %c%c%c%c\n", WaveHeader->FMT.Subchunk1ID [ 0 ], WaveHeader->FMT.Subchunk1ID [ 1 ], WaveHeader->FMT.Subchunk1ID [ 2 ], WaveHeader->FMT.Subchunk1ID [ 3 ] );
-			g_print ("\tSubchunk1Size = %d\n", WaveHeader->FMT.Subchunk1Size); 
-			g_print ("\tAudioFormat = %d\n", WaveHeader->FMT.AudioFormat); 
-			g_print ("\tNumChannels = %d\n", WaveHeader->FMT.NumChannels); 
-			g_print ("\tSampleRate = %d\n", WaveHeader->FMT.SampleRate); 
-			g_print ("\tByteRate = %d\n", WaveHeader->FMT.ByteRate); 
-			g_print ("\tBlockalign = %d\n", WaveHeader->FMT.Blockalign); 
-			g_print ("\tBitsPerSample = %d\n", WaveHeader->FMT.BitsPerSample);
-			g_print ("\tSubchunk2ID = %c%c%c%c\n", WaveHeader->DATA.Subchunk2ID [ 0 ], WaveHeader->DATA.Subchunk2ID [ 1 ], WaveHeader->DATA.Subchunk2ID [ 2 ], WaveHeader->DATA.Subchunk2ID [ 3 ] );
-			g_print ("\tSubchunk2Size = %d\n", WaveHeader->DATA.Subchunk2Size);
-			g_print ("\n");
-		}
- 	}
-	else if (FALSE == BoolFound) {
-		// fermeture du fichier 
-		// fclose (WaveHeader->file); 
- 		// WaveHeader->file = NULL;
- 		tagswav_close_file( WaveHeader );
+		WaveHeader->TagWavIsFmtBext = TAG_WAVE_IS_FMT;		
 	}
-
-	return BoolFound; 
-} 
-// 
-// 
-void tagswav_print( gchar *p_PathNameFile )
-{
-	if( TRUE == OptionsCommandLine.BoolVerboseMode ) {
+	else {
+		WaveHeader->TagWavIsFmtBext = TAG_WAVE_IS_BEXT;
 		
-		WAVE	WaveHeader;
-	
-		if (TRUE == tagswav_read_file( p_PathNameFile, &WaveHeader )) {
-			g_print ("\n" );
-			g_print ("\t%s\n", p_PathNameFile );
-			g_print ("\tChunkID = %c%c%c%c\n", WaveHeader.RIFF.ChunkID [ 0 ], WaveHeader.RIFF.ChunkID [ 1 ], WaveHeader.RIFF.ChunkID [ 2 ], WaveHeader.RIFF.ChunkID [ 3 ] );
-			g_print ("\tChunkSize = %d\n", WaveHeader.RIFF.ChunkSize);
-			g_print ("\tFormat = %c%c%c%c\n", WaveHeader.RIFF.Format [ 0 ], WaveHeader.RIFF.Format [ 1 ], WaveHeader.RIFF.Format [ 2 ], WaveHeader.RIFF.Format [ 3 ] );
-			g_print ("\tSubchunk1ID = %c%c%c%c\n", WaveHeader.FMT.Subchunk1ID [ 0 ], WaveHeader.FMT.Subchunk1ID [ 1 ], WaveHeader.FMT.Subchunk1ID [ 2 ], WaveHeader.FMT.Subchunk1ID [ 3 ] );
-			g_print ("\tSubchunk1Size = %d\n", WaveHeader.FMT.Subchunk1Size); 
-			g_print ("\tAudioFormat = %d\n", WaveHeader.FMT.AudioFormat); 
-			g_print ("\tNumChannels = %d\n", WaveHeader.FMT.NumChannels); 
-			g_print ("\tSampleRate = %d\n", WaveHeader.FMT.SampleRate); 
-			g_print ("\tByteRate = %d\n", WaveHeader.FMT.ByteRate); 
-			g_print ("\tBlockalign = %d\n", WaveHeader.FMT.Blockalign); 
-			g_print ("\tBitsPerSample = %d\n", WaveHeader.FMT.BitsPerSample);
-			g_print ("\tSubchunk2ID = %c%c%c%c\n", WaveHeader.DATA.Subchunk2ID [ 0 ], WaveHeader.DATA.Subchunk2ID [ 1 ], WaveHeader.DATA.Subchunk2ID [ 2 ], WaveHeader.DATA.Subchunk2ID [ 3 ] );
-			g_print ("\tSubchunk2Size = %d\n", WaveHeader.DATA.Subchunk2Size);
-			g_print ("\n");
-		}
-		tagswav_close_file( &WaveHeader );
+		n_read = fseek( WaveHeader->file, seek_fmt + 4, SEEK_SET );
 	}
+	
+	// FMT
+	n_read = fread( &WaveHeader->FMT.Subchunk1Size, 4, 1, WaveHeader->file );	// taille en octet des données à suivre
+	n_read = fread( &WaveHeader->FMT.AudioFormat, 2, 1, WaveHeader->file );		// format de compression (une valeur autre que 1 indique une compression) 
+	n_read = fread( &WaveHeader->FMT.NumChannels, 2, 1, WaveHeader->file );		// nombre de canaux
+	n_read = fread( &WaveHeader->FMT.SampleRate, 4, 1, WaveHeader->file );		// fréquence d'échantillonage (nombre d'échantillons par secondes) 
+	n_read = fread( &WaveHeader->FMT.ByteRate, 4, 1, WaveHeader->file );		// nombre d'octects par secondes
+	n_read = fread( &WaveHeader->FMT.Blockalign, 2, 1, WaveHeader->file );		// nombre d'octects pour coder un échantillon
+	n_read = fread( &WaveHeader->FMT.BitsPerSample, 2, 1, WaveHeader->file );	// nombre de bits pour coder un échantillon
+	
+	// DATA
+	n_read = fseek( WaveHeader->file, seek_data, SEEK_SET );
+	n_read = fread( &WaveHeader->DATA.Subchunk2ID, 4, 1, WaveHeader->file );
+	n_read = fread( &WaveHeader->DATA.Subchunk2Size, 4, 1, WaveHeader->file );
+	
+	if( n_read );
+	tagswav_print_header( wave_file, WaveHeader );
+	
+	return( TRUE );
+
 }
 // 
 // 
 INFO_WAV *tagswav_remove_info (INFO_WAV *info)
 {
-	if (info) {
-		if (NULL != info->time)		{ g_free (info->time);		info->time = NULL;	}
-		if (NULL != info->hertz)	{ g_free (info->hertz);		info->hertz = NULL;	}
-		if (NULL != info->voie)		{ g_free (info->voie);		info->voie = NULL;	}
-		if (NULL != info->bits)		{ g_free (info->bits);		info->bits = NULL;	}
-		if (NULL != info->NewHertz)	{ g_free (info->NewHertz);	info->NewHertz = NULL;	}
-		if (NULL != info->NewVoie)	{ g_free (info->NewVoie);	info->NewVoie = NULL;	}
-		if (NULL != info->NewBits)	{ g_free (info->NewBits);	info->NewBits = NULL;	}
+	if( NULL != info ) {
+		if( NULL != info->time )		{ g_free( info->time );		info->time = NULL;		}
+		if( NULL != info->hertz )		{ g_free( info->hertz );	info->hertz = NULL;		}
+		if( NULL != info->voie )		{ g_free( info->voie );		info->voie = NULL;		}
+		if( NULL != info->bits )		{ g_free( info->bits );		info->bits = NULL;		}
+		if( NULL != info->NewHertz )	{ g_free( info->NewHertz );	info->NewHertz = NULL;	}
+		if( NULL != info->NewVoie )		{ g_free( info->NewVoie );	info->NewVoie = NULL;	}
+		if( NULL != info->NewBits )		{ g_free( info->NewBits );	info->NewBits = NULL;	}
 
 		info->tags = (TAGS *)tags_remove (info->tags);
 
@@ -309,7 +448,10 @@
 	m = sec % 60; sec /= 60;
 	if (sec > 0) ptrinfo->time = g_strdup_printf ("%02d:%02d:%02d", sec, m, s);
 	else ptrinfo->time = g_strdup_printf ("%02d:%02d", m, s);
-		
+	
+	// 'fmt ', 'bext', 'qlty', 'levl', 'link','axml'
+	ptrinfo->BoolBwf = WaveHeader.TagWavIsFmtBext == TAG_WAVE_IS_FMT ? FALSE : TRUE;
+	
 	// mode
 	ptrinfo->voie = g_strdup_printf ("%d", WaveHeader.FMT.NumChannels);
 	ptrinfo->NewVoie = g_strdup_printf ("%d", WaveHeader.FMT.NumChannels);

xcfa-4.2.8.tar.gz/src/tags_wavpack.c -> xcfa-5.0.2.tar.gz/src/tags_wavpack.c Changed

xcfa-4.2.8.tar.gz/src/tags_wma.c -> xcfa-5.0.2.tar.gz/src/tags_wma.c Changed

xcfa-4.2.8.tar.gz/src/web.c -> xcfa-5.0.2.tar.gz/src/web.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : web.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -30,11 +30,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <glib.h>
 #include <glib/gprintf.h>
@@ -90,8 +85,7 @@
 
 	if ((pid = fork ()) == 0) {
 		/*
-		kfmclient newTab http://www.xcfa.tuxfamily.org &
-		*/
+		// kfmclient newTab http://www.xcfa.tuxfamily.org &
 		if (strcmp (VarWeb.Navigateur, "konqueror") == 0) {
 			execlp ("kfmclient",
 				"kfmclient",
@@ -99,21 +93,26 @@
 				VarWeb.NameNavi,
 				NULL);
 		}
-		if (strcmp (VarWeb.Navigateur, "opera") == 0) {
+		else if (strcmp (VarWeb.Navigateur, "opera") == 0) {
 			execlp (VarWeb.Navigateur,
 				VarWeb.Navigateur,
 				VarWeb.NameNavi,
 				NULL);
 		}
-		else {
-			/*
-			-new-window URL
-				Open URL in a new window in an already running Firefox process.
-				-new-tab URL Open URL in a new tab in an already running Firefox process.
-			EXEMPLE:
-				firefox -new-window -new-tab http:/www.google.fr
-			*/
-			// g_print("%s -new-window -new-tab %s\n", VarWeb.Navigateur,VarWeb.NameNavi);
+		else if (strcmp (VarWeb.Navigateur, "midori") == 0) {
+			execlp (VarWeb.Navigateur,
+				VarWeb.Navigateur,
+				VarWeb.NameNavi,
+				NULL);
+		}
+		else if( (strcmp (VarWeb.Navigateur, "firefox") == 0) ||
+			 (strcmp (VarWeb.Navigateur, "iceweasel") == 0) ) {
+
+			// -new-window URL
+			// 	Open URL in a new window in an already running Firefox process.
+			// 	-new-tab URL Open URL in a new tab in an already running Firefox process.
+			// EXEMPLE:
+			// 	firefox -new-window -new-tab http:/www.google.fr
 			execlp (VarWeb.Navigateur,
 				VarWeb.Navigateur,
 				"-new-window",
@@ -121,6 +120,32 @@
 				VarWeb.NameNavi,
 				NULL);
 		}
+		else {
+			gchar	Str [ 200 ];
+			
+			Str [ 0 ] = '\0';
+			if( NULL != Config.StringParamNameNavigateur && *Config.StringParamNameNavigateur != '\0' ) {
+				strncpy( Str, Config.StringParamNameNavigateur, 180 );
+			}
+			execlp (VarWeb.Navigateur,
+				VarWeb.Navigateur,
+				VarWeb.NameNavi,
+				Str,
+				NULL);
+		}
+		*/
+		gchar	Str [ 200 ];
+		
+		Str [ 0 ] = '\0';
+		if( NULL != Config.StringParamNameNavigateur && *Config.StringParamNameNavigateur != '\0' ) {
+			strncpy( Str, Config.StringParamNameNavigateur, 180 );
+		}
+		execlp (VarWeb.Navigateur,
+			VarWeb.Navigateur,
+			VarWeb.NameNavi,
+			Str,
+			NULL);
+		
 		_exit (0);
 	}
 }
@@ -143,22 +168,24 @@
 		gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_general")), NOTEBOOK_PRGEXTERNES);
 		gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_app_externes")), NOTEBOOK_OPTIONS_EXTRA);
 		
-		wininfo_create (
-			_("PAS de navigateur present"),
-			_("L'acces au web est impossible car aucun navigateur"),
+		wind_info_init (
+			WindMain,
+			_("No web browser"),
+			_("No Web access: no web browser"),
 			 "\n",
-			_("n'est present dans votre configuration."),
+			_("found in your system."),
 			 "\n\n",
-			_("Veuillez installez un navigateur."),
+			_("Please install a web browser."),
 			 "");
 		return;
 	}
 
 	if (CdCurl_test_access_web () == FALSE) {
 		
-		wininfo_create (
-			_("La liaison internet est absente"),
-			_("Vous devez ouvrir l'acces internet"),
+		wind_info_init (
+			WindMain,
+			_("A web connection is missing"),
+			_("You need to enable web access"),
 			 "");
 		return;
 	}
@@ -172,45 +199,31 @@
 }
 // 
 // 
-void web_make_file (gchar *StrMakeManFile)
-{
-	pid_t	pid;
-	gint	Dummy = 0;
-	
-	// PRINT_FUNC_LF();
-	
-	pid = fork ();
-	if (pid == 0) {
-		Dummy = system (StrMakeManFile);
-		_exit (0);
-	}
-}
-// 
-// 
 void web_goto_manpage (gchar *NameManPage)
 {
 	pthread_t	nmr_tid;
 	gchar		*LineCommand = NULL;
-	gchar		*PathNameMan = NULL;
 	gchar		*PathNameHtml = NULL;
-	FILE		*fp_man = NULL;
 	FILE		*fp_html = NULL;
-	gchar		buf [ 4 ];
- 	
+	FILE		*fp_popen = NULL;
+	gchar 		buf_popen[ 2048 ];
+	gchar		*Ptr = NULL;
+	gboolean	bool_file_man_is_ok = FALSE;
+	
 	// PRINT_FUNC_LF();
 
 	if (FALSE == extra_get_navigateur_is_ok ()) {
 		gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_general")), NOTEBOOK_PRGEXTERNES);
 		gtk_notebook_set_current_page (GTK_NOTEBOOK (GLADE_GET_OBJECT("notebook_app_externes")), NOTEBOOK_OPTIONS_EXTRA);
 		
-		wininfo_create (
-			_("PAS de navigateur present"),
+		wind_info_init (
+			WindMain,
+			_("No web browser"),
+			_("No Web access: no web browser"),
 			 "\n",
-			_(" L'acces au web est impossible car aucun navigateur"),
-			 " \n",
-			_(" n'est present dans votre configuration."),
+			_("found in your system."),
 			 "\n\n",
-			_(" Veuillez installez un navigateur."),
+			_("Please install a web browser."),
 			 "\n",
 			 "");
 		return;
@@ -218,9 +231,10 @@
 
 	if (libutils_find_file (NameManPage) == FALSE) {
 		g_print("The application is missing, you must install [ %s ]\n", NameManPage);
-		wininfo_create (
-			_("L'application est absente."),
-			_("Veuillez installer : "), "", NameManPage, "",
+		wind_info_init (
+			WindMain,
+			_("Application is missing."),
+			_("Please install : "), "", NameManPage, "",
 			 "\n",
 			 "");
 		return;
@@ -239,16 +253,9 @@
 	// IF VarWeb.NameNavi NOT EXIST
 	if (FALSE == libutils_test_file_exist (VarWeb.NameNavi)) {	
 				
-		LineCommand = g_strdup_printf ("man %s > %s/%s.txt", NameManPage, VarWeb.TemporaryRep, NameManPage);
-		g_print("LineCommand = %s\n", LineCommand);
-		web_make_file (LineCommand);
-		g_free (LineCommand);	LineCommand = NULL;
-		sleep(20);
-		
-		PathNameMan = g_strdup_printf ("%s/%s.txt", VarWeb.TemporaryRep, NameManPage);
-		g_print("PathNameMan = %s\n", PathNameMan);
+		LineCommand = g_strdup_printf ("man %s", NameManPage );
+		// g_print("LineCommand = %s\n", LineCommand );
 		PathNameHtml = g_strdup_printf ("%s/%s.html", VarWeb.TemporaryRep, NameManPage);
-		fp_man = fopen (PathNameMan, "r");
 		fp_html = fopen (PathNameHtml, "w");
 		
 		g_fprintf (fp_html, "<html>\n");
@@ -258,35 +265,49 @@
 		g_fprintf (fp_html, "<body bgcolor=\"#ffffff\" text=\"#000000\">\n");
 		g_fprintf (fp_html, "<pre>\n");
 		
-		while (fread (&buf, 1, 1, fp_man)) {
-			if ((gint)*buf >= 0) {
-				if (*buf == '<') {
-					g_fprintf (fp_html, "&lt;");
-					// g_print("&lt;");
-				}
-				else if (*buf == '>') {
-					g_fprintf (fp_html, "&gt;");
-					// g_print("&gt;");
-				}
-				else {
-					buf [ 1 ] = '\0';
-					g_fprintf (fp_html, "%s", buf);
-					// g_print("%s", buf);
+		if( (fp_popen = popen( LineCommand, "r" )) == NULL ) { 
+			// perror( "popen error" );
+			// exit( 1 );
+			g_fprintf( fp_html, "\nERROR: FILE *popen(const char *command, const char *type);\n" );
+			g_fprintf( fp_html, "\n" );
+		}
+		else {
+			bool_file_man_is_ok = FALSE;
+			while( fgets( buf_popen, sizeof(buf_popen)-1, fp_popen ) != NULL ) {
+				bool_file_man_is_ok = TRUE;
+				for( Ptr = buf_popen; *Ptr; Ptr++ ) {
+					if( *Ptr >= 0 ) {
+						if( *Ptr == '<' ) {
+							g_fprintf( fp_html, "&lt;" );
+						}
+						else if( *Ptr == '>' ) {
+							g_fprintf( fp_html, "&gt;" );
+						}
+						else {
+							g_fprintf( fp_html, "%c", *Ptr );
+						}
+					}
 				}
 			}
+			pclose( fp_popen );
+			if( FALSE == bool_file_man_is_ok ) {
+				g_fprintf( fp_html, "\n" );
+				g_fprintf( fp_html, "Aucune entree de manuel pour aacplusenc\n" );
+				g_fprintf( fp_html, "No manual entry for aacplusenc\n" );
+				g_fprintf( fp_html, "\n" );
+			}
 		}
-		fclose (fp_man);
-		g_fprintf (fp_html, "</pre>\n");
-		g_fprintf (fp_html, "</body>\n");
-		g_fprintf (fp_html, "</html>\n\n");
-		fclose (fp_html);
+		g_fprintf( fp_html, "</pre>\n" );
+		g_fprintf( fp_html, "</body>\n" );
+		g_fprintf( fp_html, "</html>\n\n" );
+		fclose( fp_html );
 		
-		g_free (PathNameMan);	PathNameMan = NULL;
 		g_free (PathNameHtml);	PathNameHtml = NULL;
 	}
 		
 	pthread_create (&nmr_tid, NULL ,(void *)web_thread, (void *)NULL);
 }
+
 // 
 // 
 void web_remove_temporary_rep (void)

xcfa-4.2.8.tar.gz/src/web.h -> xcfa-5.0.2.tar.gz/src/web.h Changed

xcfa-4.2.8.tar.gz/src/win_about.c -> xcfa-5.0.2.tar.gz/src/win_about.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : wind_about.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -30,12 +30,8 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
+#include <stdlib.h>
 
 #ifdef ENABLE_STATIC_LIBRARY
 	#include "../lib/lib.h"
@@ -44,21 +40,12 @@
 #include "global.h"
 #include "get_info.h"
 #include "web.h"
-#include "popup_systray.h"
 #include "win_about.h"
 
 
 
-
-typedef struct {
-
-	GtkWidget	*AdrWin;
-	gboolean	IsShow;
-
-} VAR_WINABOUT;
-
-VAR_WINABOUT	VarWinAbout = { NULL, FALSE };
-
+GtkBuilder	*GtkBuilderProjet_wind_about = NULL;
+GtkWidget	*WindMain_wind_about = NULL;
 
 
 
@@ -66,27 +53,27 @@
 // 
 gboolean on_wind_about_delete_event (GtkWidget *widget, GdkEvent *event, gpointer user_data)
 {
-	gtk_widget_hide (VarWinAbout.AdrWin);
-	VarWinAbout.IsShow = FALSE;
-	PopupSystray_set_BoolMainAction (FALSE);
+	gtk_widget_destroy( WindMain_wind_about );
+	WindMain_wind_about = NULL;
+	GtkBuilderProjet_wind_about = NULL;
 	return (TRUE);
 }
 // 
 // 
 gboolean on_wind_about_destroy_event (GtkWidget *widget, GdkEvent *event, gpointer user_data)
 {
-	gtk_widget_hide (VarWinAbout.AdrWin);
-	VarWinAbout.IsShow = FALSE;
-	PopupSystray_set_BoolMainAction (FALSE);
+	gtk_widget_destroy( WindMain_wind_about );
+	WindMain_wind_about = NULL;
+	GtkBuilderProjet_wind_about = NULL;
 	return (TRUE);
 }
 // 
 // 
 void on_button_ok_about_clicked (GtkButton *button, gpointer user_data)
 {
-	VarWinAbout.IsShow = FALSE;
-	gtk_widget_hide (VarWinAbout.AdrWin);
-	PopupSystray_set_BoolMainAction (FALSE);
+	gtk_widget_destroy( WindMain_wind_about );
+	WindMain_wind_about = NULL;
+	GtkBuilderProjet_wind_about = NULL;
 }
 // 
 // 
@@ -99,25 +86,24 @@
 	#define MAX_TYPE_BUTTON_PAGE_WEB 21
 	TYPE_BUTTON TypeButton [ MAX_TYPE_BUTTON_PAGE_WEB ] = {
 	{"button_pagexcfa_about",		"http://www.xcfa.tuxfamily.org"},
-	// {"button01_contrib_about",		"http://www.road2mayotte.org/index.html"},
-	{"button01_contrib_about",		"http://www.road2mayotte.org/blook/"},
-	{"button02_contrib_about",		"http://e17blog.tuxfamily.org/index.php"},
+	{"button01_contrib_about",		"http://www.road2mayotte.org/blook/"},						/* TODO */
+	{"button02_contrib_about",		"http://e17blog.tuxfamily.org/index.php"},					/* TODO ok */
 	{"button03_contrib_about",		"http://ubunteros.tuxfamily.org/spip.php?page=plan"},
 	{"button04_contrib_about",		"http://www.jesuislibre.org"},
-	{"button05_contrib_about",		"http://audiobezon.dlinkddns.com/"},
+	{"button05_contrib_about",		"http://audiobezon.dlinkddns.com/"},						/* TODO ok */
 	{"button06_contrib_about",		"http://www.tuxfamily.org"},
 	{"button07_contrib_about",		"http://www.framasoft.net/article4492.html"},
 	{"button08_contrib_about",		"http://ekd.tuxfamily.org"},
-	{"button09_contrib_about",		"http://defis-libristes.tuxfamily.org/viewforum.php?id=2"},
+	{"button09_contrib_about",		"http://defis-libristes.tuxfamily.org/viewforum.php?id=2"},	/* TODO */
 	{"button10_contrib_about",		"http://doc.ubuntu-fr.org/xcfa"},
 	{"button11_contrib_about",		"http://unm.arcis.free.fr/spip.php?article109"},
 	{"button12_contrib_about",		"http://ubunteros.tuxfamily.org/spip.php?article168"},
 	{"button13_contrib_about",		"http://ubunteros.tuxfamily.org/spip.php?article159"},
 	{"button14_contrib_about",		"http://ubunteros.tuxfamily.org/spip.php?article30"},
-	{"button15_contrib_about",		"http://lalinuxerie.free.fr/"},
-	{"button16_contrib_about",		"http://www.debian-multimedia.org/"},
+	{"button15_contrib_about",		"http://linuxerie.midiblogs.com/"},
+	{"button16_contrib_about",		"http://www.deb-multimedia.org/"},
 	{"button17_contrib_about",		"http://frugalware.org/"},
-	{"button20_contrib_about",		"http://opera-info.de/forum/thread.php?threadid=20506"},
+	{"button20_contrib_about",		"http://opera-info.de/forum/thread.php?threadid=20506"},	/* TODO ok*/
 	{"button21_contrib_about",		"http://linuxforen.de/forums/showthread.php?p=1693658"},
 	{"button22_contrib_about",		"http://www.alessiotreglia.com/"}
 	};
@@ -125,7 +111,7 @@
 	gint cpt;
 
 	for (cpt = 0; cpt < MAX_TYPE_BUTTON_PAGE_WEB; cpt ++) {
-		if (GTK_BUTTON (button) == GTK_BUTTON (GTK_WIDGET (GLADE_GET_OBJECT(TypeButton [ cpt ].NameWidget)))) {
+		if (GTK_BUTTON (button) == GTK_BUTTON (GTK_WIDGET (gtk_builder_get_object( GtkBuilderProjet_wind_about, TypeButton [ cpt ].NameWidget)))) {
 			web_goto_url (TypeButton [ cpt ].Url);
 			break;
 		}
@@ -135,7 +121,7 @@
 // 
 void on_label_button_pagexcfa_about_realize (GtkWidget *widget, gpointer user_data)
 {
-	gtk_label_set_markup (GTK_LABEL (widget), _(" Xcfa sur le web"));
+	gtk_label_set_markup (GTK_LABEL (widget), _(" Xcfa on the web"));
 }
 // 
 // 
@@ -145,7 +131,7 @@
 	gtk_text_view_set_justification (GTK_TEXT_VIEW (widget), GTK_JUSTIFY_CENTER);
 	gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (widget), FALSE);
 	gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget)),
-	"\n\nCopyright (C) 2003 - 2012\n\n\n"
+	"\n\nCopyright (C) 2003 - 2015\n\n\n"
 	"XCFA is free software; you can redistribute it and/or modify\n"
 	"it under the terms of the GNU General Public License as published by\n"
 	"the Free Software Foundation; either version 3 of the License, or\n"
@@ -229,7 +215,7 @@
 void on_label_author_about_realize (GtkWidget *widget, gpointer user_data)
 {
 	gtk_label_set_justify (GTK_LABEL(widget), GTK_JUSTIFY_CENTER);
-	gtk_label_set_markup (GTK_LABEL(widget), "\nCopyright © 2003-2012 - Bulin Claude - fr\n");
+	gtk_label_set_markup (GTK_LABEL(widget), "\nCopyright © 2003-2015 - Bulin Claude - fr\n");
 }
 // 
 // 
@@ -277,25 +263,31 @@
 }
 // 
 // 
-void WinAbout_open (gchar *title)
+gboolean wind_about_init( GtkWidget *FromWindMain )
 {
-	if (TRUE == VarWinAbout.IsShow) {
-		gdk_window_raise (VarWinAbout.AdrWin->window);
+	gchar	*PackageVersion = NULL;
+	
+	if( NULL == (GtkBuilderProjet_wind_about = Builder_open( "xcfa_win_about.glade", GtkBuilderProjet_wind_about ))) {
+		return( EXIT_FAILURE );
 	}
-	else {		
-		if (NULL == VarWinAbout.AdrWin) {
-			VarWinAbout.AdrWin = GTK_WIDGET (GLADE_GET_OBJECT("wind_about"));
-			gtk_builder_connect_signals (GtkXcfaProjet, NULL);
-		}
-		gtk_window_set_transient_for (GTK_WINDOW(VarWinAbout.AdrWin), GTK_WINDOW(WindMain));
-		gtk_window_set_modal (GTK_WINDOW (VarWinAbout.AdrWin), TRUE);
-		libutils_set_default_icone_to_win (VarWinAbout.AdrWin);
+	// Add language support from glade file
+	gtk_builder_set_translation_domain( GtkBuilderProjet_wind_about, "wind_about" );
+	gtk_builder_connect_signals( GtkBuilderProjet_wind_about, NULL );
 
-		gtk_widget_show (VarWinAbout.AdrWin);
+	WindMain_wind_about = GTK_WIDGET( gtk_builder_get_object( GtkBuilderProjet_wind_about, "wind_about" ));
+	if( NULL != FromWindMain ) {
+		gtk_window_set_transient_for (GTK_WINDOW(WindMain_wind_about), GTK_WINDOW(FromWindMain));
+		gtk_window_set_modal (GTK_WINDOW(WindMain_wind_about), TRUE);
 	}
-	VarWinAbout.IsShow = TRUE;
-	if (NULL != title) gtk_window_set_title (GTK_WINDOW (VarWinAbout.AdrWin), title);
-	
-	PopupSystray_set_BoolMainAction (TRUE);
+	libutils_set_default_icone_to_win( WindMain_wind_about );
+
+	PackageVersion = g_strdup_printf( "%s - %s", PACKAGE_NAME, VERSION );
+	gtk_window_set_title( GTK_WINDOW( WindMain_wind_about ), PackageVersion );
+	g_free( PackageVersion );
+	PackageVersion = NULL;
+
+	gtk_widget_show_all( WindMain_wind_about );
+
+	return( TRUE );
 }

xcfa-4.2.8.tar.gz/src/win_about.h -> xcfa-5.0.2.tar.gz/src/win_about.h Changed

xcfa-4.2.8.tar.gz/src/win_info.c -> xcfa-5.0.2.tar.gz/src/win_info.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : win_info.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,14 +29,9 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
-
 #include <gtk/gtk.h>
 #include <string.h>
+#include <stdlib.h>
 
 #ifdef ENABLE_STATIC_LIBRARY
 	#include "../lib/lib.h"
@@ -46,220 +41,85 @@
 #include "win_info.h"
 
 
-/*
-*---------------------------------------------------------------------------
-* VARIABLES
-*---------------------------------------------------------------------------
-*/
-/*
-
-typedef struct {
-
-	gchar *title;
-	GString *text;
-	
-} WININFO;
-
-WININFO wininfo;
-
-
-// QUIT WITH delete_event
-// 
-gboolean wininfo_on_delete_event (GtkWidget *widget, GdkEvent *event, gpointer user_data)
-{
-	GtkWidget *AdrWin = GTK_WIDGET(user_data);
-	
-	gtk_widget_destroy (AdrWin);
-	return FALSE;
-}
-// QUIT WITH destroy_event
-// 
-gboolean wininfo_on_destroy_event (GtkWidget *widget, GdkEvent *event, gpointer user_data)
-{
-	GtkWidget *AdrWin = GTK_WIDGET(user_data);
-	
-	gtk_widget_destroy (AdrWin);
-	return FALSE;
-}
-// QUIT WITH button
-//
-void wininfo_on_ok_button_clicked (GtkButton *button, gpointer user_data)
-{
-	GtkWidget *AdrWin = GTK_WIDGET(user_data);
-	
-	gtk_widget_destroy (AdrWin);
-}
-// CREATION DE LA FENETRE
-// 
-void wininfo_create_window (void)
-{
-	GtkWidget *dialog;
-	GtkWidget *dialog_vbox1;
-	GtkWidget *vbox1;
-	GtkWidget *label_text;
-	GtkWidget *dialog_action_area1;
-	GtkWidget *ok_button;
-
-	// PRINT_FUNC_LF();
-
-	dialog = gtk_dialog_new ();
-
-	gtk_window_set_title (GTK_WINDOW (dialog), wininfo.title);
-	gtk_window_set_transient_for (GTK_WINDOW(WindMain), GTK_WINDOW(dialog));
-	gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-	gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
-	gtk_window_set_type_hint (GTK_WINDOW (dialog), GDK_WINDOW_TYPE_HINT_DIALOG);
-
-	dialog_vbox1 = GTK_DIALOG (dialog)->vbox;
-	gtk_widget_show (dialog_vbox1);
-
-	vbox1 = gtk_vbox_new (FALSE, 0);
-	gtk_widget_show (vbox1);
-	gtk_box_pack_start (GTK_BOX (dialog_vbox1), vbox1, TRUE, TRUE, 0);
-
-	label_text = gtk_label_new (NULL);
-	gtk_label_set_use_markup (GTK_LABEL (label_text), TRUE);
-	gtk_label_set_markup (GTK_LABEL (label_text), wininfo.text->str);
-	gtk_widget_show (label_text);
-	gtk_box_pack_start (GTK_BOX (vbox1), label_text, FALSE, FALSE, 0);
+GtkBuilder	*GtkBuilderProjet_wind_info = NULL;
+GtkWidget	*WindMain_wind_info = NULL;
 
-	dialog_action_area1 = GTK_DIALOG (dialog)->action_area;
-	gtk_widget_show (dialog_action_area1);
-	gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_SPREAD);
-	
-	ok_button = gtk_button_new_from_stock ("gtk-ok");
-	gtk_widget_show (ok_button);
-	gtk_dialog_add_action_widget (GTK_DIALOG (dialog), ok_button, GTK_RESPONSE_OK);
-	GTK_WIDGET_SET_FLAGS (ok_button, GTK_CAN_DEFAULT);
-	gtk_widget_grab_default (ok_button);
-
-	g_signal_connect ((gpointer) dialog, "delete_event",
-			G_CALLBACK (wininfo_on_delete_event),
-			(gpointer)dialog);
-	g_signal_connect ((gpointer) dialog, "destroy_event",
-			G_CALLBACK (wininfo_on_destroy_event),
-			(gpointer)dialog);
-	g_signal_connect ((gpointer) ok_button, "clicked",
-			G_CALLBACK (wininfo_on_ok_button_clicked),
-			(gpointer)dialog);
-
-	// Store pointers to all widgets, for use by lookup_widget().
-
-	GLADE_HOOKUP_OBJECT_NO_REF (dialog, dialog, "dialog");
-	GLADE_HOOKUP_OBJECT_NO_REF (dialog, dialog_vbox1, "dialog_vbox1");
-	GLADE_HOOKUP_OBJECT (dialog, vbox1, "vbox1");
-	GLADE_HOOKUP_OBJECT (dialog, label_text, "label_text");
-	GLADE_HOOKUP_OBJECT_NO_REF (dialog, dialog_action_area1, "dialog_action_area1");
-	// GLADE_HOOKUP_OBJECT (dialog, ok_button, "ok_button");
-
-	libutils_set_default_icone_to_win (dialog);
-	
-	gtk_widget_show (dialog);
-}
-// DEMANDE DE CREATION DE LA FENETRE
-// 
-void wininfo_create (gchar *title, ...)
-{
-	va_list Arguments;
-	gchar *PtrArg = NULL;
-	
-	wininfo.title = g_strdup (title);				// Stokage du titre
-	wininfo.text = g_string_new (NULL);				// Creation du GString
-	
-	g_string_sprintfa (wininfo.text, "\n %s\n\n", title);	// Titre -> en-tete en gras
-	
-	va_start (Arguments, title);					// Debut des arguments
-	while ( *(PtrArg = va_arg (Arguments, gchar *)) != '\0') {	// TANSQUE message ALORS
-		g_string_sprintfa (wininfo.text, "%s", &PtrArg[0]);	// 	message.stock
-	}								// FIN_TANSQUE
-	va_end (Arguments);						// Fin des arguments
-	
-	wininfo_create_window ();					// Creation fenetre
-	
-	g_free (wininfo.title);						// Suppression des informations
-	wininfo.title = NULL;						// de la structure
-	g_string_free (wininfo.text, TRUE);
-	wininfo.text = NULL;
-}
-*/
-
-
-typedef struct {
-
-	GtkWidget	*AdrWin;
-	gboolean	IsShow;
-	
-} VAR_WININFO;
-
-VAR_WININFO	VarWinInfo = { NULL, FALSE };
 
 
 // QUITTER
 // 
 gboolean on_wind_info_destroy_event( GtkWidget *widget, GdkEvent *event, gpointer user_data )
 {
-	VarWinInfo.IsShow = FALSE;
-	gtk_widget_hide (VarWinInfo.AdrWin);
+	gtk_widget_destroy( WindMain_wind_info );
+	WindMain_wind_info = NULL;
+	GtkBuilderProjet_wind_info = NULL;
 	return TRUE;
 }
 // QUITTER
 // 
 gboolean on_wind_info_delete_event( GtkWidget *widget, GdkEvent *event, gpointer user_data )
 {
-	VarWinInfo.IsShow = FALSE;
-	gtk_widget_hide (VarWinInfo.AdrWin);
+	gtk_widget_destroy( WindMain_wind_info );
+	WindMain_wind_info = NULL;
+	GtkBuilderProjet_wind_info = NULL;
 	return TRUE;
 }
 // QUITTER
 // 
 void on_button_quitter_wininfo_clicked (GtkButton *button, gpointer user_data)
 {
-	VarWinInfo.IsShow = FALSE;
-	gtk_widget_hide (VarWinInfo.AdrWin);
+	gtk_widget_destroy( WindMain_wind_info );
+	WindMain_wind_info = NULL;
+	GtkBuilderProjet_wind_info = NULL;
 }
 // WIN-READER OPEN
 // 
-void wininfo_create (gchar *title, ...)
+gboolean wind_info_init( GtkWidget *FromWindMain, gchar *title, ... )
 {
+	// gchar		*PackageVersion = NULL;
 	gchar		*StrTitle = NULL;
 	va_list		Arguments;
 	gchar		*PtrArg = NULL;
 	GString		*StrTxt = NULL;
-	
-	if (TRUE == VarWinInfo.IsShow) {
-		gdk_window_raise (VarWinInfo.AdrWin->window);
+	// GtkWidget	*button_quitter_wininfo = NULL;
+
+	if( NULL == (GtkBuilderProjet_wind_info = Builder_open( "xcfa_win_info.glade", GtkBuilderProjet_wind_info ))) {
+		return( EXIT_FAILURE );
 	}
-	else {		
-		if (NULL == VarWinInfo.AdrWin) {
-			VarWinInfo.AdrWin = GTK_WIDGET (GLADE_GET_OBJECT("wind_info"));
-			gtk_builder_connect_signals (GtkXcfaProjet, NULL);
-		}
-		gtk_window_set_transient_for (GTK_WINDOW(VarWinInfo.AdrWin), GTK_WINDOW(WindMain));
-		gtk_window_set_modal (GTK_WINDOW (VarWinInfo.AdrWin), TRUE);
-		libutils_set_default_icone_to_win (VarWinInfo.AdrWin);
-		
-		StrTitle = g_strdup_printf ("\n %s \n", title);
-		gtk_label_set_markup (GTK_LABEL (GLADE_GET_OBJECT("label_titre_wininfo")), StrTitle);
-		g_free (StrTitle);	StrTitle = NULL;
-	
-		StrTxt = g_string_new (NULL);					// Creation du GString
-		va_start (Arguments, title);					// Debut des arguments
-		while ( *(PtrArg = va_arg (Arguments, gchar *)) != '\0') {	// TANSQUE message ALORS
-			g_string_sprintfa (StrTxt, "%s", &PtrArg[0]);		// 	message.stock
-		}								// FIN_TANSQUE
-		va_end (Arguments);						// Fin des arguments
-		g_string_sprintfa (StrTxt, "\n\n");
-		
-		gtk_label_set_markup (GTK_LABEL (GLADE_GET_OBJECT("label_texte_wininfo")), StrTxt->str);
-		g_string_free (StrTxt, TRUE);
-		
-		gtk_window_set_title (GTK_WINDOW(VarWinInfo.AdrWin), title);
-		
-		gtk_widget_show (VarWinInfo.AdrWin);
+	// Add language support from glade file
+	gtk_builder_set_translation_domain( GtkBuilderProjet_wind_info, "wind_info" );
+	gtk_builder_connect_signals( GtkBuilderProjet_wind_info, NULL );
+
+	WindMain_wind_info = GTK_WIDGET( gtk_builder_get_object( GtkBuilderProjet_wind_info, "wind_info" ));
+	// button_quitter_wininfo=GTK_WIDGET( gtk_builder_get_object( GtkBuilderProjet_wind_info, "button_quitter_wininfo" ));
+
+	if( NULL != FromWindMain ) {
+		gtk_window_set_transient_for (GTK_WINDOW(WindMain_wind_info), GTK_WINDOW(FromWindMain));
+		gtk_window_set_modal (GTK_WINDOW(WindMain_wind_info), TRUE);
 	}
-	VarWinInfo.IsShow = TRUE;
-}
+	libutils_set_default_icone_to_win( WindMain_wind_info );
+
+	gtk_window_set_title( GTK_WINDOW( WindMain_wind_info ), title );
 
+	StrTitle = g_strdup_printf ("\n %s \n", title);
+	gtk_label_set_markup (GTK_LABEL (gtk_builder_get_object( GtkBuilderProjet_wind_info, "label_titre_wininfo")), StrTitle);
+	g_free (StrTitle);	StrTitle = NULL;
+
+	StrTxt = g_string_new (NULL);								// Creation du GString
+	va_start (Arguments, title);								// Debut des arguments
+	while ( *(PtrArg = va_arg (Arguments, gchar *)) != '\0') {	// TANSQUE message ALORS
+		g_string_append_printf (StrTxt, "%s", &PtrArg[0]);		// 	message.stock
+	}															// FIN_TANSQUE
+	va_end (Arguments);											// Fin des arguments
+	g_string_append_printf (StrTxt, "\n\n");
+
+	gtk_label_set_markup (GTK_LABEL (gtk_builder_get_object( GtkBuilderProjet_wind_info, "label_texte_wininfo")), StrTxt->str);
+	g_string_free (StrTxt, TRUE);
+
+	gtk_widget_show_all( WindMain_wind_info );
+
+	return( TRUE );
+}

xcfa-4.2.8.tar.gz/src/win_info.h -> xcfa-5.0.2.tar.gz/src/win_info.h Changed

xcfa-4.2.8.tar.gz/src/win_reader.c -> xcfa-5.0.2.tar.gz/src/win_reader.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : win_reader.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -44,19 +39,16 @@
 
 #include "global.h"
 #include "mplayer.h"
-#include "popup_systray.h"
 #include "win_reader.h"
 
 
 
 typedef struct {
 
-	GtkWidget	*AdrWin;
-	GtkWidget	*AdrScale;
-	GtkObject	*AdrAdjust;
-	GtkWidget	*AdrHscale;
-	gboolean	IsShow;
-	gboolean	BoolValueChange;
+	GtkWidget		*AdrScale;
+	GtkAdjustment	*AdrAdjust;
+	GtkWidget		*AdrHscale;
+	gboolean		BoolValueChange;
 	
 } VAR_WINDREADER;
 
@@ -64,20 +56,18 @@
 	NULL,
 	NULL,
 	NULL,
-	NULL,
-	FALSE,
 	FALSE
 };
 
 
+GtkBuilder	*GtkBuilderProjet_wind_reader = NULL;
+GtkWidget	*WindMain_wind_reader = NULL;
 
 
 
 void WinReader_set_value (gdouble p_value)
 {
-	if (TRUE == VarWindReader.IsShow) {
-		gtk_adjustment_set_value (GTK_ADJUSTMENT (VarWindReader.AdrAdjust), p_value);
-	}
+	gtk_adjustment_set_value (GTK_ADJUSTMENT (VarWindReader.AdrAdjust), p_value);
 }
 // HSCALE VALUR-CHANGE
 // 
@@ -113,12 +103,20 @@
 // 
 void on_hbox_WindReader_realize (GtkWidget *widget, gpointer user_data)
 {
-	VarWindReader.AdrAdjust = gtk_adjustment_new (0, 0, 100.0, 0.001, 1, 0);
-	VarWindReader.AdrHscale = gtk_hscale_new (GTK_ADJUSTMENT (VarWindReader.AdrAdjust));
+	VarWindReader.AdrAdjust = gtk_adjustment_new(
+									0.0,	// gdouble value,
+									0.0,	// gdouble lower,
+									100.0,	// gdouble upper,
+									0.001,	// gdouble step_increment,
+									1.0,	// gdouble page_increment,
+									0.0		// gdouble page_size
+									);
+	// VarWindReader.AdrAdjust = gtk_adjustment_new (0, 0, 100.0, 0.001, 1, 0);
+	VarWindReader.AdrHscale = gtk_scale_new( GTK_ORIENTATION_HORIZONTAL, GTK_ADJUSTMENT(VarWindReader.AdrAdjust) );
 	gtk_widget_show (VarWindReader.AdrHscale);
 	gtk_scale_set_draw_value (GTK_SCALE (VarWindReader.AdrHscale), FALSE);
 	gtk_box_pack_start (GTK_BOX (widget), VarWindReader.AdrHscale, TRUE, TRUE, 0);
-	GTK_WIDGET_UNSET_FLAGS (widget, GTK_CAN_FOCUS);
+	// GTK_WIDGET_UNSET_FLAGS (widget, GTK_CAN_FOCUS);
 	gtk_scale_set_value_pos (GTK_SCALE (VarWindReader.AdrHscale), GTK_POS_LEFT);
 	g_signal_connect ((gpointer) VarWindReader.AdrHscale, "change_value", G_CALLBACK (WinReader_value_change), NULL);
 	g_signal_connect ((gpointer) VarWindReader.AdrHscale, "event",G_CALLBACK (WinReader_event), NULL);
@@ -128,9 +126,9 @@
 gboolean on_WindReader_delete_event (GtkWidget *widget, GdkEvent *event, gpointer user_data)
 {
 	mplayer_fifo_quit ();
-	VarWindReader.IsShow = FALSE;
-	gtk_widget_hide (VarWindReader.AdrWin);
-	PopupSystray_set_BoolMainAction (FALSE);
+	gtk_widget_destroy( WindMain_wind_reader );
+	WindMain_wind_reader = NULL;
+	GtkBuilderProjet_wind_reader = NULL;
 	return TRUE;
 }
 // DESTROY EVENT
@@ -138,9 +136,9 @@
 gboolean on_WindReader_destroy_event (GtkWidget *widget, GdkEvent *event, gpointer user_data)
 {
 	mplayer_fifo_quit ();
-	VarWindReader.IsShow = FALSE;
-	gtk_widget_hide (VarWindReader.AdrWin);
-	PopupSystray_set_BoolMainAction (FALSE);
+	gtk_widget_destroy( WindMain_wind_reader );
+	WindMain_wind_reader = NULL;
+	GtkBuilderProjet_wind_reader = NULL;
 	return TRUE;
 }
 // PAUSE
@@ -171,80 +169,98 @@
 	VarMplayer.BoolIsPause = FALSE;
 	mplayer_fifo_seek (VarMplayer.PercentTempsActuel);
 	mplayer_fifo_quit ();
-	VarWindReader.IsShow = FALSE;
-	gtk_widget_hide (VarWindReader.AdrWin);
-	PopupSystray_set_BoolMainAction (FALSE);
-}
-// WIN-READER OPEN
-// 
-void WinReader_open (gchar *title)
-{
-	if (TRUE == VarWindReader.IsShow) {
-		gdk_window_raise (VarWindReader.AdrWin->window);
-	}
-	else {		
-		if (NULL == VarWindReader.AdrWin) {
-			VarWindReader.AdrWin = GTK_WIDGET (GLADE_GET_OBJECT("WindReader"));
-			gtk_builder_connect_signals (GtkXcfaProjet, NULL);
-		}
-		gtk_window_set_transient_for (GTK_WINDOW(VarWindReader.AdrWin), GTK_WINDOW(WindMain));
-		gtk_window_set_modal (GTK_WINDOW (VarWindReader.AdrWin), TRUE);
-		libutils_set_default_icone_to_win (VarWindReader.AdrWin);
-
-		gtk_widget_show (VarWindReader.AdrWin);
-	}
-	VarWindReader.IsShow = TRUE;
-	VarWindReader.BoolValueChange = FALSE;
-	if (NULL != title) gtk_window_set_title (GTK_WINDOW (VarWindReader.AdrWin), title);
-	
-	if (LIST_MPLAYER_FROM_DVD == VarMplayer.ListPlayFrom) {
-		gtk_widget_hide (GTK_WIDGET (GLADE_GET_OBJECT("hbox_WindReader")));
-	}
-	else {
-		gtk_widget_show (GTK_WIDGET (GLADE_GET_OBJECT("hbox_WindReader")));
-	}
-	PopupSystray_set_BoolMainAction (TRUE);
+	gtk_widget_destroy( WindMain_wind_reader );
+	WindMain_wind_reader = NULL;
+	GtkBuilderProjet_wind_reader = NULL;
 }
 // WIN-READER SET-TITLE
 // 
 void WinReader_set_title (gchar *title)
 {
-	if (TRUE == VarWindReader.IsShow && NULL != title) gtk_window_set_title (GTK_WINDOW (VarWindReader.AdrWin), title);
+	if (NULL != title) gtk_window_set_title (GTK_WINDOW (WindMain_wind_reader), title);
 }
 // WIN-READER SHOW-PAUSE & HIDE-LECTURE
 // 
 void WinReader_set_pause (void)
 {
-	if (TRUE == VarWindReader.IsShow) {
-		gtk_widget_hide (GTK_WIDGET (GLADE_GET_OBJECT("button_lecture_WindReader")));
-		gtk_widget_show (GTK_WIDGET (GLADE_GET_OBJECT("button_pause_WindReader")));
-	}
+	gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object( GtkBuilderProjet_wind_reader, "button_lecture_WindReader")));
+	gtk_widget_show (GTK_WIDGET (gtk_builder_get_object( GtkBuilderProjet_wind_reader, "button_pause_WindReader")));
 }
 // WIN-READER HIDE-PAUSE & SHOW-LECTURE
 // 
 void WinReader_set_lecture (void)
 {
-	if (TRUE == VarWindReader.IsShow) {
-		gtk_widget_hide (GTK_WIDGET (GLADE_GET_OBJECT("button_pause_WindReader")));
-		gtk_widget_show (GTK_WIDGET (GLADE_GET_OBJECT("button_lecture_WindReader")));
-	}
+
+	gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object( GtkBuilderProjet_wind_reader, "button_pause_WindReader")));
+	gtk_widget_show (GTK_WIDGET (gtk_builder_get_object( GtkBuilderProjet_wind_reader, "button_lecture_WindReader")));
+
 }
 // WIN-READER CLOSE
 // 
 void WinReader_close (void)
 {
-	if (TRUE == VarWindReader.IsShow) {
-		WinReader_set_lecture ();
-		VarWindReader.IsShow = FALSE;
-		gtk_widget_hide (VarWindReader.AdrWin);
-		PopupSystray_set_BoolMainAction (FALSE);
-	}
+	WinReader_set_lecture ();
+	gtk_widget_destroy( WindMain_wind_reader );
+	WindMain_wind_reader = NULL;
+	GtkBuilderProjet_wind_reader = NULL;
 }
 // WIN-READER IS OK
 // 
 gboolean WinReader_is_close (void)
 {
-	return (VarWindReader.IsShow ? FALSE : TRUE);
+	return (WindMain_wind_reader ? FALSE : TRUE);
+}
+// WIN-READER OPEN
+// 
+gboolean wind_reader_init( GtkWidget *FromWindMain )
+{
+	gchar	*PackageVersion = NULL;
+	// GtkWidget	*button_quitter_WindReader = NULL;
+	// GtkWidget	*button_lecture_WindReader = NULL;
+	// GtkWidget	*button_pause_WindReader = NULL;
+	// GtkWidget	*hbox_WindReader = NULL;
+
+	if( NULL == (GtkBuilderProjet_wind_reader = Builder_open( "xcfa_win_reader.glade", GtkBuilderProjet_wind_reader ))) {
+		return( EXIT_FAILURE );
+	}
+	// Add language support from glade file
+	gtk_builder_set_translation_domain( GtkBuilderProjet_wind_reader, "WindReader" );
+	gtk_builder_connect_signals( GtkBuilderProjet_wind_reader, NULL );
+
+	WindMain_wind_reader = GTK_WIDGET( gtk_builder_get_object( GtkBuilderProjet_wind_reader, "WindReader" ));
+	// button_quitter_WindReader=GTK_WIDGET( gtk_builder_get_object( GtkBuilderProjet_wind_reader, "button_quitter_WindReader" ));
+	// button_lecture_WindReader=GTK_WIDGET( gtk_builder_get_object( GtkBuilderProjet_wind_reader, "button_lecture_WindReader" ));
+	// button_pause_WindReader=GTK_WIDGET( gtk_builder_get_object( GtkBuilderProjet_wind_reader, "button_pause_WindReader" ));
+	// hbox_WindReader=GTK_WIDGET( gtk_builder_get_object( GtkBuilderProjet_wind_reader, "hbox_WindReader" ));
+
+	if( NULL != FromWindMain ) {
+		gtk_window_set_transient_for (GTK_WINDOW(WindMain_wind_reader), GTK_WINDOW(FromWindMain));
+		gtk_window_set_modal (GTK_WINDOW(WindMain_wind_reader), TRUE);
+	}
+	// resize window
+	// gtk_window_resize(GTK_WINDOW(WindMain_wind_reader), Config.WinWidth, Config.WinHeight);
+	// place the window
+	// gtk_window_move(GTK_WINDOW(WindMain_wind_reader), Config.WinPos_X, Config.WinPos_Y);
+	// icon apply
+	libutils_set_default_icone_to_win( WindMain_wind_reader );
+
+	PackageVersion = g_strdup_printf( "%s - %s", PACKAGE_NAME, VERSION );
+	gtk_window_set_title( GTK_WINDOW( WindMain_wind_reader ), PackageVersion );
+	g_free( PackageVersion );
+	PackageVersion = NULL;
+
+	// place your initialization code here
+
+	gtk_widget_show_all( WindMain_wind_reader );
+	
+	VarWindReader.BoolValueChange = FALSE;
+	
+	if (LIST_MPLAYER_FROM_DVD == VarMplayer.ListPlayFrom)
+			gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object( GtkBuilderProjet_wind_reader, "hbox_WindReader")));
+	else	gtk_widget_show (GTK_WIDGET (gtk_builder_get_object( GtkBuilderProjet_wind_reader, "hbox_WindReader")));
+
+
+	return( TRUE );
 }

xcfa-4.2.8.tar.gz/src/win_reader.h -> xcfa-5.0.2.tar.gz/src/win_reader.h Changed

xcfa-4.2.8.tar.gz/src/win_scan.c -> xcfa-5.0.2.tar.gz/src/win_scan.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : win_scan.c
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - GTK+ implementation of the GNU shell command
 * GNU General Public License
@@ -29,11 +29,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -50,10 +45,8 @@
 
 typedef struct {
 
-	GtkWidget	*AdrWin;
 	GtkWidget	*AdrProgressBar;
 	GtkWidget	*AdrLabel;
-	gboolean	IsShow;
 	guint		HandlerTimeout;
 	TYPE_PROGRESS	TypeProgress;
 	gboolean	close_request;
@@ -64,14 +57,15 @@
 VAR_WINDSCAN VarWindScan = {
 	NULL,
 	NULL,
-	NULL,
-	FALSE,
 	0,
 	WINDSCAN_PULSE,
 	FALSE
 };
 
 
+GtkBuilder	*GtkBuilderProjet_wind_scan = NULL;
+GtkWidget	*WindMain_wind_scan = NULL;
+// GtkWidget	*WindMain
 // 
 // 
 void on_label_windscan_realize (GtkWidget *widget, gpointer user_data)
@@ -88,7 +82,7 @@
 // 
 void WindScan_quit (void)
 {
-	if (TRUE == VarWindScan.IsShow) VarWindScan.close_request = TRUE;
+	VarWindScan.close_request = TRUE;
 }
 // 
 // 
@@ -113,13 +107,14 @@
 // 
 static gint WindScan_timeout (gpointer data)
 {
-	if (TRUE == VarWindScan.close_request && TRUE == VarWindScan.IsShow) {
+	if( TRUE == VarWindScan.close_request ) {
 		VarWindScan.close_request = FALSE;
-		VarWindScan.IsShow = FALSE;
-		gtk_timeout_remove (VarWindScan.HandlerTimeout);
-		gtk_widget_hide (VarWindScan.AdrWin);
+		g_source_remove (VarWindScan.HandlerTimeout);
+		gtk_widget_destroy( WindMain_wind_scan );
+		WindMain_wind_scan = NULL;
+		GtkBuilderProjet_wind_scan = NULL;
 	}
-	else if (TRUE == VarWindScan.IsShow) {
+	else {
 		if (VarWindScan.TypeProgress == WINDSCAN_PULSE) {
 			gtk_progress_bar_pulse (GTK_PROGRESS_BAR(VarWindScan.AdrProgressBar));
 		}
@@ -128,32 +123,39 @@
 }
 // 
 // 
-gboolean WindScan_open (gchar *title, TYPE_PROGRESS TypeProgress)
+gboolean wind_scan_init( GtkWidget *FromWindMain, gchar *title, TYPE_PROGRESS TypeProgress )
 {
-	gboolean	BoolIsShow = VarWindScan.IsShow;
-	
 	VarWindScan.CloseByUser = FALSE;
 	VarWindScan.close_request = FALSE;
-	// PRINT("------------------------------------------------------------");
-	// g_print( "VarWindScan.IsShow = %s\n", VarWindScan.IsShow ? "TRUE" : "FALSE" );
-	if (TRUE == VarWindScan.IsShow) {
-		gdk_window_raise (VarWindScan.AdrWin->window);
+	if( NULL == (GtkBuilderProjet_wind_scan = Builder_open( "xcfa_win_scan.glade", GtkBuilderProjet_wind_scan ))) {
+		return( EXIT_FAILURE );
 	}
-	else {		
-		if (NULL == VarWindScan.AdrWin) {
-			VarWindScan.AdrWin = GTK_WIDGET (GLADE_GET_OBJECT("WindScan"));
-			gtk_builder_connect_signals (GtkXcfaProjet, NULL);
-		}
-		gtk_window_set_transient_for (GTK_WINDOW(VarWindScan.AdrWin), GTK_WINDOW(WindMain));
-		gtk_window_set_modal (GTK_WINDOW (VarWindScan.AdrWin), TRUE);
-		libutils_set_default_icone_to_win (VarWindScan.AdrWin);
+	// Add language support from glade file
+	gtk_builder_set_translation_domain( GtkBuilderProjet_wind_scan, "WindScan" );
+	gtk_builder_connect_signals( GtkBuilderProjet_wind_scan, NULL );
+
+	WindMain_wind_scan = GTK_WIDGET( gtk_builder_get_object( GtkBuilderProjet_wind_scan, "WindScan" ));
+	// button_cancel_windscan=GTK_WIDGET( gtk_builder_get_object( GtkBuilderProjet_wind_scan, "button_cancel_windscan" ));
+	// label_windscan=GTK_WIDGET( gtk_builder_get_object( GtkBuilderProjet_wind_scan, "label_windscan" ));
+	// progressbar_windscan=GTK_WIDGET( gtk_builder_get_object( GtkBuilderProjet_wind_scan, "progressbar_windscan" ));
+	// scrolledwindow_windscan=GTK_WIDGET( gtk_builder_get_object( GtkBuilderProjet_wind_scan, "scrolledwindow_windscan" ));
 
-		gtk_widget_show (VarWindScan.AdrWin);
-		WindScan_hide_expander ();
+	if( NULL != FromWindMain ) {
+		gtk_window_set_transient_for (GTK_WINDOW(WindMain_wind_scan), GTK_WINDOW(FromWindMain));
+		gtk_window_set_modal (GTK_WINDOW(WindMain_wind_scan), TRUE);
 	}
-	VarWindScan.IsShow = TRUE;
-	gtk_window_set_title (GTK_WINDOW (VarWindScan.AdrWin), title);
-	
+	// resize window
+	// gtk_window_resize(GTK_WINDOW(WindMain_wind_scan), Config.WinWidth, Config.WinHeight);
+	// place the window
+	// gtk_window_move(GTK_WINDOW(WindMain_wind_scan), Config.WinPos_X, Config.WinPos_Y);
+	// icon apply
+	libutils_set_default_icone_to_win( WindMain_wind_scan );
+	gtk_window_set_title( GTK_WINDOW( WindMain_wind_scan ), title );
+
+	// place your initialization code here
+
+	gtk_widget_show_all( WindMain_wind_scan );
+	WindScan_hide_expander ();
 	if (VarWindScan.TypeProgress == WINDSCAN_PULSE) {
 		gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR (VarWindScan.AdrProgressBar), PANGO_ELLIPSIZE_START);
 		gtk_progress_bar_set_pulse_step (GTK_PROGRESS_BAR (VarWindScan.AdrProgressBar), 0.1);
@@ -161,15 +163,26 @@
 		gtk_progress_bar_set_text (GTK_PROGRESS_BAR (VarWindScan.AdrProgressBar), "");
 	}
 	else {
-		gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR (VarWindScan.AdrProgressBar), GTK_PROGRESS_LEFT_TO_RIGHT);
+		gtk_orientable_set_orientation( GTK_ORIENTABLE(VarWindScan.AdrProgressBar), GTK_ORIENTATION_HORIZONTAL);
+		// gtk_orientable_set_orientation( GTK_PROGRESS_BAR (VarWindScan.AdrProgressBar), GTK_PROGRESS_LEFT_TO_RIGHT );
+		// gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR (VarWindScan.AdrProgressBar), GTK_PROGRESS_LEFT_TO_RIGHT );
 		gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (VarWindScan.AdrProgressBar), 0.0);
 		gtk_progress_bar_set_text (GTK_PROGRESS_BAR (VarWindScan.AdrProgressBar), _("Waiting ..."));
 	}
 	WindScan_show_cancel( TRUE );
-	VarWindScan.HandlerTimeout = gtk_timeout_add (100, WindScan_timeout, 0);
-	
-	return (BoolIsShow);
+	VarWindScan.HandlerTimeout = g_timeout_add( 200, WindScan_timeout, 0 );
+
+	return( TRUE );
 }
+
+
+
+
+
+
+
+
+
 // 
 // 
 void WindScan_set_pulse (void)
@@ -184,7 +197,8 @@
 void WindScan_set_progress (gchar *p_str, double p_etat)
 {
 	VarWindScan.TypeProgress = WINDSCAN_PROGRESS;
-	gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR (VarWindScan.AdrProgressBar), GTK_PROGRESS_LEFT_TO_RIGHT);
+	// gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR (VarWindScan.AdrProgressBar), GTK_PROGRESS_LEFT_TO_RIGHT);
+	gtk_orientable_set_orientation( GTK_ORIENTABLE(VarWindScan.AdrProgressBar), GTK_ORIENTATION_HORIZONTAL);
 	if (p_etat < 0.0)	p_etat = 0.0;
 	if (p_etat > 1.0)	p_etat = 1.0;
 	gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (VarWindScan.AdrProgressBar), p_etat);
@@ -219,20 +233,20 @@
 // 
 void WindScan_hide_expander (void)
 {
-	gtk_widget_hide (GTK_WIDGET (GLADE_GET_OBJECT("expander_windscan")));
+	gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object( GtkBuilderProjet_wind_scan, "expander_windscan")));
 }
 // 
 // 
 void WindScan_show_expander (void)
 {
-	gtk_widget_show (GTK_WIDGET (GLADE_GET_OBJECT("expander_windscan")));
-	gtk_expander_set_expanded (GTK_EXPANDER (GLADE_GET_OBJECT("expander_windscan")), TRUE);
+	gtk_widget_show (GTK_WIDGET (gtk_builder_get_object( GtkBuilderProjet_wind_scan, "expander_windscan")));
+	gtk_expander_set_expanded (GTK_EXPANDER (gtk_builder_get_object( GtkBuilderProjet_wind_scan, "expander_windscan")), TRUE);
 }
 // 
 // 
 void WindScan_show_cancel( gboolean p_bool_show )
 {
-	gtk_widget_set_sensitive( GTK_WIDGET( GLADE_GET_OBJECT( "button_cancel_windscan" )), p_bool_show );
+	gtk_widget_set_sensitive( GTK_WIDGET( gtk_builder_get_object( GtkBuilderProjet_wind_scan, "button_cancel_windscan" )), p_bool_show );
 }
 // 
 //

xcfa-4.2.8.tar.gz/src/win_scan.h -> xcfa-5.0.2.tar.gz/src/win_scan.h Changed

xcfa-5.0.2.tar.gz/src/win_treeview.c Added

@@ -0,0 +1,536 @@
+ /*
+ * file : win_treeview.c
+ * project : xcfa
+ * with : Gtk-3
+ *
+ * copyright : (C) 2003 - 2015 by Claude Bulin
+ *
+ * xcfa - GTK+ implementation of the GNU shell command
+ * GNU General Public License
+ *
+ * This file is part of XCFA.
+ * 
+ * XCFA is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
+ * 
+ * XCFA is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with XCFA. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+#include <string.h>
+#include <stdlib.h>
+
+#ifdef ENABLE_STATIC_LIBRARY
+	#include "../lib/lib.h"
+#endif
+
+#include "global.h"
+#include "dvd.h"
+#include "cd_audio.h"
+#include "file.h"
+#include "configuser.h"
+#include "win_treeview.h"
+
+
+
+GtkBuilder	*GtkBuilderProjet_wind_treeview = NULL;
+GtkWidget	*WindMain_wind_treeview = NULL;
+
+
+
+#define MAX_DATAS_STRUCT_RADIOBUTTONS 6
+
+typedef struct {
+	gchar			 	*NameLeft;
+	gchar			 	*NameCenter;
+	gchar			 	*NameRight;
+	GtkCellRenderer		**AdrRenderer;
+	GtkTreeViewColumn	**AdrTreeViewColumn;
+	gint			 	Pos;
+} TAB_POSNAME;
+
+TAB_POSNAME TabPosName [ MAX_DATAS_STRUCT_RADIOBUTTONS ] = {
+	{"radiobutton_nameleft_dvd", "radiobutton_namecenter_dvd", "radiobutton_nameright_dvd",
+	&var_dvd.Renderer, &var_dvd.Adr_Column_Nom,
+	1},
+	{"radiobutton_nameleft_cd", "radiobutton_namecenter_cd", "radiobutton_nameright_cd",
+	&var_cd.Renderer, &var_cd.Adr_Column_Nom,
+	1},
+	{"radiobutton_nameleft_allfile", "radiobutton_namecenter_allfile", "radiobutton_nameright_allfile",
+	&var_file.Renderer, &var_file.Adr_ColumnFileName,
+	1},
+	{"radiobutton_nameleft_wav", "radiobutton_namecenter_wav", "radiobutton_nameright_wav",
+	&var_file_wav.Renderer, &var_file_wav.Adr_ColumnFileWavName,
+	1},
+	{"radiobutton_nameleft_mp3ogg", "radiobutton_namecenter_mp3ogg", "radiobutton_nameright_mp3ogg",
+	&var_file_mp3ogg.Renderer, &var_file_mp3ogg.Adr_ColumnFileMp3OggName,
+	1},
+	{"radiobutton_nameleft_tags", "radiobutton_namecenter_tags", "radiobutton_nameright_tags",
+	&var_file_tags.Renderer, &var_file_tags.Adr_ColumnFileTagsName,
+	1}
+	} ;
+
+
+
+
+#define POS_STRUCT_DVD			00
+#define POS_STRUCT_CD			07
+#define POS_STRUCT_CONVERSIONS		21
+#define POS_STRUCT_WAV			37
+#define POS_STRUCT_MP3OGG		44
+#define POS_STRUCT_TAGS			50
+#define MAX_DATAS_STRUCT_TREEVIEW	53
+
+typedef struct {
+
+	GtkWidget	*AdrWin;
+	gboolean	IsShow;
+	gboolean	BoolNoEnter;
+	gint		PageNotebook;
+
+} VAR_TREEVIEW;
+
+VAR_TREEVIEW VarTreeView = {
+	NULL,
+	FALSE,
+	TRUE,
+	0
+};
+
+typedef struct {
+	gchar			 *Name;
+	gboolean		 BoolIsVisible;
+	GtkTreeViewColumn	**AdrTreeViewColumn;
+} TAB_SHOWHIDE;
+
+TAB_SHOWHIDE TabShowHide [ MAX_DATAS_STRUCT_TREEVIEW ] = {
+// 	
+// 	Name								BoolIsVisible: DVD, CD, FILE, WAV, MP3OGG, TAGS
+// 										| AdrTreeViewColumn
+// 	 POS_STRUCT_DVD = 0 	| | 
+	{"checkbutton_titre_dvd",			TRUE, &var_dvd.Adr_Column_Titres},
+	{"checkbutton_play_dvd",			TRUE, &var_dvd.Adr_Column_Play},
+	{"checkbutton_temps_dvd",			TRUE, &var_dvd.Adr_Column_Temps},
+	{"checkbutton_format_dvd",			TRUE, &var_dvd.Adr_Column_Format},
+	{"checkbutton_choix_dvd",			TRUE, &var_dvd.Adr_Column_Choix},
+	{"checkbutton_normalise_dvd",		TRUE, &var_dvd.Adr_Column_Normalise},
+	{"checkbutton_nom_dvd",				TRUE, &var_dvd.Adr_Column_Nom},
+	// POS_STRUCT_CD = 7
+	{"checkbutton_play_cd",				TRUE, &var_cd.Adr_Column_Play},
+	{"checkbutton_wav_cd",				TRUE, &var_cd.Adr_Column_Wav},
+	{"checkbutton_flac_cd",				TRUE, &var_cd.Adr_Column_Flac},
+	{"checkbutton_ape_cd",				TRUE, &var_cd.Adr_Column_Ape},
+	{"checkbutton_wavpack_cd",			TRUE, &var_cd.Adr_Column_Wavpack},
+	{"checkbutton_ogg_cd",				TRUE, &var_cd.Adr_Column_Ogg},
+	{"checkbutton_m4a_cd",				TRUE, &var_cd.Adr_Column_M4a},
+	{"checkbutton_aac_cd",				TRUE, &var_cd.Adr_Column_Aac},
+	{"checkbutton_musepack_cd",			TRUE, &var_cd.Adr_Column_Mpc},
+	{"checkbutton_mp3_cd",				TRUE, &var_cd.Adr_Column_Mp3},
+	{"checkbutton_num_cd",				TRUE, &var_cd.Adr_Column_Num},
+	{"checkbutton_time_cd",				TRUE, &var_cd.Adr_Column_Time},
+	{"checkbutton_normalise_cd",		TRUE, &var_cd.Adr_Column_Normalise},
+	{"checkbutton_nom_cd",				TRUE, &var_cd.Adr_Column_Nom},
+	// POS_STRUCT_CONVERSIONS = 21
+	{"checkbutton_play_allfile",		TRUE, &var_file.Adr_ColumnFilePlay},
+	{"checkbutton_trash_allfile",		TRUE, &var_file.Adr_ColumnFileTrash},
+	{"checkbutton_type_allfile",		TRUE, &var_file.Adr_ColumnFileType},
+	{"checkbutton_wav_allfile",			TRUE, &var_file.Adr_ColumnFileWav},
+	{"checkbutton_flac_allfile",		TRUE, &var_file.Adr_ColumnFileFlac},
+	{"checkbutton_ape_allfile",			TRUE, &var_file.Adr_ColumnFileApe},
+	{"checkbutton_wavpack_allfile",		TRUE, &var_file.Adr_ColumnFileWavPack},
+	{"checkbutton_ogg_allfile",			TRUE, &var_file.Adr_ColumnFileOgg},
+	{"checkbutton_m4a_allfile",			TRUE, &var_file.Adr_ColumnFileM4a},
+	{"checkbutton_aac_allfile",			TRUE, &var_file.Adr_ColumnFileAac},
+	{"checkbutton_musepack_allfile",	TRUE, &var_file.Adr_ColumnFileMpc},
+	{"checkbutton_mp3_allfile",			TRUE, &var_file.Adr_ColumnFileMp3},
+	{"checkbutton_time_allfile",		TRUE, &var_file.Adr_ColumnFileTime},
+	{"checkbutton_normalise_allfile",	TRUE, &var_file.Adr_ColumnFileNormalize},
+	{"checkbutton_replaygain_allfile",	TRUE, &var_file.Adr_ColumnFileReplayGain},
+	{"checkbutton_nom_allfile",			TRUE, &var_file.Adr_ColumnFileName},
+	// POS_STRUCT_WAV = 37
+	{"checkbutton_hertz_wav",			TRUE, &var_file_wav.Adr_ColumnFileWavHertz},
+	{"checkbutton_newhertz_wav",		TRUE, &var_file_wav.Adr_ColumnFileWavNewHertz},
+	{"checkbutton_voie_wav",			TRUE, &var_file_wav.Adr_ColumnFileWavVoie},
+	{"checkbutton_newvoie_wav",			TRUE, &var_file_wav.Adr_ColumnFileWavNewVoie},
+	{"checkbutton_bits_wav",			TRUE, &var_file_wav.Adr_ColumnFileWavBits},
+	{"checkbutton_newbits_wav",			TRUE, &var_file_wav.Adr_ColumnFileWavNewBits},
+	{"checkbutton_nom_wav",				TRUE, &var_file_wav.Adr_ColumnFileWavName},
+	// POS_STRUCT_MP3OGG = 44
+	{"checkbutton_type_mp3ogg",			TRUE, &var_file_mp3ogg.Adr_ColumnFileMp3OggType},
+	{"checkbutton_bitrate_mp3ogg",		TRUE, &var_file_mp3ogg.Adr_ColumnFileMp3OggBitrate},
+	{"checkbutton_nexbitrate_mp3ogg",	TRUE, &var_file_mp3ogg.Adr_ColumnFileMp3OggNewBitrate},
+	{"checkbutton_size_mp3ogg",			TRUE, &var_file_mp3ogg.Adr_ColumnFileMp3OggSize},
+	{"checkbutton_time_mp3ogg",			TRUE, &var_file_mp3ogg.Adr_ColumnFileMp3OggTime},
+	{"checkbutton_nom_mp3ogg",			TRUE, &var_file_mp3ogg.Adr_ColumnFileMp3OggName},
+	// POS_STRUCT_TAGS = 50
+	{"checkbutton_type_tags",			TRUE, &var_file_tags.Adr_ColumnFileTagsType},
+	{"checkbutton_time_tags",			TRUE, &var_file_tags.Adr_ColumnFileTagsTime},
+	{"checkbutton_nom_tags",			TRUE, &var_file_tags.Adr_ColumnFileTagsName}
+	};
+
+
+
+// SET ETAT FIELDS TO STRING-ETAT FOR SAVE CONFIG
+// 
+void treeview_get_etat_fields (void)
+{
+	gint cpt;
+	
+	VarTreeView.BoolNoEnter = TRUE;
+	
+	// Remove string
+	if (NULL != Config.StringBoolFieldsIsVisible) {
+		g_free (Config.StringBoolFieldsIsVisible);
+		Config.StringBoolFieldsIsVisible = NULL;
+	}
+	// Allocate string
+	Config.StringBoolFieldsIsVisible = g_strnfill (MAX_DATAS_STRUCT_TREEVIEW +4, '1');
+
+	// Set 1 (TRUE) is visible else set 0 (FALSE)
+	for (cpt = POS_STRUCT_DVD; cpt < MAX_DATAS_STRUCT_TREEVIEW; cpt ++) {
+		Config.StringBoolFieldsIsVisible [ cpt ] = (TabShowHide [ cpt ].BoolIsVisible == FALSE) ? '0' : '1';
+	}
+	Config.StringBoolFieldsIsVisible [ cpt ] = '\0';
+	
+	VarTreeView.BoolNoEnter = FALSE;
+}
+// CALL FROM MAIN.C
+// 
+void wintreeview_set_etat_fields (void)
+{
+	gint cpt;
+
+	if( NULL == GtkBuilderProjet_wind_treeview ) {
+		GtkBuilderProjet_wind_treeview = Builder_open( "xcfa_win_treeview.glade", GtkBuilderProjet_wind_treeview );
+	}
+	if( NULL == WindMain_wind_treeview ) {
+		WindMain_wind_treeview = GTK_WIDGET( gtk_builder_get_object( GtkBuilderProjet_wind_treeview, "wind_treeview" ));
+	}
+
+	if (NULL == Config.StringBoolFieldsIsVisible) {
+		treeview_get_etat_fields ();
+	}
+	
+	VarTreeView.BoolNoEnter = TRUE;
+	
+	// Set 1 (TRUE) is visible else set 0 (FALSE)
+	for (cpt = POS_STRUCT_DVD; cpt < MAX_DATAS_STRUCT_TREEVIEW; cpt ++) {
+		TabShowHide [ cpt ].BoolIsVisible = (Config.StringBoolFieldsIsVisible [ cpt ] == '0') ? FALSE : TRUE;
+		// Place le CheckButton avec cet etat
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object( GtkBuilderProjet_wind_treeview, TabShowHide [ cpt ].Name)), TabShowHide [ cpt ].BoolIsVisible);
+		gtk_tree_view_column_set_visible (GTK_TREE_VIEW_COLUMN (*TabShowHide [ cpt ].AdrTreeViewColumn), TabShowHide [ cpt ].BoolIsVisible);
+	}
+	
+	VarTreeView.BoolNoEnter = FALSE;
+}
+// 
+// 
+gboolean on_wind_treeview_delete_event (GtkWidget *widget, GdkEvent *event, gpointer user_data)
+{
+	treeview_get_etat_fields ();
+	gtk_widget_destroy( WindMain_wind_treeview );
+	WindMain_wind_treeview = NULL;
+	GtkBuilderProjet_wind_treeview = NULL;
+	return TRUE;
+}
+// 
+// 
+gboolean on_wind_treeview_destroy_event (GtkWidget *widget, GdkEvent *event, gpointer user_data)
+{
+	treeview_get_etat_fields ();
+	gtk_widget_destroy( WindMain_wind_treeview );
+	WindMain_wind_treeview = NULL;
+	GtkBuilderProjet_wind_treeview = NULL;
+	return TRUE;
+}
+// 
+// 
+void on_button_quit_windtreeview_clicked (GtkButton *button, gpointer user_data)
+{
+	treeview_get_etat_fields ();
+	gtk_widget_destroy( WindMain_wind_treeview );
+	WindMain_wind_treeview = NULL;
+	GtkBuilderProjet_wind_treeview = NULL;
+}
+// 
+// 
+void treeview_SetGlobal (gboolean BoolVisible)
+{
+	gint	cpt;
+
+	VarTreeView.BoolNoEnter = TRUE;
+
+	switch(VarTreeView.PageNotebook) {
+	case 0 :
+		for (cpt = POS_STRUCT_DVD; cpt < POS_STRUCT_CD; cpt ++) {
+			TabShowHide [ cpt ].BoolIsVisible = BoolVisible;
+			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object( GtkBuilderProjet_wind_treeview, TabShowHide [ cpt ].Name)), TabShowHide [ cpt ].BoolIsVisible);
+			gtk_tree_view_column_set_visible (GTK_TREE_VIEW_COLUMN (*TabShowHide [ cpt ].AdrTreeViewColumn), TabShowHide [ cpt ].BoolIsVisible);
+		}
+		break;
+	case 1 :
+		for (cpt = POS_STRUCT_CD; cpt < POS_STRUCT_CONVERSIONS; cpt ++) {
+			TabShowHide [ cpt ].BoolIsVisible = BoolVisible;
+			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object( GtkBuilderProjet_wind_treeview, TabShowHide [ cpt ].Name)), TabShowHide [ cpt ].BoolIsVisible);
+			gtk_tree_view_column_set_visible (GTK_TREE_VIEW_COLUMN (*TabShowHide [ cpt ].AdrTreeViewColumn), TabShowHide [ cpt ].BoolIsVisible);
+		}
+		break;
+	case 2 :
+		for (cpt = POS_STRUCT_CONVERSIONS; cpt < POS_STRUCT_WAV; cpt ++) {
+			TabShowHide [ cpt ].BoolIsVisible = BoolVisible;
+			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object( GtkBuilderProjet_wind_treeview, TabShowHide [ cpt ].Name)), TabShowHide [ cpt ].BoolIsVisible);
+			gtk_tree_view_column_set_visible (GTK_TREE_VIEW_COLUMN (*TabShowHide [ cpt ].AdrTreeViewColumn), TabShowHide [ cpt ].BoolIsVisible);
+		}
+		break;
+	case 3 :
+		for (cpt = POS_STRUCT_WAV; cpt < POS_STRUCT_MP3OGG; cpt ++) {
+			TabShowHide [ cpt ].BoolIsVisible = BoolVisible;
+			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object( GtkBuilderProjet_wind_treeview, TabShowHide [ cpt ].Name)), TabShowHide [ cpt ].BoolIsVisible);
+			gtk_tree_view_column_set_visible (GTK_TREE_VIEW_COLUMN (*TabShowHide [ cpt ].AdrTreeViewColumn), TabShowHide [ cpt ].BoolIsVisible);
+		}
+		break;
+	case 4 :
+		for (cpt = POS_STRUCT_MP3OGG; cpt < MAX_DATAS_STRUCT_TREEVIEW; cpt ++) {
+			TabShowHide [ cpt ].BoolIsVisible = BoolVisible;
+			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object( GtkBuilderProjet_wind_treeview, TabShowHide [ cpt ].Name)), TabShowHide [ cpt ].BoolIsVisible);
+			gtk_tree_view_column_set_visible (GTK_TREE_VIEW_COLUMN (*TabShowHide [ cpt ].AdrTreeViewColumn), TabShowHide [ cpt ].BoolIsVisible);
+		}
+		break;
+	case 5 :
+		for (cpt = POS_STRUCT_TAGS; cpt < MAX_DATAS_STRUCT_TREEVIEW; cpt ++) {
+			TabShowHide [ cpt ].BoolIsVisible = BoolVisible;
+			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object( GtkBuilderProjet_wind_treeview, TabShowHide [ cpt ].Name)), TabShowHide [ cpt ].BoolIsVisible);
+			gtk_tree_view_column_set_visible (GTK_TREE_VIEW_COLUMN (*TabShowHide [ cpt ].AdrTreeViewColumn), TabShowHide [ cpt ].BoolIsVisible);
+		}
+		break;
+	}
+	treeview_get_etat_fields ();
+	VarTreeView.BoolNoEnter = FALSE;
+}
+// 
+// 
+void on_button_deselect_global_windtreeview_clicked (GtkButton *button, gpointer user_data)
+{
+	treeview_SetGlobal (FALSE);
+}
+// 
+// 
+void on_button_select_global_windtreeview_clicked (GtkButton *button, gpointer user_data)
+{
+	treeview_SetGlobal (TRUE);
+}
+// 
+// 
+void treeview_set_pos_fields_name (void)
+{
+	if (NULL != Config.StringPosFieldsName && *Config.StringPosFieldsName == '\0') {	
+		g_free (Config.StringPosFieldsName);	Config.StringPosFieldsName = NULL;
+	}
+	
+	if (NULL == Config.StringPosFieldsName) {
+		// Allocate string with datas
+		Config.StringPosFieldsName = g_strnfill (MAX_DATAS_STRUCT_RADIOBUTTONS +4, '1');
+	}
+}
+// 
+// 
+void on_radiobutton_modif_treeview_clicked (GtkButton *button, gpointer user_data)
+{
+	gint cpt;
+
+	if (TRUE == VarTreeView.BoolNoEnter) return;
+	
+	treeview_set_pos_fields_name ();
+	
+	for (cpt = POS_STRUCT_DVD; cpt < MAX_DATAS_STRUCT_RADIOBUTTONS; cpt ++) {
+		if (GTK_BUTTON (button) == GTK_BUTTON (GTK_WIDGET (gtk_builder_get_object( GtkBuilderProjet_wind_treeview, TabPosName [ cpt ].NameLeft)))) {
+			Config.StringPosFieldsName [ cpt ] = '0';
+			TabPosName [ cpt ].Pos = 0;
+			gtk_tree_view_column_set_alignment (GTK_TREE_VIEW_COLUMN (*TabPosName [ cpt ].AdrTreeViewColumn), 0.0);
+			g_object_set (*TabPosName [ cpt ].AdrRenderer, "xalign", 0.0, NULL);
+			break;
+		}
+		if (GTK_BUTTON (button) == GTK_BUTTON (GTK_WIDGET (gtk_builder_get_object( GtkBuilderProjet_wind_treeview, TabPosName [ cpt ].NameCenter)))) {
+			Config.StringPosFieldsName [ cpt ] = '1';
+			TabPosName [ cpt ].Pos = 1;
+			gtk_tree_view_column_set_alignment (GTK_TREE_VIEW_COLUMN (*TabPosName [ cpt ].AdrTreeViewColumn), 0.5);
+			g_object_set (*TabPosName [ cpt ].AdrRenderer, "xalign", 0.5, NULL);
+			break;
+		}
+		if (GTK_BUTTON (button) == GTK_BUTTON (GTK_WIDGET (gtk_builder_get_object( GtkBuilderProjet_wind_treeview, TabPosName [ cpt ].NameRight)))) {
+			Config.StringPosFieldsName [ cpt ] = '2';
+			TabPosName [ cpt ].Pos = 2;
+			gtk_tree_view_column_set_alignment (GTK_TREE_VIEW_COLUMN (*TabPosName [ cpt ].AdrTreeViewColumn), 1.0);
+			g_object_set (*TabPosName [ cpt ].AdrRenderer, "xalign", 1.0, NULL);
+			break;
+		}
+	}
+}
+// 
+// 
+void wintreeview_radiobutton_set_PosFieldsName (void)
+{
+	gint cpt;
+
+	treeview_set_pos_fields_name ();
+	
+	VarTreeView.BoolNoEnter = TRUE;
+	
+	for (cpt = POS_STRUCT_DVD; cpt < MAX_DATAS_STRUCT_RADIOBUTTONS; cpt ++) {
+		if (Config.StringPosFieldsName [ cpt ] == '0') {
+			TabPosName [ cpt ].Pos = 0;
+			gtk_tree_view_column_set_alignment (GTK_TREE_VIEW_COLUMN (*TabPosName [ cpt ].AdrTreeViewColumn), 0.0);
+			g_object_set (*TabPosName [ cpt ].AdrRenderer, "xalign", 0.0, NULL);
+			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object( GtkBuilderProjet_wind_treeview, TabPosName [ cpt ].NameLeft)), TRUE);
+		}
+		else if (Config.StringPosFieldsName [ cpt ] == '1') {
+			TabPosName [ cpt ].Pos = 1;
+			gtk_tree_view_column_set_alignment (GTK_TREE_VIEW_COLUMN (*TabPosName [ cpt ].AdrTreeViewColumn), 0.5);
+			g_object_set (*TabPosName [ cpt ].AdrRenderer, "xalign", 0.5, NULL);
+			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object( GtkBuilderProjet_wind_treeview, TabPosName [ cpt ].NameCenter)), TRUE);
+		}
+		else if (Config.StringPosFieldsName [ cpt ] == '2') {
+			TabPosName [ cpt ].Pos = 2;
+			gtk_tree_view_column_set_alignment (GTK_TREE_VIEW_COLUMN (*TabPosName [ cpt ].AdrTreeViewColumn), 1.0);
+			g_object_set (*TabPosName [ cpt ].AdrRenderer, "xalign", 1.0, NULL);
+			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object( GtkBuilderProjet_wind_treeview, TabPosName [ cpt ].NameRight)), TRUE);
+		}
+	}
+	VarTreeView.BoolNoEnter = FALSE;
+
+	gtk_widget_destroy( WindMain_wind_treeview );
+	WindMain_wind_treeview = NULL;
+	GtkBuilderProjet_wind_treeview = NULL;
+}
+// ACTIVE OU DESACTIVE LA VISIBILITE DU CHAMPS SUITE A CLICK BUTTON
+// 
+void on_checkbutton_modif_treeview_clicked (GtkButton *button, gpointer user_data)
+{
+	gint cpt;
+	
+	if (TRUE == VarTreeView.BoolNoEnter) return;
+	
+	for (cpt = POS_STRUCT_DVD; cpt < MAX_DATAS_STRUCT_TREEVIEW; cpt ++) {
+		if (GTK_BUTTON (button) == GTK_BUTTON (gtk_builder_get_object( GtkBuilderProjet_wind_treeview, TabShowHide [ cpt ].Name))) {
+			// g_print("cpt = %d\n", cpt);
+			TabShowHide [ cpt ].BoolIsVisible = (TabShowHide [ cpt ].BoolIsVisible == TRUE) ? FALSE : TRUE;
+			// Show / Hide la colonne du TreeView
+			gtk_tree_view_column_set_visible (GTK_TREE_VIEW_COLUMN (*TabShowHide [ cpt ].AdrTreeViewColumn), TabShowHide [ cpt ].BoolIsVisible);
+			// sortie
+			break;
+		}
+	}
+}
+// 
+// 
+void on_notebook_windtreeview_switch_page( GtkNotebook *notebook, gpointer page, guint page_num, gpointer user_data )
+{
+	VarTreeView.PageNotebook = page_num;
+
+	switch(VarTreeView.PageNotebook) {
+	case 0 :
+		gtk_notebook_set_current_page (GTK_NOTEBOOK (gtk_builder_get_object( GtkXcfaProjet, "notebook_general")), NOTEBOOK_DVD_AUDIO);
+		break;
+	case 1 :
+		gtk_notebook_set_current_page (GTK_NOTEBOOK (gtk_builder_get_object( GtkXcfaProjet, "notebook_general")), NOTEBOOK_CD_AUDIO);
+		break;
+	case 2 :
+		gtk_notebook_set_current_page (GTK_NOTEBOOK (gtk_builder_get_object( GtkXcfaProjet, "notebook_general")), NOTEBOOK_FICHIERS);
+			gtk_notebook_set_current_page (GTK_NOTEBOOK (gtk_builder_get_object( GtkXcfaProjet, "notebook_in_file")), NOTEBOOK_FICHIERS_CONVERSION);
+		break;
+	case 3 :
+		gtk_notebook_set_current_page (GTK_NOTEBOOK (gtk_builder_get_object( GtkXcfaProjet, "notebook_general")), NOTEBOOK_FICHIERS);
+			gtk_notebook_set_current_page (GTK_NOTEBOOK (gtk_builder_get_object( GtkXcfaProjet, "notebook_in_file")), NOTEBOOK_FICHIERS_WAV);
+		break;
+	case 4 :
+		gtk_notebook_set_current_page (GTK_NOTEBOOK (gtk_builder_get_object( GtkXcfaProjet, "notebook_general")), NOTEBOOK_FICHIERS);
+			gtk_notebook_set_current_page (GTK_NOTEBOOK (gtk_builder_get_object( GtkXcfaProjet, "notebook_in_file")), NOTEBOOK_FICHIERS_MP3OGG);
+		break;
+	case 5 :
+		gtk_notebook_set_current_page (GTK_NOTEBOOK (gtk_builder_get_object( GtkXcfaProjet, "notebook_general")), NOTEBOOK_FICHIERS);
+			gtk_notebook_set_current_page (GTK_NOTEBOOK (gtk_builder_get_object( GtkXcfaProjet, "notebook_in_file")), NOTEBOOK_FICHIERS_TAGS);
+		
+		break;
+	}
+}
+// 
+// 
+gboolean wintreeview_init( GtkWidget *FromWindMain )
+{
+	if( NULL == (GtkBuilderProjet_wind_treeview = Builder_open( "xcfa_win_treeview.glade", GtkBuilderProjet_wind_treeview ))) {
+		return( EXIT_FAILURE );
+	}
+	// Add language support from glade file
+	gtk_builder_set_translation_domain( GtkBuilderProjet_wind_treeview, "wind_treeview" );
+	gtk_builder_connect_signals( GtkBuilderProjet_wind_treeview, NULL );
+
+	WindMain_wind_treeview = GTK_WIDGET( gtk_builder_get_object( GtkBuilderProjet_wind_treeview, "wind_treeview" ));
+
+	if( NULL != FromWindMain ) {
+		gtk_window_set_transient_for (GTK_WINDOW(WindMain_wind_treeview), GTK_WINDOW(FromWindMain));
+		gtk_window_set_modal (GTK_WINDOW(WindMain_wind_treeview), TRUE);
+	}
+	libutils_set_default_icone_to_win( WindMain_wind_treeview );
+
+	gtk_window_set_title( GTK_WINDOW( WindMain_wind_treeview ), "Modification des champs" );
+
+	gtk_widget_show_all( WindMain_wind_treeview );
+
+	wintreeview_set_etat_fields ();
+		
+	switch (Config.NotebookGeneral) {
+	case NOTEBOOK_DVD_AUDIO :
+		gtk_notebook_set_current_page (GTK_NOTEBOOK (gtk_builder_get_object( GtkBuilderProjet_wind_treeview, "notebook_windtreeview")), 0);
+		break;
+	case NOTEBOOK_CD_AUDIO :
+		gtk_notebook_set_current_page (GTK_NOTEBOOK (gtk_builder_get_object( GtkBuilderProjet_wind_treeview, "notebook_windtreeview")), 1);
+		break;
+	case NOTEBOOK_FICHIERS :
+		switch (Config.NotebookFile) {
+		case NOTEBOOK_FICHIERS_CONVERSION :
+			gtk_notebook_set_current_page (GTK_NOTEBOOK (gtk_builder_get_object( GtkBuilderProjet_wind_treeview, "notebook_windtreeview")), 2);
+			break;
+		case NOTEBOOK_FICHIERS_WAV :
+			gtk_notebook_set_current_page (GTK_NOTEBOOK (gtk_builder_get_object( GtkBuilderProjet_wind_treeview, "notebook_windtreeview")), 3);
+			break;
+		case NOTEBOOK_FICHIERS_MP3OGG :	
+			gtk_notebook_set_current_page (GTK_NOTEBOOK (gtk_builder_get_object( GtkBuilderProjet_wind_treeview, "notebook_windtreeview")), 4);
+			break;
+		case NOTEBOOK_FICHIERS_TAGS :
+			gtk_notebook_set_current_page (GTK_NOTEBOOK (gtk_builder_get_object( GtkBuilderProjet_wind_treeview, "notebook_windtreeview")), 5);
+			break;
+		}
+		break;
+	default :
+		gtk_notebook_set_current_page (GTK_NOTEBOOK (gtk_builder_get_object( GtkBuilderProjet_wind_treeview, "notebook_general")), NOTEBOOK_DVD_AUDIO);
+	}
+	
+	return( TRUE );
+}
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+

xcfa-5.0.2.tar.gz/src/win_treeview.h Added

@@ -0,0 +1,39 @@
+ /*
+ * file : win_treeview.h
+ * project : xcfa
+ * with : Gtk-3
+ *
+ * copyright : (C) 2003 - 2015 by Claude Bulin
+ *
+ * xcfa - GTK+ implementation of the GNU shell command
+ * GNU General Public License
+ *
+ * This file is part of XCFA.
+ * 
+ * XCFA is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
+ * 
+ * XCFA is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with XCFA. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef win_treeview_h
+#define win_treeview_h 1
+
+
+gboolean 	wintreeview_init( GtkWidget *FromWindMain );
+void		wintreeview_open_window( void );
+void		wintreeview_set_etat_fields( void );
+void		wintreeview_radiobutton_set_PosFieldsName( void );
+
+
+#endif
+

xcfa-4.2.8.tar.gz/src/win_vte.c -> xcfa-5.0.2.tar.gz/src/win_vte.c Changed

@@ -1,9 +1,9 @@
 /*
 * file : win_vte.h
 * project : xcfa
- * with : Gtk-2
+ * with : Gtk-3
 *
- * copyright : (C) 2003 - 2012 by Claude Bulin
+ * copyright : (C) 2003 - 2015 by Claude Bulin
 *
 * xcfa - Creation d'une base de programmation en langage C de type GNU avec les autotools
 * GNU General Public License
@@ -31,12 +31,6 @@
 	#include "../config.h"
 #endif
 
-#ifdef ENABLE_NLS
-	#include <libintl.h>
-	#define _(String) gettext (String)
-#endif
-
-
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -46,7 +40,7 @@
 #if defined(FILE_DEBIAN_VTE_H_IS_OK)
 	#include <vte/vte.h>
 #elif defined(FILE_ARCH_VTE_H_IS_OK)
-	#include <vte-0.0/vte/vte.h>
+	#include <vte-2.91/vte/vte.h>
 #elif defined(FILE_FW_VTE_H_IS_OK)
 	#include <vte-2.90/vte/vte.h>
 #endif
@@ -125,7 +119,7 @@
 void WinVte_realize( GtkWidget *widget )
 {
 	VarVte.AdrWidget = vte_terminal_new();
-	vte_terminal_set_encoding( VTE_TERMINAL( VarVte.AdrWidget ),"UTF-8" );
+	vte_terminal_set_encoding( VTE_TERMINAL( VarVte.AdrWidget ),"UTF-8", NULL );
 	gtk_container_add (GTK_CONTAINER (widget), VarVte.AdrWidget );
 	gtk_widget_show_all( widget );
 	WinVte_window_write( "Init VTE is ok.\n" );

xcfa-4.2.8.tar.gz/src/win_vte.h -> xcfa-5.0.2.tar.gz/src/win_vte.h Changed

xcfa-5.0.2.tar.gz/src_cli Added

xcfa-5.0.2.tar.gz/src_cli/Makefile.am Added

xcfa-5.0.2.tar.gz/src_cli/Makefile.in Added

@@ -0,0 +1,670 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \	]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+bin_PROGRAMS = xcfa_cli$(EXEEXT)
+subdir = src_cli
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+PROGRAMS = $(bin_PROGRAMS)
+am_xcfa_cli_OBJECTS = main.$(OBJEXT) clib.$(OBJEXT) conv.$(OBJEXT) \
+	cue.$(OBJEXT) file_conv.$(OBJEXT) file_is.$(OBJEXT) \
+	get_info.$(OBJEXT) normalize.$(OBJEXT) prg_init.$(OBJEXT) \
+	replaygain.$(OBJEXT) split.$(OBJEXT) tags.$(OBJEXT) \
+	tags_wav.$(OBJEXT) tags_flac.$(OBJEXT) tags_aac.$(OBJEXT) \
+	tags_mp3.$(OBJEXT) tags_ogg.$(OBJEXT) tags_shn.$(OBJEXT) \
+	tags_wma.$(OBJEXT) tags_rm.$(OBJEXT) tags_dts.$(OBJEXT) \
+	tags_aiff.$(OBJEXT) tags_m4a.$(OBJEXT) tags_mpc.$(OBJEXT) \
+	tags_ape.$(OBJEXT) tags_wavpack.$(OBJEXT) tags_ac3.$(OBJEXT) \
+	utils.$(OBJEXT) wav.$(OBJEXT)
+xcfa_cli_OBJECTS = $(am_xcfa_cli_OBJECTS)
+xcfa_cli_DEPENDENCIES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 = 
+SOURCES = $(xcfa_cli_SOURCES)
+DIST_SOURCES = $(xcfa_cli_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = -DLOCALEDIR="$(localedir)" @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PREFIX = @INSTALL_PREFIX@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_CFLAGS = @PACKAGE_CFLAGS@
+PACKAGE_LIBS = @PACKAGE_LIBS@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+XMKMF = @XMKMF@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = $(datadir)/locale
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+
+#
+# src/Makefile.am with BaseBuild
+#
+AUTOMAKE_OPTIONS = gnu
+AM_CPPFLAGS = \
+ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/xcfa_cli"\"
+
+AM_CFLAGS = \
+ -DDATA_DIR=\""$(datadir)"\" \
+ -DLOCALE_DIR=\""$(datadir)/locale"\" \
+ -DPIXMAPS_DIR=\""$(datadir)/pixmaps/xcfa_cli"\"
+
+xcfa_cli_SOURCES = main.c \
+clib.c clib.h \
+conv.c conv.h \
+cue.c \
+file_conv.c \
+file_is.c file_is.h \
+get_info.c get_info.h \
+normalize.c \
+prg_init.c prg_init.h \
+replaygain.c \
+split.c \
+tags.c tags_wav.c tags_flac.c tags_aac.c tags_mp3.c tags_ogg.c tags_shn.c \
+tags_wma.c tags_rm.c tags_dts.c tags_aiff.c tags_m4a.c tags_mpc.c tags_ape.c tags_wavpack.c tags_ac3.c tags.h \
+utils.c \
+wav.c \
+global.h
+
+xcfa_cli_LDADD = -lm
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	 case '$(am__configure_deps)' in \
+	 *$$dep*) \
+	 ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	 && { if test -f $@; then exit 0; else break; fi; }; \
+	 exit 1;; \
+	 esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src_cli/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	 $(AUTOMAKE) --gnu src_cli/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	 *config.status*) \
+	 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	 *) \
+	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	 echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	 $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p \
+	 ; then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' \
+	 -e 's|.*|.|' \
+	 -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	 { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	 if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	 else { print "f", $$3 "/" $$4, $$1; } } \
+	 END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	 if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	 test -z "$$files" || { \
+	 echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	 $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	 } \
+	; done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	 -e 's/$$/$(EXEEXT)/' \
+	`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+
+xcfa_cli$(EXEEXT): $(xcfa_cli_OBJECTS) $(xcfa_cli_DEPENDENCIES) $(EXTRA_xcfa_cli_DEPENDENCIES) 
+	@rm -f xcfa_cli$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(xcfa_cli_OBJECTS) $(xcfa_cli_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clib.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cue.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file_conv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file_is.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get_info.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/normalize.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prg_init.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/replaygain.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/split.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tags.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tags_aac.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tags_ac3.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tags_aiff.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tags_ape.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tags_dts.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tags_flac.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tags_m4a.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tags_mp3.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tags_mpc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tags_ogg.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tags_rm.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tags_shn.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tags_wav.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tags_wavpack.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tags_wma.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wav.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	 test -n "$$unique" || unique=$$empty_fix; \
+	 if test $$# -gt 0; then \
+	 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	 "$$@" $$unique; \
+	 else \
+	 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	 $$unique; \
+	 fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	 $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	 && $(am__cd) $(top_srcdir) \
+	 && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	 [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	 *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	 if test -f "$$i"; then \
+	 echo "$(subdir)/$$i"; \
+	 else \
+	 echo "$$sdir/$$i"; \
+	 fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	 dist_files=`for file in $$list; do echo $$file; done | \
+	 sed -e "s|^$$srcdirstrip/||;t" \
+	 -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	 */*) $(MKDIR_P) `echo "$$dist_files" | \
+			 sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			 sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	 if test -d $$d/$$file; then \
+	 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	 if test -d "$(distdir)/$$file"; then \
+	 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	 fi; \
+	 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	 cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	 fi; \
+	 cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	 else \
+	 test -f "$(distdir)/$$file" \
+	 || cp -p $$d/$$file "$(distdir)/$$file" \
+	 || exit 1; \
+	 fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)"; do \
+	 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 install; \
+	else \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
+	distclean distclean-compile distclean-generic distclean-tags \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-binPROGRAMS install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-binPROGRAMS
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

xcfa-5.0.2.tar.gz/src_cli/clib.c Added

@@ -0,0 +1,339 @@
+/*
+ * file : src/clib.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ *
+ * ---
+ * This code is to prevent the use of the glibc library.
+ * Ce code est destiné à éviter l'utilisation de la librairie glibc.
+ * ---
+ */
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <ctype.h>
+
+#include "clib.h"
+
+
+
+CList *C_list_first( CList *p_clist )
+{
+	while( p_clist && p_clist->previous != NULL )
+			p_clist = p_clist->previous;
+	return( (CList *)p_clist );
+}
+
+CList *C_list_last( CList *p_clist )
+{
+	while( p_clist && p_clist->next != NULL )
+			p_clist = p_clist->next;
+	return( (CList *)p_clist );
+}
+
+CList *C_list_previous( CList *p_clist )
+{
+	return( (CList *)p_clist->previous );
+}
+
+CList *C_list_next( CList *p_clist )
+{
+	return( (CList *)p_clist->next );
+}
+
+CList *C_list_append( CList *p_clist, void *p_alloc )
+{
+	CList	*new_clist = NULL;
+	CList	*list = NULL;
+	new_clist = (CList *)malloc( sizeof( CList ) );
+	new_clist->previous = NULL;
+	new_clist->next = NULL;
+	new_clist->data = p_alloc;
+	if( NULL != (list = C_list_last( p_clist ))) {
+		list->next = new_clist;
+		new_clist->previous = list;
+	}
+	return( (CList *)new_clist );
+}
+
+CList *C_list_free( CList *p_clist )
+{
+	CList	*list = NULL;
+	if( NULL != (list = C_list_first( p_clist )))
+		while( list ) {
+			list->data = NULL;
+			list = C_list_next( list );
+		}
+	free( p_clist );
+	p_clist = NULL;
+	return( (CList *)NULL );
+}
+
+CString *C_string_free( CString *p_cstring )
+{
+	if( p_cstring ) {
+		if( p_cstring->str ) free( p_cstring->str );
+		free( p_cstring );
+		p_cstring = NULL;
+	}
+	return( (CString *)NULL );
+}
+
+CString *C_string_new( void )
+{
+	CString *s = (CString *)malloc( sizeof( CString ));
+	s->str = NULL;
+	s->len = 0;
+	return( (CString *)s );
+}
+
+CString *C_string_append_printf( CString *p_cstring, const char *fmt, ... )
+{
+	int n;
+	int size = 100; // Guess we need no more than 100 bytes
+	char *p, *np;
+	va_list ap;
+
+	p = malloc( size );
+	if( p == NULL )
+		return NULL;
+
+	while( 1 ) {
+		// Try to print in the allocated space
+		va_start( ap, fmt );
+		n = vsnprintf( p, size, fmt, ap );
+		va_end( ap );
+		// Check error code
+		if( n < 0 ) {
+			free( p );
+			return NULL;
+		}
+		// If that worked, return the string
+		if( n < size ) {
+			char *s = C_strdup_printf( "%s%s", p_cstring->str ? p_cstring->str : "", p );
+			free( p );
+			if( p_cstring->str ) free( p_cstring->str );
+			p_cstring->str = s;
+			p_cstring->len = strlen( s );
+			return( p_cstring );
+		}
+		// Else try again with more space
+		size = n + 1; // Precisely what is needed
+		np = realloc( p, size );
+		if( np == NULL ) {
+			free( p );
+			return NULL;
+		} else {
+			p = np;
+		}
+	}
+}
+
+char *C_strdup( char *p_str )
+{
+	int len = ( sizeof( char *) * strlen( p_str ) ) + 2;
+	char *new_alloc = (char *)malloc( len );
+	strcpy( new_alloc, p_str );
+	return( (char *)new_alloc );
+}
+
+char *C_strdup_printf( const char *fmt, ... )
+{
+	int n;
+	int size = 100; // Guess we need no more than 100 bytes
+	char *p, *np;
+	va_list ap;
+
+	p = malloc( size );
+	if( p == NULL )
+		return NULL;
+
+	while( 1 ) {
+		// Try to print in the allocated space
+		va_start( ap, fmt );
+		n = vsnprintf( p, size, fmt, ap );
+		va_end( ap );
+		// Check error code
+		if( n < 0 ) {
+			free( p );
+			return NULL;
+		}
+		// If that worked, return the string
+		if( n < size )
+			return p;
+		// Else try again with more space
+		size = n + 1; // Precisely what is needed
+		np = realloc( p, size );
+		if( np == NULL ) {
+			free( p );
+			return NULL;
+		} else {
+			p = np;
+		}
+	}
+}
+
+C_BOOL C_dir_test( char *p_dir )
+{
+	struct stat status;
+	int	 ret;
+	ret = stat( p_dir, &status );
+	return( ret > -1 && S_ISDIR( status.st_mode ) ? TRUE : FALSE );
+}
+
+C_BOOL C_file_test( char *p_file )
+{
+	struct stat status;
+	int	 ret;
+	ret = stat( p_file, &status );
+	return( ret > -1 && S_ISREG( status.st_mode ) ? TRUE : FALSE );
+}
+
+C_BOOL C_mkdir_with_parents( char *p_path )
+{
+	char *LineCommand = NULL;
+	if( p_path != NULL ) {
+		if( C_dir_test( p_path ) == FALSE ) {
+			LineCommand = C_strdup_printf( "mkdir -p \"%s\"", p_path );
+			system( LineCommand );
+			free( LineCommand );
+			LineCommand = NULL;
+			return( TRUE );
+		}
+	}
+	return( FALSE );
+}
+
+void C_rmdir( char *p_path )
+{
+	pid_t pid;
+	if( p_path != NULL ) {
+		if( (pid = fork()) == 0 ) {
+			execlp (
+				"rm",
+				"rm",
+				"-rf",
+				p_path,
+				NULL
+				);
+		}
+	}
+}
+
+char **C_strsplit( const char *string, const char *delimiter )
+{
+	char **Buf = NULL;
+	char *p = NULL;
+	int n;
+
+	for( n = 0, p = (char *)string; *p; p ++ )
+		if( *p == *delimiter ) n ++;
+	if( NULL == (Buf = (char **)malloc( sizeof( char ** ) * ( n + 4 ) ))) return( (char **)NULL );
+	n = 0;
+	p = strtok( (char *)string, delimiter );
+	while( p != NULL ) {
+		Buf[ n ++ ] = C_strdup( p );
+		p = strtok( NULL, delimiter );
+	}
+	Buf[ n ] = NULL;
+	return( (char **)Buf );
+}
+
+char **C_strfreev( char **p_Larrbuf )
+{
+	int n;
+	for( n = 0; p_Larrbuf[ n ]; n ++ )
+		if( p_Larrbuf[ n ] ) {
+			free( p_Larrbuf[ n ] );
+			p_Larrbuf[ n ] = NULL;
+		}
+	free( p_Larrbuf );
+	p_Larrbuf = NULL;
+	return( (char **)NULL );
+
+}
+
+int C_list_length( CList *p_clist )
+{
+	CList	*list = NULL;
+	int		cpt = 0;
+	if( NULL != (list = C_list_first( p_clist )))
+		while( list ) {
+			cpt ++;
+			list = C_list_next( list );
+		}
+	return( (int)cpt );
+}
+
+char *C_path_get_basename( char *p_path )
+{
+	char *ptr = NULL;
+	if( NULL != ( ptr = strrchr( p_path, '/' ))) {
+		ptr ++;
+		return( C_strdup( ptr ));
+	}
+	return( (char *)NULL );
+}
+
+char *C_ascii_strdown( char *p_str )
+{
+	char *str = C_strdup( p_str );
+	char *ptr = NULL;
+	for( ptr = str; *ptr; ptr ++ )
+		*ptr = tolower( *ptr );
+	return( (char *)str );
+}
+
+char *C_ascii_strup( char *p_str )
+{
+	char *str = C_strdup( p_str );
+	char *ptr = NULL;
+	for( ptr = str; *ptr; ptr ++ )
+		*ptr = toupper( *ptr );
+	return( (char *)str );
+}
+
+C_BOOL C_find_program_in_path( char *p_find )
+{
+	char *path[] = { "/bin/", "/usr/bin/", "/usr/sbin/" , "/usr/local/bin/" };
+	char *p = NULL;
+	C_BOOL bool_find = FALSE;
+	int i;
+	if( p_find )
+		for( i = 0; i < 4; i ++ ) {
+			p = C_strdup_printf( "%s%s", path[ i ], p_find );
+			bool_find = C_file_test( p );
+			free( p );
+			p = NULL;
+			if( TRUE == bool_find ) return( TRUE );
+		}
+	return( FALSE );
+}
+
+

xcfa-5.0.2.tar.gz/src_cli/clib.h Added

@@ -0,0 +1,78 @@
+/*
+ *  file      : src/clib.h
+ *  project   : xcfa_cli
+ *  copyright : (C) 2014 by BULIN Claude
+ *
+ *  This file is part of xcfa_cli project
+ *
+ *  xcfa_cli is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; version 3.
+ *
+ *  xcfa_cli is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ *  USA
+ *
+ * ---
+ * This code is to prevent the use of the glibc library.
+ * Ce code est destiné à éviter l'utilisation de la librairie glibc.
+ * ---
+ */
+
+
+#ifndef clib_h
+#define clib_h 1
+
+// definition d'un nouveau type
+typedef enum { FALSE=0, TRUE } C_BOOL;
+
+typedef struct {
+	char	*str;
+	int		len;
+} CString;
+
+typedef struct _clist CList;
+struct _clist {
+	CList	*previous;
+	CList	*next;
+	void	*data;
+};
+
+CList	*C_list_first( CList *p_clist  );
+CList	*C_list_last( CList *p_clist );
+CList	*C_list_previous( CList *p_clist );
+CList	*C_list_next( CList *p_clist );
+CList	*C_list_append( CList *p_clist, void *p_alloc );
+CList	*C_list_free( CList *p_clist );
+int		C_list_length( CList *p_clist );
+
+char	*C_strdup( char *p_str );
+char	*C_strdup_printf( const char *fmt, ... );
+
+CString	*C_string_new( void );
+CString	*C_string_free( CString *p_cstring );
+CString	*C_string_append_printf( CString *p_cstring, const char *fmt, ... );
+
+C_BOOL	C_dir_test( char *p_dir );
+C_BOOL	C_file_test( char *p_file );
+
+C_BOOL	C_mkdir_with_parents( char *p_path );
+void	C_rmdir( char *p_path );
+
+char	**C_strsplit( const char *string, const char *delimiter );
+char	**C_strfreev( char **p_Larrbuf );
+
+char	*C_path_get_basename( char *p_path );
+
+char	*C_ascii_strdown( char *p_str );
+char	*C_ascii_strup( char *p_str );
+
+C_BOOL	C_find_program_in_path( char *p_find );
+
+#endif

xcfa-5.0.2.tar.gz/src_cli/conv.c Added

@@ -0,0 +1,1601 @@
+/*
+ * file : src/conv.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#include <pthread.h>
+#include <sys/types.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+// #include <fcntl.h>	// PROCESSUS NON-BLOQUANT
+
+#include "global.h"
+#include "prg_init.h"
+#include "tags.h"
+#include "conv.h"
+
+
+/*
+*---------------------------------------------------------------------------
+* EXTERN
+*---------------------------------------------------------------------------
+*/
+extern int kill( pid_t pid, int sig );
+
+
+/*
+*---------------------------------------------------------------------------
+* VARIABLES
+*---------------------------------------------------------------------------
+*/
+
+#define CONV_MAX_CARS 1024
+
+CONV conv;
+
+
+//
+// Allocate Tab Args
+//
+char **conv_AllocTabArgs( int *p_tab )
+{
+	int	len_malloc =
+			50 +								// nbr elements
+			C_list_length( Detail.ListFile );	// list length
+	char	**PtrTab = (char **)malloc( sizeof(char **) * len_malloc );
+
+	*p_tab = 0;
+	if( Detail.Nice >= 0 && Detail.Nice <= 20) {
+		PtrTab [ 0 ] = C_strdup( "nice" );
+		PtrTab [ 1 ] = C_strdup( "-n" );
+		PtrTab [ 2 ] = C_strdup_printf( "%d", Detail.Nice );
+		*p_tab = 3;
+	}
+	return( (char **)PtrTab );
+}
+
+//
+// Remove Tab Args
+//
+char **conv_RemoveTab( char **p_PtrTabArgs )
+{
+	int	i;
+
+	for( i = 0; p_PtrTabArgs[ i ] != NULL; i ++ ) {
+		free( p_PtrTabArgs[ i ] );
+		p_PtrTabArgs[ i ] = NULL;
+	}
+	free( p_PtrTabArgs );
+	p_PtrTabArgs = NULL;
+
+	return( (char **)NULL );
+}
+
+char **conv_get_command_line(
+				TYPE_CONV	type_conv,
+				char		*src,
+				char		*dest,
+				TAGS		*InfosTags,
+				char		*options
+				)
+{
+	char	**PtrTabArgs = NULL;
+	char	**Larrbuf = NULL;
+	int	i;
+	int	pos;
+
+	PtrTabArgs = conv_AllocTabArgs( &pos );
+
+	if( type_conv == LAME_WAV_TO_MP3 ) {
+		PtrTabArgs [ pos++ ] = C_strdup( "lame" );
+
+		Larrbuf = C_strsplit( options, " " );
+		for( i=0; Larrbuf[i]; i++ ) {
+			PtrTabArgs [ pos++ ] = C_strdup( Larrbuf[i] );
+		}
+		C_strfreev( Larrbuf );
+
+		if( NULL != InfosTags ) {
+			if( Detail.tag_album || Detail.tag_artist || Detail.tag_comment || Detail.tag_genre || Detail.tag_number || Detail.tag_title || Detail.tag_year ||
+				InfosTags->Album || InfosTags->Artist || InfosTags->Comment || InfosTags->Genre || InfosTags->Number || InfosTags->Title || InfosTags->Year )
+			{
+				PtrTabArgs [ pos++ ] = C_strdup( "--add-id3v2" );
+
+				if( Detail.tag_album || InfosTags->Album ) {
+					PtrTabArgs [ pos++ ] = C_strdup ("--tl" );
+					if( Detail.tag_album )
+						PtrTabArgs [ pos++ ] = C_strdup( Detail.tag_album );
+					else if( InfosTags->Album )
+						PtrTabArgs [ pos++ ] = C_strdup( InfosTags->Album );
+				}
+				if( Detail.tag_artist || InfosTags->Artist ) {
+					PtrTabArgs [ pos++ ] = C_strdup( "--ta" );
+					if( Detail.tag_artist )
+						PtrTabArgs [ pos++ ] = C_strdup( Detail.tag_artist );
+					else if( InfosTags->Artist )
+						PtrTabArgs [ pos++ ] = C_strdup( InfosTags->Artist );
+				}
+				if( Detail.tag_comment || InfosTags->Comment ) {
+					PtrTabArgs [ pos++ ] = C_strdup( "--tc" );
+					if( Detail.tag_comment )
+						PtrTabArgs [ pos++ ] = C_strdup( Detail.tag_comment );
+					else if( InfosTags->Comment )
+						PtrTabArgs [ pos++ ] = C_strdup( InfosTags->Comment );
+				}
+				if( Detail.tag_genre || InfosTags->Genre ) {
+					// int NumTagMp3 = tags_get_genre_by_value( Detail.tag_genre ? Detail.tag_genre : InfosTags->Genre );
+					// if( NumTagMp3 < 0 ) NumTagMp3 = 0;
+					// PtrTabArgs [ pos++ ] = C_strdup( "--tg" );
+					// PtrTabArgs [ pos++ ] = C_strdup_printf( "%d", NumTagMp3 );
+					PtrTabArgs [ pos++ ] = C_strdup( "--tg" );
+					if( Detail.tag_genre )
+						PtrTabArgs [ pos++ ] = C_strdup_printf( "%s", Detail.tag_genre );
+					else if( InfosTags->Genre )
+						PtrTabArgs [ pos++ ] = C_strdup_printf( "%s", InfosTags->Genre );
+				}
+				if( Detail.tag_number || InfosTags->Number ) {
+					PtrTabArgs [ pos++ ] = C_strdup( "--tn" );
+					if( Detail.tag_number )
+						PtrTabArgs [ pos++ ] = C_strdup( Detail.tag_number );
+					else if( InfosTags->Number )
+						PtrTabArgs [ pos++ ] = C_strdup( InfosTags->Number );
+				}
+				if( Detail.tag_title || InfosTags->Title ) {
+					PtrTabArgs [ pos++ ] = C_strdup( "--tt" );
+					if( Detail.tag_title )
+						PtrTabArgs [ pos++ ] = C_strdup( Detail.tag_title );
+					else if( InfosTags->Title )
+						PtrTabArgs [ pos++ ] = C_strdup( InfosTags->Title );
+				}
+				if( Detail.tag_year || InfosTags->Year ) {
+					PtrTabArgs [ pos++ ] = C_strdup( "--ty" );
+					if( Detail.tag_year )
+						PtrTabArgs [ pos++ ] = C_strdup( Detail.tag_year );
+					else if( InfosTags->Year )
+						PtrTabArgs [ pos++ ] = C_strdup( InfosTags->Year );
+				}
+			}
+		}
+		PtrTabArgs [ pos++ ] = C_strdup( src );
+		PtrTabArgs [ pos++ ] = C_strdup ("-o");
+		PtrTabArgs [ pos++ ] = C_strdup( dest );
+		PtrTabArgs [ pos++ ] = NULL;
+	}
+	else if (type_conv == OGGENC_WAV_TO_OGG || type_conv == OGGENC_FLAC_TO_OGG) {
+
+		PtrTabArgs[ pos++ ] = C_strdup ("oggenc");
+		PtrTabArgs [ pos++ ] = C_strdup( src );
+
+		Larrbuf = C_strsplit( options, " " );
+		for( i=0; Larrbuf[i]; i++ ) {
+			PtrTabArgs [ pos++ ] = C_strdup( Larrbuf[i] );
+		}
+		C_strfreev( Larrbuf );
+
+		if( NULL != InfosTags ) {
+			if( Detail.tag_album || InfosTags->Album ) {
+				PtrTabArgs [ pos++ ] = C_strdup ("-l" );
+				if( Detail.tag_album )
+					PtrTabArgs [ pos++ ] = C_strdup( Detail.tag_album );
+				else if( InfosTags->Album )
+					PtrTabArgs [ pos++ ] = C_strdup( InfosTags->Album );
+			}
+			if( Detail.tag_artist || InfosTags->Artist ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "-a" );
+				if( Detail.tag_artist )
+					PtrTabArgs [ pos++ ] = C_strdup( Detail.tag_artist );
+				else if( InfosTags->Artist )
+					PtrTabArgs [ pos++ ] = C_strdup( InfosTags->Artist );
+			}
+			if( Detail.tag_comment || InfosTags->Comment ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "-c" );
+				if( Detail.tag_comment )
+					PtrTabArgs [ pos++ ] = C_strdup( Detail.tag_comment );
+				else if( InfosTags->Comment )
+					PtrTabArgs [ pos++ ] = C_strdup( InfosTags->Comment );
+			}
+			if( Detail.tag_genre || InfosTags->Genre ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "-G" );
+				if( Detail.tag_genre )
+					PtrTabArgs [ pos++ ] = C_strdup( Detail.tag_genre );
+				else if( InfosTags->Genre )
+					PtrTabArgs [ pos++ ] = C_strdup( InfosTags->Genre );
+			}
+			if( Detail.tag_number || InfosTags->Number ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "-N" );
+				if( Detail.tag_number )
+					PtrTabArgs [ pos++ ] = C_strdup( Detail.tag_number );
+				else if( InfosTags->Number )
+					PtrTabArgs [ pos++ ] = C_strdup( InfosTags->Number );
+			}
+			if( Detail.tag_title || InfosTags->Title ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "-t" );
+				if( Detail.tag_title )
+					PtrTabArgs [ pos++ ] = C_strdup( Detail.tag_title );
+				else if( InfosTags->Title )
+					PtrTabArgs [ pos++ ] = C_strdup( InfosTags->Title );
+			}
+			if( Detail.tag_year || InfosTags->Year ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "--date" );
+				if( Detail.tag_year )
+					PtrTabArgs [ pos++ ] = C_strdup( Detail.tag_year );
+				else if( InfosTags->Year )
+					PtrTabArgs [ pos++ ] = C_strdup( InfosTags->Year );
+			}
+		}
+
+		PtrTabArgs[ pos++ ] = C_strdup ("-o");
+		PtrTabArgs [ pos++ ] = C_strdup( dest );
+		PtrTabArgs[ pos++ ] = NULL;
+	}
+	else if (type_conv == FLAC_WAV_TO_FLAC || type_conv == FLAC_FLAC_TO_WAV) {
+
+		PtrTabArgs[ pos++ ] = C_strdup ("flac");
+
+		Larrbuf = C_strsplit( options, " " );
+		for( i=0; Larrbuf[i]; i++ ) {
+			PtrTabArgs [ pos++ ] = C_strdup( Larrbuf[i] );
+		}
+		C_strfreev( Larrbuf );
+
+		if( NULL != InfosTags ) {
+			if( Detail.tag_album || InfosTags->Album ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "-T" );
+				if( Detail.tag_album )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "title=%s", Detail.tag_album );
+				else if( InfosTags->Album )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "title=%s", InfosTags->Album );
+			}
+			if( Detail.tag_artist || InfosTags->Artist ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "-T" );
+				if( Detail.tag_artist )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "artist=%s", Detail.tag_artist );
+				else if( InfosTags->Artist )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "artist=%s", InfosTags->Artist );
+			}
+			if( Detail.tag_comment || InfosTags->Comment ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "-T" );
+				if( Detail.tag_comment )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "Description=%s", Detail.tag_comment );
+				else if( InfosTags->Comment )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "Description=%s", InfosTags->Comment );
+			}
+			if( Detail.tag_genre || InfosTags->Genre ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "-T" );
+				if( Detail.tag_genre )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "genre=%s", Detail.tag_genre );
+				else if( InfosTags->Genre )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "genre=%s", InfosTags->Genre );
+			}
+			if( Detail.tag_number || InfosTags->Number ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "-T" );
+				if( Detail.tag_number )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "tracknumber=%s", Detail.tag_number );
+				else if( InfosTags->Number )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "tracknumber=%s", InfosTags->Number );
+			}
+			if( Detail.tag_title || InfosTags->Title ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "-T" );
+				if( Detail.tag_title )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "title=%s", Detail.tag_title );
+				else if( InfosTags->Title )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "title=%s", InfosTags->Title );
+			}
+			if( Detail.tag_year || InfosTags->Year ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "-T" );
+				if( Detail.tag_year )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "date=%s", Detail.tag_year );
+				else if( InfosTags->Year )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "date=%s", InfosTags->Year );
+			}
+		}
+
+		if( type_conv == FLAC_FLAC_TO_WAV ) PtrTabArgs [ pos++ ] = C_strdup ("-d");
+
+		PtrTabArgs[ pos++ ] = C_strdup ("-f");
+		PtrTabArgs [ pos++ ] = C_strdup( src );
+		PtrTabArgs [ pos++ ] = C_strdup ("-o");
+		PtrTabArgs [ pos++ ] = C_strdup( dest );
+		PtrTabArgs [ pos++ ] = NULL;
+	}
+	else if (type_conv == FAAC_WAV_TO_M4A) {
+
+		PtrTabArgs [ pos++ ] = C_strdup ("faac");
+
+		Larrbuf = C_strsplit( options, " " );
+		for( i=0; Larrbuf[i]; i++ ) {
+			PtrTabArgs [ pos++ ] = C_strdup( Larrbuf[i] );
+		}
+		C_strfreev( Larrbuf );
+
+		if( NULL != InfosTags ) {
+			if( Detail.tag_album || InfosTags->Album ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "--album" );
+				if( Detail.tag_album )
+					PtrTabArgs[ pos++ ] = C_strdup( Detail.tag_album );
+				else if( InfosTags->Album )
+					PtrTabArgs[ pos++ ] = C_strdup( InfosTags->Album );
+			}
+			if( Detail.tag_artist || InfosTags->Artist ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "--artist" );
+				if( Detail.tag_artist )
+					PtrTabArgs[ pos++ ] = C_strdup( Detail.tag_artist );
+				else if( InfosTags->Artist )
+					PtrTabArgs[ pos++ ] = C_strdup( InfosTags->Artist );
+			}
+			if( Detail.tag_comment || InfosTags->Comment ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "--comment" );
+				if( Detail.tag_comment )
+					PtrTabArgs[ pos++ ] = C_strdup( Detail.tag_comment );
+				else if( InfosTags->Comment )
+					PtrTabArgs[ pos++ ] = C_strdup( InfosTags->Comment );
+			}
+			if( Detail.tag_genre || InfosTags->Genre ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "--genre" );
+				if( Detail.tag_genre )
+					PtrTabArgs[ pos++ ] = C_strdup( Detail.tag_genre );
+				else if( InfosTags->Genre )
+					PtrTabArgs[ pos++ ] = C_strdup( InfosTags->Genre );
+			}
+			if( Detail.tag_number || InfosTags->Number ) {
+				PtrTabArgs [ pos++ ] = C_strdup("--track" );
+				if( Detail.tag_number )
+					PtrTabArgs[ pos++ ] = C_strdup( Detail.tag_number );
+				else if( InfosTags->Number )
+					PtrTabArgs[ pos++ ] = C_strdup( InfosTags->Number );
+			}
+			if( Detail.tag_title || InfosTags->Title ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "--title" );
+				if( Detail.tag_title )
+					PtrTabArgs[ pos++ ] = C_strdup( Detail.tag_title );
+				else if( InfosTags->Title )
+					PtrTabArgs[ pos++ ] = C_strdup( InfosTags->Title );
+			}
+			if( Detail.tag_year || InfosTags->Year ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "--year" );
+				if( Detail.tag_year )
+					PtrTabArgs[ pos++ ] = C_strdup( Detail.tag_year );
+				else if( InfosTags->Year )
+					PtrTabArgs[ pos++ ] = C_strdup( InfosTags->Year );
+			}
+
+		}
+		PtrTabArgs [ pos++ ] = C_strdup ("-o");
+		PtrTabArgs [ pos++ ] = C_strdup( dest );
+		PtrTabArgs [ pos++ ] = C_strdup( src );
+		PtrTabArgs [ pos++ ] = NULL;
+	}
+	else if (type_conv == MPPENC_WAV_TO_MPC) {
+
+		PtrTabArgs[ pos++ ] = C_strdup (prginit_get_name (NMR_musepack_tools_mppenc));
+		PtrTabArgs[ pos++ ] = C_strdup ("--verbose");
+		PtrTabArgs[ pos++ ] = C_strdup ("--overwrite");
+
+		Larrbuf = C_strsplit( options, " " );
+		for( i=0; Larrbuf[i]; i++ ) {
+			PtrTabArgs [ pos++ ] = C_strdup( Larrbuf[i] );
+		}
+		C_strfreev( Larrbuf );
+
+		if( NULL != InfosTags ) {
+			if( Detail.tag_album || InfosTags->Album ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "--album" );
+				if( Detail.tag_album )
+					PtrTabArgs[ pos++ ] = C_strdup( Detail.tag_album );
+				else if( InfosTags->Album )
+					PtrTabArgs[ pos++ ] = C_strdup( InfosTags->Album );
+			}
+			if( Detail.tag_artist || InfosTags->Artist ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "--artist" );
+				if( Detail.tag_artist )
+					PtrTabArgs[ pos++ ] = C_strdup( Detail.tag_artist );
+				else if( InfosTags->Artist )
+					PtrTabArgs[ pos++ ] = C_strdup( InfosTags->Artist );
+			}
+			if( Detail.tag_comment || InfosTags->Comment ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "--comment" );
+				if( Detail.tag_comment )
+					PtrTabArgs[ pos++ ] = C_strdup( Detail.tag_comment );
+				else if( InfosTags->Comment )
+					PtrTabArgs[ pos++ ] = C_strdup( InfosTags->Comment );
+			}
+			if( Detail.tag_genre || InfosTags->Genre ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "--genre" );
+				if( Detail.tag_genre )
+					PtrTabArgs[ pos++ ] = C_strdup( Detail.tag_genre );
+				else if( InfosTags->Genre )
+					PtrTabArgs[ pos++ ] = C_strdup( InfosTags->Genre );
+			}
+			if( Detail.tag_number || InfosTags->Number ) {
+				PtrTabArgs [ pos++ ] = C_strdup("--track" );
+				if( Detail.tag_number )
+					PtrTabArgs[ pos++ ] = C_strdup( Detail.tag_number );
+				else if( InfosTags->Number )
+					PtrTabArgs[ pos++ ] = C_strdup( InfosTags->Number );
+			}
+			if( Detail.tag_title || InfosTags->Title ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "--title" );
+				if( Detail.tag_title )
+					PtrTabArgs[ pos++ ] = C_strdup( Detail.tag_title );
+				else if( InfosTags->Title )
+					PtrTabArgs[ pos++ ] = C_strdup( InfosTags->Title );
+			}
+			if( Detail.tag_year || InfosTags->Year ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "--year" );
+				if( Detail.tag_year )
+					PtrTabArgs[ pos++ ] = C_strdup( Detail.tag_year );
+				else if( InfosTags->Year )
+					PtrTabArgs[ pos++ ] = C_strdup( InfosTags->Year );
+			}
+		}
+		PtrTabArgs [ pos++ ] = C_strdup( src );
+		PtrTabArgs [ pos++ ] = C_strdup( dest );
+		PtrTabArgs[ pos++ ] = NULL;
+	}
+	else if (type_conv == MAC_WAV_TO_APE || type_conv == MAC_APE_TO_WAV) {
+
+		PtrTabArgs[ pos++ ] = C_strdup (prginit_get_name (NMR_mac));
+		PtrTabArgs [ pos++ ] = C_strdup( src );
+		PtrTabArgs [ pos++ ] = C_strdup( dest );
+		if( type_conv == MAC_APE_TO_WAV ) {
+			PtrTabArgs[ pos++ ] = C_strdup ("-d");
+		}
+		else {
+			Larrbuf = C_strsplit( options, " " );
+			for( i=0; Larrbuf[i]; i++ ) {
+				PtrTabArgs [ pos++ ] = C_strdup( Larrbuf[i] );
+			}
+			C_strfreev( Larrbuf );
+		}
+		PtrTabArgs[ pos++ ] = NULL;
+	}
+	else if (type_conv == WVUNPACK_WAVPACK_TO_WAV) {
+		PtrTabArgs[ pos++ ] = C_strdup( "wvunpack");
+		PtrTabArgs[ pos++ ] = C_strdup ("-y");
+		PtrTabArgs [ pos++ ] = C_strdup( src );
+		PtrTabArgs[ pos++ ] = C_strdup ("-o");
+		PtrTabArgs [ pos++ ] = C_strdup( dest );
+		PtrTabArgs [ pos++ ] = NULL;
+	}
+	else if (type_conv == WAVPACK_WAV_TO_WAVPACK) {
+
+		PtrTabArgs[ pos++ ] = C_strdup ("wavpack");
+		PtrTabArgs[ pos++ ] = C_strdup ("-y");
+
+		Larrbuf = C_strsplit( options, " " );
+		for( i=0; Larrbuf[i]; i++ ) {
+			PtrTabArgs [ pos++ ] = C_strdup( Larrbuf[i] );
+		}
+		C_strfreev( Larrbuf );
+
+		if( NULL != InfosTags ) {
+			if( Detail.tag_album || InfosTags->Album ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "-w" );
+				if( Detail.tag_album )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "Album=%s", Detail.tag_album );
+				else if( InfosTags->Album )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "Album=%s", InfosTags->Album );
+			}
+			if( Detail.tag_artist || InfosTags->Artist ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "-w" );
+				if( Detail.tag_artist )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "Artist=%s", Detail.tag_artist );
+				else if( InfosTags->Artist )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "Artist=%s", InfosTags->Artist );
+			}
+			if( Detail.tag_comment || InfosTags->Comment ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "-w" );
+				if( Detail.tag_comment )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "Comment=%s", Detail.tag_comment );
+				else if( InfosTags->Comment )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "Comment=%s", InfosTags->Comment );
+			}
+			if( Detail.tag_genre || InfosTags->Genre ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "-w" );
+				if( Detail.tag_genre )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "Genre=%s", Detail.tag_genre );
+				else if( InfosTags->Genre )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "Genre=%s", InfosTags->Genre );
+			}
+			if( Detail.tag_number || InfosTags->Number ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "-w" );
+				if( Detail.tag_number )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "Track=%s", Detail.tag_number );
+				else if( InfosTags->Number )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "Track=%s", InfosTags->Number );
+			}
+			if( Detail.tag_title || InfosTags->Title ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "-w" );
+				if( Detail.tag_title )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "Title=%s", Detail.tag_title );
+				else if( InfosTags->Title )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "Title=%s", InfosTags->Title );
+			}
+			if( Detail.tag_year || InfosTags->Year ) {
+				PtrTabArgs [ pos++ ] = C_strdup( "-w" );
+				if( Detail.tag_year )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "Year=%s", Detail.tag_year );
+				else if( InfosTags->Year )
+					PtrTabArgs[ pos++ ] = C_strdup_printf( "Year=%s", InfosTags->Year );
+			}
+		}
+		PtrTabArgs [ pos++ ] = C_strdup( src );
+		PtrTabArgs[ pos++ ] = C_strdup ("-o");
+		PtrTabArgs [ pos++ ] = C_strdup( dest );
+		PtrTabArgs[ pos++ ] = NULL;
+	}
+	else if (type_conv == AACPLUSENC_WAV_TO_AAC) {
+
+		PtrTabArgs[ pos++ ] = C_strdup ("aacplusenc");
+		PtrTabArgs [ pos++ ] = C_strdup( src );
+		PtrTabArgs [ pos++ ] = C_strdup( dest );
+
+		Larrbuf = C_strsplit( options, " " );
+		for( i=0; Larrbuf[i]; i++ ) {
+			PtrTabArgs [ pos++ ] = C_strdup( Larrbuf[i] );
+		}
+		C_strfreev( Larrbuf );
+
+		PtrTabArgs[ pos++ ] = NULL;
+	}
+
+	return( (char **)PtrTabArgs );
+}
+
+/*
+*---------------------------------------------------------------------------
+* SIGNAL ET CONVERSIONS
+*---------------------------------------------------------------------------
+*/
+void conv_sigchld_convert (int signum)
+{
+	int status;
+
+	wait(&status);
+ // if there are still children waiting
+ // re-install the signal handler
+	conv.signal_numchildren_conv --;
+	if( conv.signal_numchildren_conv > 0 ) {
+		// re-install the signal handler
+		signal (SIGCHLD, conv_sigchld_convert);
+	}
+}
+int conv_call_exec (char **args, pid_t *p, int p_output)
+{
+	char	**ptr = (char **)args;
+	// int	status;
+
+	conv.signal_numchildren_conv = 0;
+	if( pipe (conv.tube_conv) != 0 ) {
+		fprintf (stderr, "error: pipe\n");
+		exit (1);
+	}
+	if( (*p = fork()) == 0 ) {
+		dup2 (conv.tube_conv [ 1 ], p_output);
+		close (conv.tube_conv [ 1 ]);
+		execvp ((char *)*(ptr+0), ptr);
+		fprintf (stderr, "error: exec");
+		exit (2);
+	}
+	conv.signal_numchildren_conv ++;
+	signal (SIGCHLD, conv_sigchld_convert);
+	close (conv.tube_conv [ 1 ]);
+
+	// LE FICHIER EST OUVERT EN MODE « NON-BLOQUANT »
+	// status = fcntl( conv.tube_conv [ 0 ], F_GETFL );
+	// status = fcntl( conv.tube_conv [ 0 ], F_SETFL, status | O_NONBLOCK );
+
+	return( conv.tube_conv [ 0 ] );
+}
+
+
+// MPLAYER
+//
+C_BOOL conv_with_mplayer_ARGS (char **args, TYPE_CONV p_TypeConv)
+{
+	int		pos = 0;
+	int		fd = -1;
+	int		size;
+	char	buf [ CONV_MAX_CARS + 10 ];
+	C_BOOL	BoolRet = TRUE;
+	C_BOOL	BoolErreurMplayer = FALSE;
+
+	fd = conv_call_exec (args, &conv.code_fork_conv, STDERR_FILENO );
+	do {
+		pos = -1;
+		do {
+			pos++;
+			if (pos >= CONV_MAX_CARS) {
+				PRINT_FUNC_LF();
+				printf ("pos(%d) >= CONV_MAX_CARS(%d)\n", pos, CONV_MAX_CARS);
+				pos --;
+			}
+			size = read(fd, &buf[pos], 1);
+
+			if (strstr(buf,"Audio: no sound")) {
+				BoolRet = FALSE;
+				BoolErreurMplayer = TRUE;
+				break;
+			}
+			if (strstr(buf,"relocation error")) {
+				BoolRet = FALSE;
+				BoolErreurMplayer = TRUE;
+				break;
+			}
+		} while ( (buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
+
+		if (TRUE == BoolErreurMplayer) break;
+
+		if (buf[pos] != '\n') {
+			pos ++;
+			buf[pos++] = '\n';
+			buf[pos] = '\0';
+		}
+
+	} while ((size > 0));
+	close(fd);
+
+	if (TRUE == BoolErreurMplayer) {
+		printf("\n");
+		printf("BoolErreurMplayer = TRUE\n");
+		printf("KILL Process mplayer = ");
+		if ((kill (conv.code_fork_conv, SIGKILL) != 0))
+			printf ("ERREUR\n");
+		else	printf ("OK\n");
+		printf("\n");
+	}
+
+	conv.code_fork_conv = -1;
+	return (BoolRet);
+}
+// SOX
+//
+void conv_with_sox_ARGS (char **args)
+{
+	int		fd;
+	int		size;
+	int		pos = 0;
+	char	buf [ CONV_MAX_CARS + 10 ];
+
+	fd = conv_call_exec (args, &conv.code_fork_conv, STDOUT_FILENO ); // STDERR_FILENO STDOUT_FILENO STDIN_FILENO
+	do {
+		pos = -1;
+		do {
+			pos++;
+			if (pos >= CONV_MAX_CARS) {
+				PRINT_FUNC_LF();
+				printf ("pos(%d) >= CONV_MAX_CARS(%d)\n", pos, CONV_MAX_CARS);
+				pos --;
+			}
+			size = read(fd, &buf[pos], 1);
+
+		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
+		pos ++;
+		buf[ pos ] = '\0';
+		buf [ 0 ] = '\0';
+		buf [ 1 ] = '\0';
+		buf [ 2 ] = '\0';
+
+	} while (size != 0);
+
+	close(fd);
+	conv.code_fork_conv = -1;
+}
+char **conv_with_sox_get_param( char *filesrc, char *filedest, char *frequence, char *voie, char *bits )
+{
+	char	**PtrTabArgs = NULL;
+	int		pos;
+
+	PtrTabArgs = conv_AllocTabArgs( &pos );
+
+	PtrTabArgs [ pos++ ] = C_strdup ("sox");
+	PtrTabArgs [ pos++ ] = C_strdup ("-t");
+	PtrTabArgs [ pos++ ] = C_strdup (".wav");
+	PtrTabArgs [ pos++ ] = C_strdup (filesrc);
+	PtrTabArgs [ pos++ ] = C_strdup ("-S");
+	PtrTabArgs [ pos++ ] = C_strdup ("-r");
+	PtrTabArgs [ pos++ ] = C_strdup (frequence);
+	PtrTabArgs [ pos++ ] = C_strdup ("-c");
+	PtrTabArgs [ pos++ ] = C_strdup (voie);
+
+	/*
+	switch (atoi (bits)) {
+		case 8 : PtrTabArgs [ pos++ ] = C_strdup ("-1"); break;
+		// case 16 : PtrTabArgs [ pos++ ] = C_strdup ("-2"); break;
+		case 16 : PtrTabArgs [ pos++ ] = C_strdup ("-b"); PtrTabArgs [ pos++ ] = C_strdup ("16");break;
+		case 24 : PtrTabArgs [ pos++ ] = C_strdup ("-3"); break;
+		case 32 : PtrTabArgs [ pos++ ] = C_strdup ("-4"); break;
+		case 64 : PtrTabArgs [ pos++ ] = C_strdup ("-8"); break;
+		default : PtrTabArgs [ pos++ ] = C_strdup ("-2"); break;
+	}
+	*/
+	switch (atoi (bits)) {
+		case 8 : PtrTabArgs [ pos++ ] = C_strdup ("-b"); PtrTabArgs [ pos++ ] = C_strdup ("8");	break;
+		case 16 : PtrTabArgs [ pos++ ] = C_strdup ("-b"); PtrTabArgs [ pos++ ] = C_strdup ("16");	break;
+		case 24 : PtrTabArgs [ pos++ ] = C_strdup ("-b"); PtrTabArgs [ pos++ ] = C_strdup ("24");	break;
+		case 32 : PtrTabArgs [ pos++ ] = C_strdup ("-b"); PtrTabArgs [ pos++ ] = C_strdup ("32");	break;
+		case 64 : PtrTabArgs [ pos++ ] = C_strdup ("-b"); PtrTabArgs [ pos++ ] = C_strdup ("64");	break;
+		default : PtrTabArgs [ pos++ ] = C_strdup ("-b"); PtrTabArgs [ pos++ ] = C_strdup ("16");	break;
+	}
+
+	// PtrTabArgs [ pos++ ] = C_strdup ("-o");
+	PtrTabArgs [ pos++ ] = C_strdup (filedest);
+	PtrTabArgs [ pos++ ] = NULL;
+
+	return( (char **)PtrTabArgs );
+}
+char **conv_with_sox_float_get_param( char *filesrc, char *filedest )
+{
+	char	**PtrTabArgs = NULL;
+	int		pos;
+
+	PtrTabArgs = conv_AllocTabArgs( &pos );
+
+	PtrTabArgs [ pos++ ] = C_strdup ("sox");
+	PtrTabArgs [ pos++ ] = C_strdup (filesrc);
+	PtrTabArgs [ pos++ ] = C_strdup ("-t");
+	PtrTabArgs [ pos++ ] = C_strdup ("wavpcm");
+	PtrTabArgs [ pos++ ] = C_strdup ("-S");
+	//PtrTabArgs [ pos++ ] = C_strdup ("-f");
+	PtrTabArgs [ pos++ ] = C_strdup ("-e");
+	PtrTabArgs [ pos++ ] = C_strdup ("floating-point");
+	// PtrTabArgs [ pos++ ] = C_strdup ("-o");
+	PtrTabArgs [ pos++ ] = C_strdup (filedest);
+	PtrTabArgs [ pos++ ] = NULL;
+
+	return( (char **)PtrTabArgs );
+}
+// FLAC
+//
+C_BOOL conv_with_flac_ARGS (char **args)
+{
+	int		pos = 0;
+	int		fd;
+	int		size;
+	char	buf [ CONV_MAX_CARS + 10 ];
+	char	*Ptr = NULL;
+	C_BOOL	BoolNoErrorRet = TRUE;
+
+	fd = conv_call_exec( args, &conv.code_fork_conv, STDOUT_FILENO ); // STDERR_FILENO STDOUT_FILENO STDIN_FILENO
+	do {
+		/*
+		01.flac: 27% complete
+		*/
+		pos = -1;
+		do {
+			pos++;
+			if (pos >= CONV_MAX_CARS) {
+				PRINT_FUNC_LF();
+				printf ("pos(%d) >= CONV_MAX_CARS(%d)\n", pos, CONV_MAX_CARS);
+				pos --;
+			}
+			size = read(fd, &buf[pos], 1);
+
+		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
+		pos ++;
+		buf[ pos ] = '\0';
+
+		if ((Ptr = strstr (buf, "ERROR"))) {
+			/*
+			coldplay_test.flac: ERROR, MD5 signature mismatch
+			coldplay_test.wav: ERROR while decoding metadata
+				state = FLAC__STREAM_DECODER_END_OF_STREAM
+			*/
+			BoolNoErrorRet = FALSE;
+			break;
+		}
+
+	} while ( size != 0);
+
+	close(fd);
+	conv.code_fork_conv = -1;
+
+	return (BoolNoErrorRet);
+}
+// MAC
+//
+void conv_with_mac_ARGS (char **args)
+{
+	int pos = 0;
+	int fd;
+	int size;
+	char buf [ CONV_MAX_CARS + 10 ];
+
+	fd = conv_call_exec (args, &conv.code_fork_conv, STDOUT_FILENO);
+	/*
+	mac ./01.wav ./02.ape -c2000
+	--- Monkey's Audio Console Front End (v 3.99) (c) Matthew T. Ashland ---
+	Compressing (normal)...
+	Progress: 8.4% (8.6 seconds remaining, 0.8 seconds total)
+	Progress: 13.3% (7.6 seconds remaining, 1.2 seconds total)
+	Progress: 19.3% (6.9 seconds remaining, 1.6 seconds total)
+	Progress: 24.1% (6.4 seconds remaining, 2.0 seconds total)
+	Progress: 26.6% (6.1 seconds remaining, 2.2 seconds total)
+	Progress: 29.0% (5.9 seconds remaining, 2.4 seconds total)
+	Progress: 53.1% (3.8 seconds remaining, 4.3 seconds total)
+	Progress: 79.7% (1.7 seconds remaining, 6.6 seconds total)
+	Progress: 100.0% (0.0 seconds remaining, 8.2 seconds total)
+	Success...
+	*/
+	do {
+		pos = -1;
+		do {
+			pos++;
+			if (pos >= CONV_MAX_CARS) {
+				PRINT_FUNC_LF();
+				printf ("pos(%d) >= CONV_MAX_CARS(%d)\n", pos, CONV_MAX_CARS);
+				pos --;
+			}
+			size = read(fd, &buf[pos], 1);
+
+		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
+		pos ++;
+		buf[ pos ] = '\0';
+
+	} while ( size != 0);
+
+	close(fd);
+	conv.code_fork_conv = -1;
+}
+// WAVPACK
+//
+void conv_with_wavpack_ARGS (char **args)
+{
+	int pos = 0;
+	int fd;
+	int size;
+	char buf [ CONV_MAX_CARS + 10 ];
+
+	fd = conv_call_exec (args, &conv.code_fork_conv, STDOUT_FILENO ); // STDERR_FILENO STDOUT_FILENO STDIN_FILENO
+	do
+	{
+		pos = -1;
+		do
+		{
+			pos++;
+			if (pos >= CONV_MAX_CARS) {
+				PRINT_FUNC_LF();
+				printf ("pos(%d) >= CONV_MAX_CARS(%d)\n", pos, CONV_MAX_CARS);
+				pos --;
+			}
+			size = read(fd, &buf[pos], 1);
+
+		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
+		buf[pos] = '\0';
+	} while ( size != 0);
+
+	close(fd);
+	conv.code_fork_conv = -1;
+}
+// OGGENC
+//
+void conv_with_oggenc_ARGS (char **args)
+{
+	int pos = 0;
+	int fd;
+	int size;
+	char buf [ CONV_MAX_CARS + 10 ];
+
+	fd = conv_call_exec (args, &conv.code_fork_conv, STDOUT_FILENO ); // STDERR_FILENO STDOUT_FILENO STDIN_FILENO
+	do {
+		size = -1;
+		pos = -1;
+		do {
+			pos++;
+			if (pos >= CONV_MAX_CARS) {
+				PRINT_FUNC_LF();
+				printf ("pos(%d) >= CONV_MAX_CARS(%d)\n", pos, CONV_MAX_CARS);
+				pos --;
+			}
+			size = read(fd, &buf[pos], 1);
+
+		} while (buf[pos] != '\b' && buf[pos] != '\r' && buf[pos] != '\n' && size > 0);
+		pos ++;
+		buf[ pos ] = '\0';
+	} while ( size != 0);
+
+	close(fd);
+	conv.code_fork_conv = -1;
+}
+// FAAC
+//
+void conv_with_faac_ARGS (char **args)
+{
+	int pos = 0;
+	int fd;
+	int size;
+	char buf [ CONV_MAX_CARS + 10 ];
+
+	fd = conv_call_exec (args, &conv.code_fork_conv, STDOUT_FILENO ); // STDERR_FILENO STDOUT_FILENO STDIN_FILENO
+	/*
+	 53/9518 ( 0%)| 108.2 | 0.1/18.0 | 12.31x | 17.9
+	 250/9518 ( 2%)| 117.7 | 0.5/17.5 | 12.62x | 17.1
+	 450/9518 ( 4%)| 122.8 | 0.8/17.9 | 12.38x | 17.0
+	 650/9518 ( 6%)| 124.8 | 1.2/17.9 | 12.37x | 16.6
+	 2100/9518 ( 22%)| 120.5 | 3.8/17.2 | 12.89x | 13.4
+	 9518/9518 (100%)| 124.0 | 17.2/17.2 | 12.86x | 0.0
+	*/
+	do {
+		pos = -1;
+		do {
+			pos++;
+			if (pos >= CONV_MAX_CARS) {
+				PRINT_FUNC_LF();
+				printf ("pos(%d) >= CONV_MAX_CARS(%d)\n", pos, CONV_MAX_CARS);
+				pos --;
+			}
+			size = read(fd, &buf[pos], 1);
+
+		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
+		pos ++;
+		buf[ pos ] = '\0';
+	} while ( size != 0);
+
+	close(fd);
+	conv.code_fork_conv = -1;
+}
+// LAME
+//
+void conv_with_lame_ARGS (char **args)
+{
+	int pos = 0;
+	int fd;
+	int size;
+	char buf [ CONV_MAX_CARS + 10 ];
+
+	fd = conv_call_exec (args, &conv.code_fork_conv, STDOUT_FILENO ); // STDERR_FILENO STDOUT_FILENO STDIN_FILENO
+	do {
+		pos = -1;
+		do {
+			pos++;
+			if (pos >= CONV_MAX_CARS) {
+				PRINT_FUNC_LF();
+				printf ("pos(%d) >= CONV_MAX_CARS(%d)\n", pos, CONV_MAX_CARS);
+				pos --;
+			}
+			size = read(fd, &buf[pos], 1);
+
+		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
+		pos ++;
+		buf[ pos ] = '\0';
+	} while ( size != 0);
+
+	close(fd);
+	conv.code_fork_conv = -1;
+}
+// OGG123
+//
+void conv_with_ogg123_ARGS (char **args)
+{
+	int fd;
+	int pos = 0;
+	int size;
+	char buf [ CONV_MAX_CARS + 10 ];
+
+	fd = conv_call_exec (args, &conv.code_fork_conv, STDOUT_FILENO ); // STDERR_FILENO STDOUT_FILENO STDIN_FILENO
+	do {
+		size = 0;
+		pos = -1;
+		do {
+			pos++;
+			if (pos >= CONV_MAX_CARS) {
+				PRINT_FUNC_LF();
+				printf ("pos(%d) >= CONV_MAX_CARS(%d)\n", pos, CONV_MAX_CARS);
+				pos --;
+			}
+			size = read(fd, &buf[pos], 1);
+
+		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
+		pos ++;
+		buf[ pos ] = '\0';
+	} while ( size != 0);
+
+	close(fd);
+	conv.code_fork_conv = -1;
+}
+// NORMALISE
+//
+void conv_with_normalise_ARGS (char **args)
+{
+	char buf [ CONV_MAX_CARS + 10 ];
+	int fd;
+	int size = 0;
+	int pos = 0;
+
+	fd = conv_call_exec (args, &conv.code_fork_conv, STDOUT_FILENO ); // STDERR_FILENO STDOUT_FILENO STDIN_FILENO
+	do
+	{
+		/*
+		$ normalize-audio --peak "/home/cat/Musique/CD/PEAK_Charles Aznavour/01.wav" --
+		Computing levels...
+		 01.wav 100% done, ETA 00:00:00 (batch 100% done, ETA 00:00:00)
+		Applying adjustment of 0,82dB to /home/cat/Musique/CD/PEAK_Charles Aznavour/01.wav...
+		 01.wav 100% done, ETA 00:00:00 (batch 100% done, ETA 00:00:00)
+		*/
+
+		pos = -1;
+		do
+		{
+			pos++;
+			if (pos >= CONV_MAX_CARS) {
+				PRINT_FUNC_LF();
+				printf ("pos(%d) >= CONV_MAX_CARS(%d)\n", pos, CONV_MAX_CARS);
+				pos --;
+			}
+			size = read(fd, &buf[pos], 1);
+		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
+		buf[pos] = '\0';
+	} while ( size != 0);
+
+	close(fd);
+	conv.code_fork_conv = -1;
+}
+void conv_with_normalise_get_PEAK_RMS_GROUP_ARGS (char **args)
+{
+	char *ptr = NULL;
+	char buf [ CONV_MAX_CARS + 10 ];
+	int fd;
+	int size;
+	int pos = 0;
+	double value = 0.0;
+	double dmin = 0.0;
+	double dmax = 0.0;
+	C_BOOL	 BoolPass = TRUE;
+
+	fd = conv_call_exec (args, &conv.code_fork_conv, STDOUT_FILENO);
+	do
+	{
+		pos = -1;
+		do
+		{
+			pos++;
+			if (pos >= CONV_MAX_CARS) {
+				PRINT_FUNC_LF();
+				printf ("pos(%d) >= CONV_MAX_CARS(%d)\n", pos, CONV_MAX_CARS);
+				pos --;
+			}
+			size = read(fd, &buf[pos], 1);
+
+		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
+		buf[pos] = '\0';
+
+		if ((ptr = strstr (&buf[0], "dBFS"))) {
+			while (*ptr != ' ') ptr ++;
+			while (*ptr == ' ') ptr ++;
+
+			/*printf ("buf = %s\n", buf);*/
+			value = atof(ptr);
+			if (BoolPass == TRUE) {
+				dmin = dmax = value;
+				BoolPass = FALSE;
+			}
+			if (dmin > value) dmin = value;
+			if (dmax < value) dmax = value;
+		}
+
+	} while ( size != 0);
+
+	/*
+	printf ("value = %f, dmin = %f, dmax = %f\n", value, dmin, dmax);
+	printf ("dmax - dmin - 0.1 = %f\n", (dmax - dmin) - 0.1);
+	printf ("dmin - dmax - 0.1 = %f\n", (dmin - dmax) - 0.1);
+	conv.value_PEAK_RMS_GROUP_ARGS = (dmin - dmax) - 0.1;
+	conv.value_PEAK_RMS_GROUP_ARGS = dmax - dmin - 0.1;
+	printf ("conv.value_PEAK_RMS_GROUP_ARGS = %f\n", conv.value_PEAK_RMS_GROUP_ARGS);
+	printf ("****\n");
+	*/
+	printf ("\nSUR LES TRES BONS CONSEILS DE @Dzef ;-)\n");
+	printf ("\tdmin = %f\n", dmin);
+	printf ("\tdmax = %f\n", dmax);
+	printf ("\t0.0 - dmax(%f) - 0.1 = %f\n", dmax, 0.0 - dmax - 0.1);
+	conv.value_PEAK_RMS_GROUP_ARGS = 0.0 - dmax - 0.1;
+	printf ("\tconv.value_PEAK_RMS_GROUP_ARGS = %f\n\n", conv.value_PEAK_RMS_GROUP_ARGS);
+
+	close(fd);
+	conv.code_fork_conv = -1;
+
+}
+// REPLAGAIN
+//
+void conv_with_replaygain_ARGS (char **args)
+{
+	int		pos = 0;
+	int		size = 0;
+	char	buf[CONV_MAX_CARS + 10];
+	int		fd;
+
+	fd = conv_call_exec (args, &conv.code_fork_conv, STDOUT_FILENO ); // STDERR_FILENO STDOUT_FILENO STDIN_FILENO
+	do
+	{
+		size = -1;
+		pos = -1;
+		do {
+			pos++;
+			if (pos >= CONV_MAX_CARS) {
+				PRINT_FUNC_LF();
+				printf ("pos(%d) >= CONV_MAX_CARS(%d)\n", pos, CONV_MAX_CARS);
+				pos --;
+			}
+			size = read(fd, &buf[pos], 1);
+
+
+		} while (buf[pos] != '\b' && buf[pos] != '\r' && buf[pos] != '\n' && size > 0);
+		pos ++;
+		buf[ pos ] = '\0';
+	} while ( size != 0);
+
+	close(fd);
+}
+// AACPLUSENC
+//
+void conv_with_aacplusenc_ARGS (char **args)
+{
+	int		pos = 0;
+	int		size = 0;
+	char	buf[CONV_MAX_CARS + 10];
+	int		fd;
+
+	fd = conv_call_exec (args, &conv.code_fork_conv, STDOUT_FILENO ); // STDERR_FILENO STDOUT_FILENO STDIN_FILENO
+	do {
+		pos = -1;
+		do {
+			pos++;
+			if (pos >= CONV_MAX_CARS) {
+				PRINT_FUNC_LF();
+				printf ("pos(%d) >= CONV_MAX_CARS(%d)\n", pos, CONV_MAX_CARS);
+				pos --;
+			}
+			size = read(fd, &buf[pos], 1);
+
+		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
+		buf[pos ++ ] = '\n';
+		buf[pos] = '\0';
+	} while ( size != 0);
+
+	conv.code_fork_conv = -1;
+	close(fd);
+}
+// MPPENC
+//
+void conv_with_mppenc_ARGS (char **args)
+{
+	int pos = 0;
+	int fd;
+	int size;
+	char buf [ CONV_MAX_CARS + 10 ];
+
+	fd = conv_call_exec (args, &conv.code_fork_conv, STDOUT_FILENO ); // STDERR_FILENO STDOUT_FILENO STDIN_FILENO
+	do {
+		pos = -1;
+		do {
+			pos++;
+			if (pos >= CONV_MAX_CARS) {
+				PRINT_FUNC_LF();
+				printf ("pos(%d) >= CONV_MAX_CARS(%d)\n", pos, CONV_MAX_CARS);
+				pos --;
+			}
+			size = read(fd, &buf[pos], 1);
+
+		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
+		pos ++;
+		buf[ pos ] = '\0';
+	} while ( size != 0);
+
+	close(fd);
+	conv.code_fork_conv = -1;
+}
+// MPG321
+//
+void conv_with_mpg321_ARGS (char **args)
+{
+	int fd;
+	int pos = 0;
+	int size = -1;
+	char buf [ CONV_MAX_CARS + 10 ];
+
+	fd = conv_call_exec (args, &conv.code_fork_conv, STDOUT_FILENO ); // STDERR_FILENO STDOUT_FILENO STDIN_FILENO
+	do {
+		pos = -1;
+		do {
+			pos++;
+			if (pos >= CONV_MAX_CARS) {
+				PRINT_FUNC_LF();
+				printf ("pos(%d) >= CONV_MAX_CARS(%d)\n", pos, CONV_MAX_CARS);
+				pos --;
+			}
+			size = read(fd, &buf[pos], 1);
+
+		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
+		pos ++;
+		buf[ pos ] = '\0';
+	} while ( size != 0);
+
+	close(fd);
+	conv.code_fork_conv = -1;
+}
+// SHORTEN
+//
+void conv_with_shorten_ARGS (char **args)
+{
+	int fd;
+	int size;
+	int pos = 0;
+	char buf [ CONV_MAX_CARS + 10 ];
+
+	fd = conv_call_exec (args, &conv.code_fork_conv, STDOUT_FILENO ); // STDERR_FILENO STDOUT_FILENO STDIN_FILENO
+	do {
+		pos = -1;
+		do {
+			pos++;
+			if (pos >= CONV_MAX_CARS) {
+				PRINT_FUNC_LF();
+				printf ("pos(%d) >= CONV_MAX_CARS(%d)\n", pos, CONV_MAX_CARS);
+				pos --;
+			}
+			size = read(fd, &buf[pos], 1);
+
+		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
+		pos ++;
+		buf[ pos ] = '\0';
+	} while ( size != 0);
+
+	close(fd);
+	conv.code_fork_conv = -1;
+}
+// FAAD
+//
+void conv_with_faad_ARGS (char **args)
+{
+	int fd;
+	int size;
+	int pos = 0;
+	char buf [ CONV_MAX_CARS + 10 ];
+
+	fd = conv_call_exec (args, &conv.code_fork_conv, STDOUT_FILENO ); // STDERR_FILENO STDOUT_FILENO STDIN_FILENO
+	/*
+	39% decoding 05.m4a.
+	52% decoding 05.m4a.
+	60% decoding 05.m4a.
+	67% decoding 05.m4a.
+	77% decoding 05.m4a.
+	84% decoding 05.m4a.
+	*/
+	do {
+		pos = -1;
+		do {
+			pos++;
+			if (pos >= CONV_MAX_CARS) {
+				PRINT_FUNC_LF();
+				printf ("pos(%d) >= CONV_MAX_CARS(%d)\n", pos, CONV_MAX_CARS);
+				pos --;
+			}
+			size = read(fd, &buf[pos], 1);
+
+			if (strstr(buf,"Audio: no sound")) {
+				break;
+			}
+
+		} while ( (buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
+
+		if (buf[pos] != '\n') {
+			pos ++;
+			buf[pos++] = '\n';
+			buf[pos] = '\0';
+		}
+	} while ((size > 0));
+
+	close(fd);
+	conv.code_fork_conv = -1;
+}
+// MPPDEC
+//
+void conv_with_mppdec_ARGS (char **args)
+{
+	int fd;
+	int size;
+	int pos = 0;
+	char buf [ CONV_MAX_CARS + 10 ];
+
+	fd = conv_call_exec (args, &conv.code_fork_conv, STDOUT_FILENO ); // STDERR_FILENO STDOUT_FILENO STDIN_FILENO
+	do {
+		pos = -1;
+		do {
+			pos++;
+			if (pos >= CONV_MAX_CARS) {
+				PRINT_FUNC_LF();
+				printf ("pos(%d) >= CONV_MAX_CARS(%d)\n", pos, CONV_MAX_CARS);
+				pos --;
+			}
+			size = read(fd, &buf[pos], 1);
+
+		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
+		pos ++;
+		buf[ pos ] = '\0';
+	} while ( size != 0);
+
+	close(fd);
+	conv.code_fork_conv = -1;
+}
+// WVUNPACK_WAVPACK_TO_WAV
+//
+void conv_with_wvunpack_ARGS (char **args)
+{
+	int fd;
+	int size;
+	int pos = 0;
+	char buf [ CONV_MAX_CARS + 10 ];
+
+	fd = conv_call_exec (args, &conv.code_fork_conv, STDOUT_FILENO ); // STDERR_FILENO STDOUT_FILENO STDIN_FILENO
+	do
+	{
+		pos = -1;
+		do
+		{
+			pos++;
+			if (pos >= CONV_MAX_CARS) {
+				PRINT_FUNC_LF();
+				printf ("pos(%d) >= CONV_MAX_CARS(%d)\n", pos, CONV_MAX_CARS);
+				pos --;
+			}
+			size = read(fd, &buf[pos], 1);
+
+		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
+		buf[pos] = '\0';
+		/*
+		fish@debian:~/Musique/aaa/new$ wvunpack -y -m ./20.wv
+
+		 WVUNPACK Hybrid Lossless Audio Decompressor Linux Version 4.32 2006-04-05
+		 Copyright (c) 1998 - 2005 Conifer Software. All Rights Reserved.
+
+		restoring ./20.wav, 34% done...
+
+		original md5: 2b74aed5a5d62d1c3b0e6b96d5147cc9
+		unpacked md5: 2b74aed5a5d62d1c3b0e6b96d5147cc9
+		restored ./20.wav in 17.23 secs (lossless, 26.45%)
+		else if ((ptr = strstr (&buf[0], "original md5:"))) {
+		}
+		else if ((ptr = strstr (&buf[0], "unpacked md5:"))) {
+		}
+		else if ((ptr = strstr (&buf[0], "restored"))) {
+		}
+		*/
+	} while (size != 0);
+
+	close(fd);
+	conv.code_fork_conv = -1;
+}
+// A52DEC
+//
+void conv_with_a52dec_ARGS (char **args)
+{
+	int			pos = 0;
+	int			size = 0;
+	char		buf[CONV_MAX_CARS + 10];
+	int			fd;
+	FILE		*fp = NULL;
+	char		*FileSave = C_strdup (args[ 8 ]);
+
+	free (args[ 7 ]);	args[ 7 ] = NULL;
+	free (args[ 8 ]);	args[ 8 ] = NULL;
+
+
+	fd = conv_call_exec (args, &conv.code_fork_conv, STDOUT_FILENO);
+	fp = fopen (FileSave, "w");
+	do {
+		pos = 0;
+		do {
+			/*
+			pos++;
+			if (pos >= CONV_MAX_CARS) {
+				PRINT_FUNC_LF();
+				printf ("pos(%d) >= CONV_MAX_CARS(%d)\n", pos, CONV_MAX_CARS);
+				pos --;
+			}
+			*/
+			size = read(fd, &buf [ pos ], 1);
+			fprintf (fp, "%c", (short)buf [ 0 ]);
+
+
+		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
+		buf[pos ++ ] = '\n';
+		buf[pos] = '\0';
+	} while ( size != 0);
+
+	fclose (fp);
+	free (FileSave);	FileSave = NULL;
+
+	conv.code_fork_conv = -1;
+	close(fd);
+}
+
+// CALL CONV
+//
+C_BOOL conv_to_convert( char **p_TabArgs, TYPE_CONV type_conv, char *info )
+{
+	int		pos = 0;
+	C_BOOL	RetBool = TRUE;
+
+	if( TRUE == Detail.BoolVerboseMode ) {
+		printf ("!-----------------------------------------------------------!\n");
+		printf ("! %s\n", info);
+		printf ("!-----------------------------------------------------------!\n");
+		printf ("! ");
+		for (pos = 0; p_TabArgs[ pos ] != NULL; pos ++)
+			printf ("%s ", p_TabArgs[ pos ]);
+		printf ("\n!-----------------------------------------------------------!\n");
+		for (pos = 0; p_TabArgs[ pos ] != NULL; pos ++)
+			printf ("p_TabArgs[ %02d ] = %s\n", pos, p_TabArgs[ pos ]);
+		printf ("\n");
+	}
+
+	switch (type_conv) {
+	case NONE_CONV :
+		break;
+	case FLAC_FLAC_TO_WAV :
+	case FLAC_WAV_TO_FLAC :
+		RetBool = conv_with_flac_ARGS( p_TabArgs );
+		break;
+	case LAME_WAV_TO_MP3 :
+	case LAME_FLAC_TO_MP3 :
+		conv_with_lame_ARGS( p_TabArgs );
+		break;
+	case OGGENC_WAV_TO_OGG :
+	case OGGENC_FLAC_TO_OGG :
+		conv_with_oggenc_ARGS( p_TabArgs );
+		break;
+	case OGG123_OGG_TO_WAV :
+		conv_with_ogg123_ARGS( p_TabArgs );
+		break;
+	case MPG321_MP3_TO_WAV :
+		conv_with_mpg321_ARGS( p_TabArgs );
+		break;
+	case SOX_WAV_TO_WAV :
+		conv_with_sox_ARGS( p_TabArgs );
+		break;
+	case SHORTEN_SHN_TO_WAV :
+		conv_with_shorten_ARGS( p_TabArgs );
+		break;
+	case FAAD_M4A_TO_WAV :
+		conv_with_faad_ARGS( p_TabArgs );
+		break;
+	case FAAC_WAV_TO_M4A :
+		conv_with_faac_ARGS( p_TabArgs );
+		break;
+	case MPLAYER_WMA_TO_WAV :
+	case MPLAYER_RM_TO_WAV :
+	case MPLAYER_DTS_TO_WAV :
+	case MPLAYER_AIFF_TO_WAV :
+	case MPLAYER_WAV_TO_WAV :
+	case MPLAYER_AUDIO_TO_WAV :
+	case MPLAYER_M4A_TO_WAV :
+	case MPLAYER_OGG_TO_WAV :
+	case MPLAYER_MP3_TO_WAV :
+	case MPLAYER_MPC_TO_WAV :
+		RetBool = conv_with_mplayer_ARGS( p_TabArgs, type_conv );
+		break;
+	case MPPDEC_MPC_TO_WAV :
+		conv_with_mppdec_ARGS( p_TabArgs );
+		break;
+	case MPPENC_WAV_TO_MPC :
+		conv_with_mppenc_ARGS( p_TabArgs );
+		break;
+	case MAC_APE_TO_WAV :
+	case MAC_WAV_TO_APE :
+		conv_with_mac_ARGS( p_TabArgs );
+		break;
+	case WAVPACK_WAV_TO_WAVPACK :
+		conv_with_wavpack_ARGS( p_TabArgs );
+		break;
+	case WVUNPACK_WAVPACK_TO_WAV :
+		conv_with_wvunpack_ARGS( p_TabArgs );
+		break;
+	case AACPLUSENC_WAV_TO_AAC :
+		conv_with_aacplusenc_ARGS( p_TabArgs );
+		break;
+	case A52DEC_AC3_TO_WAV :
+		conv_with_a52dec_ARGS( p_TabArgs );
+		break;
+
+	case REPLAYGAIN :
+		conv_with_replaygain_ARGS( p_TabArgs );
+		break;
+	case NORMALISE_EXEC :
+		conv_with_normalise_ARGS( p_TabArgs );
+		break;
+	case NORMALISE_GET_LEVEL:
+		conv_with_normalise_get_PEAK_RMS_GROUP_ARGS( p_TabArgs );
+		break;
+	}
+
+	return( RetBool );
+}
+//
+// Algo retravaille depuis:
+//	C EN ACTION - 2 ieme Edition - Yves Mettier
+//
+C_BOOL conv_copy_src_to_dest (char *filesrc, char *filedest)
+{
+	FILE	*fn = NULL;
+	FILE	*fe = NULL;
+	char	buf [ BUFSIZ + 10 ];	// 8192
+	size_t	size = utils_get_size_file (filesrc);
+	long	cpt;
+	size_t	l_read;
+
+	if (0 == size) {
+		fprintf (stderr, "La taille de : %s est NULLE !!!\n", filesrc);
+		return (FALSE);
+	}
+	if (NULL == (fe = fopen (filesrc, "r"))) {
+		fprintf (stderr, "Echec ouverture en lecture de: %s\n", filesrc);
+		return (FALSE);
+	}
+	if (NULL == (fn = fopen (filedest, "w"))) {
+		fprintf (stderr, "Echec ouverture en ecriture de: %s\n", filedest);
+		fclose (fe);
+		return (FALSE);
+	}
+
+	if( TRUE == Detail.BoolVerboseMode ) {
+		PRINT_FUNC_LF();
+		printf ("\t%s\n\t%s\n", filesrc, filedest);
+	}
+	cpt = 0;
+	while ( ! feof (fe)) {
+
+		l_read = fread (buf, sizeof (*buf), BUFSIZ, fe);
+		if (ferror (fe)) {
+			fprintf (stderr, "Erreur de lecture depuis: %s\n", filesrc );
+			fclose (fn);
+			fclose (fe);
+			return (FALSE);
+		}
+		fwrite (buf, sizeof (*buf), l_read, fn);
+		if (ferror (fn)) {
+			fprintf (stderr, "Erreur d'ecriture depuis: %s\n", filedest );
+			fclose (fn);
+			fclose (fe);
+			return (FALSE);
+		}
+		fflush( fn );
+		cpt ++;
+	}
+	fclose (fn);
+	fclose (fe);
+
+	return (TRUE);
+}
+
+
+
+
+
+
+
+

xcfa-5.0.2.tar.gz/src_cli/conv.h Added

@@ -0,0 +1,96 @@
+/*
+ * file : src/conv.h
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+
+#ifndef conv_h
+#define conv_h 1
+
+#include <sys/types.h>
+#include <signal.h>
+
+
+typedef enum {						// Les types de conversions possibles
+	NONE_CONV = 0,					//
+	FLAC_FLAC_TO_WAV,				//
+	FLAC_WAV_TO_FLAC,				//
+	LAME_WAV_TO_MP3,				//
+	LAME_FLAC_TO_MP3,				//
+	OGGENC_WAV_TO_OGG,				//
+	OGGENC_FLAC_TO_OGG,				//
+	OGG123_OGG_TO_WAV,				//
+	MPG321_MP3_TO_WAV,				//
+	SOX_WAV_TO_WAV,					//
+	SHORTEN_SHN_TO_WAV,				//
+	FAAD_M4A_TO_WAV,				//
+	FAAC_WAV_TO_M4A,				//
+	MPLAYER_WAV_TO_WAV,				//
+	MPLAYER_WMA_TO_WAV,				//
+	MPLAYER_AUDIO_TO_WAV,			//
+	MPLAYER_M4A_TO_WAV,				//
+	MPLAYER_OGG_TO_WAV,				//
+	MPLAYER_MP3_TO_WAV,				//
+	MPLAYER_MPC_TO_WAV,				//
+	MPLAYER_RM_TO_WAV,				//
+	MPLAYER_DTS_TO_WAV,				//
+	MPLAYER_AIFF_TO_WAV,			//
+	MPPDEC_MPC_TO_WAV,				//
+	MPPENC_WAV_TO_MPC,				//
+	MAC_APE_TO_WAV,					//
+	MAC_WAV_TO_APE,					//
+	WAVPACK_WAV_TO_WAVPACK,			//
+	WVUNPACK_WAVPACK_TO_WAV,		//
+	AACPLUSENC_WAV_TO_AAC,			//
+	A52DEC_AC3_TO_WAV,				//
+	REPLAYGAIN,						//
+	NORMALISE_EXEC,					//
+	NORMALISE_GET_LEVEL				//
+
+} TYPE_CONV;
+
+typedef struct {
+	char		*TmpRep;							// Le repertoire temporaire d'extractions/conversions
+	pid_t		code_fork_conv;						// Num Code Fork
+	int			signal_numchildren_conv;			// the signal handler
+	int			tube_conv [ 2 ];					// for pipe
+	double		value_PEAK_RMS_GROUP_ARGS;			//
+} CONV;
+
+extern CONV conv;
+
+C_BOOL		conv_to_convert( char **p_TabArgs, TYPE_CONV type_conv, char *info );
+C_BOOL 	conv_copy_src_to_dest( char *filesrc, char *filedest );
+char 		**conv_with_sox_get_param( char *filesrc, char *filedest, char *frequence, char *voie, char *bits );
+char		**conv_with_sox_float_get_param( char *filesrc, char *filedest );
+char		**conv_get_command_line(
+				TYPE_CONV	type_conv,
+				char		*src,
+				char		*dest,
+				TAGS		*InfosTags,
+				char		*options
+				);
+char		**conv_RemoveTab( char **p_PtrTabArgs );
+char		**conv_AllocTabArgs( int *p_tab );
+
+#endif
+
+

xcfa-5.0.2.tar.gz/src_cli/cue.c Added

@@ -0,0 +1,640 @@
+/*
+ * file : src/cue.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#ifdef ENABLE_NLS
+	#include <libintl.h>
+	#define _(String) gettext (String)
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "global.h"
+#include "tags.h"
+#include "conv.h"
+
+
+
+typedef struct {
+	int		num_track;
+	char	title[ 256 ];
+	int		begin;
+	int		end;
+	int		length;
+} TRACK;
+CList	*ListTrack = NULL;
+
+
+//
+//
+C_BOOL cue_read_wav_file( char *p_path_name_file )
+{
+#define BLOCK_SIZE	2352
+	typedef struct {
+		int		begin;
+		int		end;
+	} BLANK;
+	WAVE	WaveHeader;
+	int		ChannelNext;
+	int		Ret;
+	int		tmp = 0;
+	int		points = 0;
+	unsigned char	devbuf[ BLOCK_SIZE +10 ];
+	int		Indice;
+	double	min, max;
+	int		point_begin, point_end;
+	BLANK	*blank = NULL;
+	CList	*ListBlank = NULL;
+	CList	*list_b = NULL;
+	BLANK	*blank_next = NULL;
+	TRACK	*Track = NULL;
+	int		num_track = 1;
+	double	PercentBegin;
+	double	PercentEnd;
+	int		TimeSongSec;
+	int		max_points;
+
+	if( FALSE == tagswav_read_file( p_path_name_file, &WaveHeader )) {
+		printf("Mauvais format de fichier: %s\n", p_path_name_file );
+		tagswav_close_file( &WaveHeader );
+		return( FALSE );
+	}
+
+	switch( WaveHeader.FMT.BitsPerSample ) {
+		case 8 :
+		case 16 :
+		case 24 :
+		case 32 :
+			break;
+		default :
+			tagswav_close_file( &WaveHeader );
+			printf("Seuls ces formats de bitrates : 8 16 24 et 32 sont pris en charge pour la lecture\n"
+					"Format de bitrate [ %d ] non prit en charge\n",
+					WaveHeader.FMT.BitsPerSample
+				);
+		return( FALSE );
+	}
+
+	points = 0;
+	point_begin = point_end = -1;
+	ChannelNext = (WaveHeader.FMT.NumChannels -1) * (WaveHeader.FMT.BitsPerSample / 8);
+
+	// LECTURE DES DATAS
+	while( (Ret = fread( devbuf, 1, BLOCK_SIZE, WaveHeader.file )) > 0 ) {
+
+		min = max = 0.0;
+
+		for (Indice = 0; Indice < Ret; Indice++) {
+
+			if (WaveHeader.FMT.BitsPerSample == 8) {
+
+				tmp = devbuf [ Indice ];
+				tmp -= 128;
+			}
+			else if (WaveHeader.FMT.BitsPerSample == 16) {
+
+				tmp = (char)devbuf [ Indice +1 ] << 8 | (char)devbuf [ Indice ];
+				Indice ++;
+			}
+			else if (WaveHeader.FMT.BitsPerSample == 24) {
+
+				tmp = (char)devbuf [ Indice +0 ] >> 16;
+				tmp += (char)devbuf [ Indice +1 ] >> 8;
+				tmp += (char)devbuf [ Indice +2 ];
+
+				Indice += 2;
+			}
+			else if (WaveHeader.FMT.BitsPerSample == 32) {
+
+				tmp = (char)devbuf [ Indice +0 ] >> 24;
+				tmp += (char)devbuf [ Indice +1 ] >> 16;
+				tmp += (char)devbuf [ Indice +2 ] >> 8;
+				tmp += (char)devbuf [ Indice +3 ];
+
+				Indice += 2;
+			}
+
+			if (tmp > max)			max = tmp;
+			else if (tmp <= min)	min = tmp;
+
+			// skip over any extra channels
+			Indice += ChannelNext;
+		}
+
+		// ~-50 dB calculation :
+		// ---------------------
+		// From @Dzef:
+		// 	Sinon, Claude, pour le soucis de not' Christophe-coupeur-d'album-en-rondelles-sans-cue,
+		// la parade existe en partie dans le cas où les plages sont séparées par des "blancs"
+		// (ce qui n'est pas le cas des albums "live" par exemple) : il suffit de détecter le niveau
+		// 	audio et en dessous d'un seuil fixé (typiquement < ~-50 dB), hop, 1 plage !
+		// PS:
+		// 	Et chose fut faite: MERCI Xavier :-)
+		if( min >= -1. && max <= 1. ) {
+
+			if( point_begin == -1 )
+					point_begin = point_end = points;
+			else	point_end = points;
+
+		} else {
+			if( NULL == blank && point_begin != 0 ) {
+				blank = (BLANK *)malloc( sizeof(BLANK) );
+				blank->begin = 0;
+				blank->end = 2;
+				ListBlank = C_list_append( ListBlank, blank );
+			}
+			// threshold below ~-50 dB
+			// seuil en dessous ~-50 dB
+			if( point_end - point_begin >= 10 ) {
+				blank = (BLANK *)malloc( sizeof(BLANK) );
+				blank->begin = point_begin;
+				blank->end = point_end;
+				ListBlank = C_list_append( ListBlank, blank );
+			}
+			point_begin = point_end = -1;
+		}
+		points ++;
+	}
+	// The end of file in list
+	if( point_end != points ) {
+		blank = (BLANK *)malloc( sizeof(BLANK) );
+		blank->begin = point_begin != -1 ? point_begin : points;
+		blank->end = points;
+		ListBlank = C_list_append( ListBlank, blank );
+	}
+	// if only one track
+	if( 1 == C_list_length( ListBlank )) {
+		blank = (BLANK *)malloc( sizeof(BLANK) );
+		blank->begin = points;
+		blank->end = points;
+		ListBlank = C_list_append( ListBlank, blank );
+	}
+
+	TimeSongSec = WaveHeader.DATA.Subchunk2Size / WaveHeader.FMT.ByteRate;
+	max_points = points;
+
+	if( NULL != ( list_b = C_list_first( ListBlank ))) {
+		while( list_b ) {
+			if( NULL != ( blank = (BLANK *)list_b->data )) {
+				if( NULL != list_b->next && NULL != (blank_next =(BLANK *)list_b->next->data )) {
+
+					if( 1 == num_track )
+							PercentBegin = ((double)blank->begin / (double)max_points) * 100.0;
+					else	PercentBegin = ((double)blank->end / (double)max_points) * 100.0;
+					PercentEnd = ((double)(blank_next->end - 5) / (double)max_points) * 100.0;
+
+					Track = (TRACK *)malloc( sizeof(TRACK) );
+					Track->num_track = num_track;
+					sprintf( Track->title, "title_%d", num_track );
+					Track->begin = (int) (((double)TimeSongSec * (double)PercentBegin) / 100.0);
+					Track->end = (int) (((double)TimeSongSec * (double)PercentEnd) / 100.0);
+					Track->length = Track->end - Track->begin;
+					ListTrack = C_list_append( ListTrack, Track );
+
+					num_track ++;
+				}
+			}
+			list_b = C_list_next( list_b );
+			Indice ++;
+		}
+	}
+
+	// Clear list: ListBlank
+	if( NULL != (list_b = C_list_first( ListBlank ))) {
+		while( list_b ) {
+			free( list_b->data );
+			list_b->data = NULL;
+			list_b = C_list_next( list_b );
+		}
+		list_b = ListBlank = C_list_free( ListBlank );
+	}
+
+	tagswav_close_file( &WaveHeader );
+
+	return( TRUE );
+}
+
+//
+//
+void cue_put_infos_wav_file( char *p_path_name_file )
+{
+	CList	*list = NULL;
+	TRACK	*Track = NULL;
+	char	StrTimeBegin[ 10 ];
+	char	StrTimeEnd[ 10 ];
+
+	if( NULL != ( list = C_list_first( ListTrack ))) {
+		printf("\n" );
+		printf( "!-------------------------------------------------------------\n" );
+		printf( "! %s\n", p_path_name_file );
+		printf( "!-------------------------------------------------------------\n" );
+		printf( "! Track Begin End Length Title\n" );
+		printf( "!-------------------------------------------------------------\n" );
+		while( list ) {
+			if( NULL != ( Track = list->data )) {
+				sprintf( StrTimeBegin, "%02d:%02d:%02d",
+						(Track->begin / 60) / 60,
+						(Track->begin / 60) % 60,
+						Track->begin % 60
+						);
+				sprintf( StrTimeEnd, "%02d:%02d:%02d",
+						(Track->end / 60) / 60,
+						(Track->end / 60) % 60,
+						Track->end % 60
+						);
+
+				printf(" [ %2d ] %s %s %5d %s\n",
+						Track->num_track,
+						StrTimeBegin,
+						StrTimeEnd,
+						Track->length,
+						Track->title
+						);
+			}
+			list = C_list_next( list );
+		}
+	}
+}
+
+
+//
+// Split file 'char *p_pathnamefile' from 'int p_split_begin_ss' for a length of 'int p_split_length_ss'
+//
+void cue_split_wav( char *p_from_wav, char *p_to_wav, int p_split_begin_ss, int p_split_length_ss )
+{
+	WAVE	WaveHeader;
+	double	Percent = 0.;
+	double	PercentBegin;
+	double	PercentEnd;
+	char	*buffer = NULL;
+	FILE	*fp = NULL;
+	size_t	Ret;
+	size_t	RetRead;
+	size_t	WriteValue;
+
+	printf ( "%s", BOLD_RED );
+	printf("		p_from_wav = %s\n", p_from_wav );
+	printf("		p_to_wav = %s\n", p_to_wav );
+	printf("		p_split_begin_ss = %d\n", p_split_begin_ss );
+	printf("		p_split_length_ss = %d\n", p_split_length_ss );
+	printf ( "%s", RESET );
+
+	if (FALSE == tagswav_read_file( p_from_wav, &WaveHeader )) {
+		tagswav_close_file( &WaveHeader );
+		printf ( "%s", BOLD_RED );
+		printf("\n!--- S P L I T ----------------\n");
+		printf ( "! File not found to split operation: \"%s\"", p_from_wav );
+		printf ( "%s\n\n", RESET );
+		return;
+	}
+	if( (p_split_begin_ss + p_split_length_ss) > (WaveHeader.DATA.Subchunk2Size / WaveHeader.FMT.ByteRate) ) {
+		printf ( "%s", BOLD_RED );
+		printf("\n!--- S P L I T ----------------\n");
+		printf ( "! The size of the '--split' and '--length' is greater than the size of the file." );
+		printf ( "! %s\n", p_from_wav );
+		printf ( "! %d secondes\n", WaveHeader.DATA.Subchunk2Size / WaveHeader.FMT.ByteRate );
+		printf ( "%s\n\n", RESET );
+		tagswav_close_file( &WaveHeader );
+		return;
+	}
+
+	PercentBegin = (((double)p_split_begin_ss * (double)WaveHeader.FMT.ByteRate) / WaveHeader.DATA.Subchunk2Size) * 100.0;
+	PercentEnd = (((double)p_split_length_ss * (double)WaveHeader.FMT.ByteRate) / WaveHeader.DATA.Subchunk2Size) * 100.0;
+	PercentEnd += PercentBegin;
+
+	printf("\n!--- S P L I T ---------------------------------------------!\n");
+	printf( "! %s\n", p_from_wav );
+	printf( "! %s\n", p_to_wav );
+
+	buffer = (char *)malloc ((sizeof(char) * BUFSIZ) + 10);
+
+	fp = fopen( p_to_wav, "w" );
+	// ECRITURE ENTETE FICHIER WAV
+	fwrite( &WaveHeader.RIFF.ChunkID, 4, 1, fp );		// RIFF
+	fwrite( &WaveHeader.RIFF.ChunkSize, 4, 1, fp );		// taille du fichier entier en octets (sans compter les 8 octets de ce champ et le champ précédent
+	fwrite( &WaveHeader.RIFF.Format, 4, 1, fp );		// WAVE
+	fwrite( &WaveHeader.FMT.Subchunk1ID, 4, 1, fp );	// 'fmt '
+	fwrite( &WaveHeader.FMT.Subchunk1Size, 4, 1, fp );	// taille en octet des données à suivre
+	fwrite( &WaveHeader.FMT.AudioFormat, 2, 1, fp );	// format de compression (une valeur autre que 1 indique une compression)
+	fwrite( &WaveHeader.FMT.NumChannels, 2, 1, fp );	// nombre de canaux
+	fwrite( &WaveHeader.FMT.SampleRate, 4, 1, fp );		// fréquence d'échantillonage (nombre d'échantillons par secondes)
+	fwrite( &WaveHeader.FMT.ByteRate, 4, 1, fp );		// nombre d'octects par secondes
+	fwrite( &WaveHeader.FMT.Blockalign, 2, 1, fp );		// nombre d'octects pour coder un échantillon
+	fwrite( &WaveHeader.FMT.BitsPerSample, 2, 1, fp );	// nombre de bits pour coder un échantillon
+	fwrite( &WaveHeader.DATA.Subchunk2ID, 4, 1, fp );	// 'data'
+	fwrite( &WaveHeader.DATA.Subchunk2Size, 4, 1, fp );	// taille des données audio( nombre total d'octets codant les données audio)
+
+	RetRead = 0;
+	WriteValue = 0;
+	while(( Ret = fread (buffer, 1, BUFSIZ, WaveHeader.file )) > 0) {
+		RetRead += Ret;
+		Percent = (float)(RetRead / (float)WaveHeader.DATA.Subchunk2Size) * 100.0;
+		if( Percent >= PercentBegin ) {
+			fwrite( buffer, Ret, 1, fp );
+			WriteValue += Ret;
+	 	}
+		if( Percent > PercentEnd ) break;
+	}
+	/*
+	fseek( fp, 4L, SEEK_SET );
+	WriteValue += 44;
+	WriteValue -= 8;
+	fwrite( &WriteValue, 4, 1, fp );	// taille du fichier entier en octets (sans compter les 8 octets de ce champ et le champ précédent
+	fseek( fp, 40L, SEEK_SET );
+	WriteValue += 8;
+	WriteValue -= 44;
+	fwrite( &WriteValue, 4, 1, fp );	// taille des données audio( nombre total d'octets codant les données audio )
+	*/
+	fseek( fp, 40L, SEEK_SET );
+	fwrite( &WriteValue, 4, 1, fp );	// taille des données audio( nombre total d'octets codant les données audio )
+	fseek( fp, 4L, SEEK_SET );
+	WriteValue += 44;
+	WriteValue -= 8;
+	fwrite( &WriteValue, 4, 1, fp );	// taille du fichier entier en octets (sans compter les 8 octets de ce champ et le champ précédent
+
+	tagswav_close_file( &WaveHeader );
+	fclose (fp );
+	fp = NULL;
+
+	free( buffer );
+	buffer = NULL;
+}
+void cue_extract_wav_file( char *p_OutputDir, char *p_path_name_file )
+{
+	CList	*list = NULL;
+	TRACK	*Track = NULL;
+	char	*to_wav = NULL;
+
+	if( NULL != ( list = C_list_first( ListTrack ))) {
+
+		// MAKE DIRECTORY DESTINATION IF NOT EXIST
+		if( FALSE == C_dir_test( p_OutputDir ))
+			C_mkdir_with_parents( p_OutputDir );
+
+		while( list ) {
+			if( NULL != ( Track = list->data )) {
+				to_wav = C_strdup_printf( "%s%s.wav", p_OutputDir, Track->title );
+				cue_split_wav( p_path_name_file, to_wav, Track->begin, Track->length );
+				free( to_wav );
+				to_wav = NULL;
+			}
+			list = C_list_next( list );
+		}
+	}
+}
+
+//
+//
+float cue_get_time_in_sec( char *p_str )
+{
+	char		*Ptr = NULL;
+	uint		 Min, Sec, Hundr;
+	float		 SecondesTempsActuel = 0;
+
+	// MINUTES
+	if ((Ptr = strchr (p_str, ':')) != NULL) {
+		while (*Ptr != ' ') Ptr --;
+		if (*Ptr == ' ') Ptr ++;
+		Min = atoi (Ptr);
+
+		// SECONDES
+		if ((Ptr = strchr (p_str, ':')) != NULL) {
+			Ptr ++;
+			Sec = atoi (Ptr);
+
+			// CENTIEMES
+			if ((Ptr = strrchr (p_str, ':')) != NULL) {
+				Ptr ++;
+				Hundr = atoi (Ptr);
+
+				// Temps Total en secondes
+				SecondesTempsActuel = ((float)Min * 60.0) + (float)Sec + ((float)Hundr / 100.0);
+			}
+		}
+	}
+
+	return (SecondesTempsActuel);
+}
+
+//
+//
+C_BOOL cue_read_cue_file( char *p_path_name_file_cue, char **p_path_name_file_wav )
+{
+	FILE	*fp;
+#define MAX_CARS_SPLIT_CUE_FILE 255
+	char	buf [ MAX_CARS_SPLIT_CUE_FILE + 4 ];
+	char	*StrNameSong = NULL;
+	char	*PathNameSong = NULL;
+	char	*Ptr = NULL;
+	char	*Path = NULL;
+	WAVE	WaveHeader;
+	int		TimeSongSec;
+
+	// Cherche le nom de fichier WAV associé au fichier CUE pour: PathNameSong
+	fp = fopen( p_path_name_file_cue, "r" );
+	while( NULL != fgets( buf, MAX_CARS_SPLIT_CUE_FILE, fp )) {
+
+		// Si debut de ligne ok
+		if( NULL != ( Ptr = strstr( buf, "FILE \"" ))) {
+
+			// StrNameSong contiendra le nom du fichier delimite par les signes "
+			Ptr = strchr( buf, '"' );
+			Ptr ++;
+			StrNameSong = C_strdup( Ptr );
+			if( NULL == ( Ptr = strrchr( StrNameSong, '"' ))) {
+				fclose( fp );
+				free( StrNameSong );
+				StrNameSong = NULL;
+				return( FALSE );
+			}
+			*Ptr = '\0';
+
+			// Path contiendra le chemin
+			Path = C_strdup( p_path_name_file_cue );
+			if( NULL != ( Ptr = strrchr( Path, '/' ))) {
+				*Ptr = '\0';
+			}
+
+			// PathNameSong contiendra: chemin + nom du fichier musical
+			PathNameSong = C_strdup_printf( "%s/%s", Path, StrNameSong );
+			free( Path );
+			Path = NULL;
+			free( StrNameSong );
+			StrNameSong = NULL;
+			break;
+		}
+	}
+	fclose( fp );
+
+	if( FALSE == C_file_test( PathNameSong )) {
+		printf("[ %s ] n'existe pas dans le dossier contenant [ %s ] ! \n", PathNameSong, p_path_name_file_cue );
+		free( PathNameSong );
+		PathNameSong = NULL;
+		return( FALSE );
+	}
+
+	tagswav_read_file( PathNameSong, &WaveHeader );
+	TimeSongSec = WaveHeader.DATA.Subchunk2Size / WaveHeader.FMT.ByteRate;
+	tagswav_close_file( &WaveHeader );
+
+	*p_path_name_file_wav = PathNameSong;
+
+	// LECTURE DES INFOS DU FICHIER
+	//
+	if( NULL != ( fp = fopen( p_path_name_file_cue, "r" )) ) {
+
+		int		num_track = -1;
+		int		index_begin = -1;
+		int		index_end = -1;
+		char	title[ 100 ];
+		TRACK	*Track = NULL;
+
+		while( NULL != ( fgets( buf, MAX_CARS_SPLIT_CUE_FILE, fp ))) {
+
+			if( NULL != ( Ptr = strrchr( buf, '\n' ))) *Ptr = '\0';
+
+			// TRACK
+			if( NULL != ( Ptr = strstr( buf, "TRACK " ))) {
+				num_track = atoi( Ptr +6 );
+			}
+
+			// TITRE
+			else if( strstr( buf, "TITLE " )) {
+				if( num_track > -1 ) {
+					if( NULL != ( Ptr = strchr( buf, '"' ))) {
+						Ptr ++;
+						strcpy( title, Ptr );
+						if( NULL != ( Ptr = strrchr( title, '"' ))) {
+							*Ptr = '\0';
+						}
+					}
+				}
+			}
+
+			// INDEX DE DEBUT
+			else if( strstr( buf, "INDEX 01" )) {
+				if( num_track > 1 ) {
+					if( index_end == -1 )
+						index_end = (int)cue_get_time_in_sec( buf );
+
+					Track->end = index_end;
+					Track->length = Track->end - Track->begin;
+				}
+
+				Track = (TRACK *)malloc( sizeof(TRACK) );
+				Track->num_track = num_track;
+				strcpy( Track->title, title );
+				Track->begin = index_begin;
+				Track->end = index_end;
+				Track->length = Track->end - Track->begin;
+				ListTrack = C_list_append( ListTrack, Track );
+
+				index_begin = index_end = -1;
+ 				index_begin = (int)cue_get_time_in_sec( buf );
+
+				Track->begin = index_begin;
+			}
+
+			// INDEX DE FIN
+			else if( index_begin != -1 && strstr( buf, "INDEX 00" )) {
+				index_end = (int)cue_get_time_in_sec( buf );
+			}
+		}
+		fclose( fp );
+
+		if( index_end == -1 ) {
+			Track->end = TimeSongSec;
+		}
+	}
+	return( TRUE );
+}
+
+//
+//
+void cue_set( OP_CUE p_op_cue )
+{
+	CList	*list = NULL;
+	CList	*list_b = NULL;
+	INFO	*Info = NULL;
+	char	*OutputDir = NULL;
+	char	*path_name_file_wav = NULL;
+
+	if( NULL != ( list = C_list_first( Detail.ListFile ))) {
+
+		while( list ) {
+			if( NULL != (Info = (INFO *)list->data) ) {
+
+				OutputDir = utils_get_dir_dest( Info );
+
+				if( p_op_cue == OP_CUE_INFO ) {
+					if( FILE_IS_WAV == Info->type_infosong_file_is ) {
+						if( TRUE == cue_read_wav_file( Info->path_name_file ))
+							cue_put_infos_wav_file( Info->path_name_file );
+					}
+					else if( FILE_IS_CUE == Info->type_infosong_file_is ) {
+						if( TRUE == cue_read_cue_file( Info->path_name_file, &path_name_file_wav ))
+							cue_put_infos_wav_file( Info->path_name_file );
+					}
+				}
+				else if( p_op_cue == OP_CUE_EXTRACT ) {
+					if( FILE_IS_WAV == Info->type_infosong_file_is ) {
+						if( TRUE == cue_read_wav_file( Info->path_name_file ))
+							cue_extract_wav_file( OutputDir, Info->path_name_file );
+					}
+					else if( FILE_IS_CUE == Info->type_infosong_file_is ) {
+						if( TRUE == cue_read_cue_file( Info->path_name_file, &path_name_file_wav ))
+							cue_extract_wav_file( OutputDir, path_name_file_wav );
+					}
+				}
+
+				if( NULL != OutputDir ) {
+					free( OutputDir );
+					OutputDir = NULL;
+				}
+			}
+
+			// Clear list: ListTrack
+			if( NULL != (list_b = C_list_first( ListTrack ))) {
+				while( list_b ) {
+					free( list_b->data );
+					list_b->data = NULL;
+					list_b = C_list_next( list_b );
+				}
+				list_b = ListTrack = C_list_free( ListTrack );
+			}
+
+			list = C_list_next( list );
+		}
+	}
+}
+
+
+
+
+
+

xcfa-5.0.2.tar.gz/src_cli/file_conv.c Added

@@ -0,0 +1,712 @@
+/*
+ * file : src/file_conv.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "global.h"
+#include "conv.h"
+#include "tags.h"
+
+
+
+//
+// Change quantification with SOX program
+//
+C_BOOL fileconv_change_quantification_with_sox(
+						C_BOOL pbool_copy_dest_to_src,
+						char *p_src,
+						char *p_dest,
+						int p_Hertz,
+						int p_Channels,
+						int p_Bits
+						)
+{
+	char	StrHertz[ 10 ];
+	char	StrChannels[ 10 ];
+	char	StrBits[ 10 ];
+	char	**PtrTabArgs = NULL;
+
+	sprintf( &StrHertz[0], "%d", (int)p_Hertz );
+	sprintf( &StrChannels[0], "%d", (int)p_Channels );
+	sprintf( &StrBits[0], "%d", (int)p_Bits );
+
+	PtrTabArgs = conv_with_sox_get_param( p_src, p_dest, StrHertz, StrChannels, StrBits );
+	conv_to_convert( PtrTabArgs, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
+	PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+	if( TRUE == pbool_copy_dest_to_src )
+		conv_copy_src_to_dest( p_dest, p_src );
+
+	return( C_file_test( p_src ));
+}
+
+
+//
+// Conversion and | or split
+//
+// FROM:
+//		FLAC | APE | WAVPACK | OGG | M4A | MPC | MP3 | WMA | SHORTEN | RM | DTS | AIF | AC3
+// TO:
+//		WAV
+// TO:
+//		FLAC | APE | WAVPACK | OGG | M4A | AAC | MPC | MP3
+//
+void file_conv( void )
+{
+	CList	*list = NULL;
+	INFO	*Info = NULL;
+	int		Channels;
+	int		Hertz;
+	int		Bits;
+	int		NewBits;
+	int		pos;
+	char	**PtrTabArgs = NULL;
+	char	*OutputDir = NULL;
+	char	*basename = NULL;
+	char	*Ptr = NULL;
+	int	i;
+	TAGS	*info_tags = NULL;
+
+	if( NULL != ( list = C_list_first( Detail.ListFile ))) {
+
+		// TEMPORARY FOLDER CONVERSION
+		conv.TmpRep = utils_create_rep( "/tmp/xcfa_cli_conv/" );
+
+		while( list ) {
+			if( NULL != (Info = (INFO *)list->data) ) {
+
+				OutputDir = utils_get_dir_dest( Info );
+
+				// MAKE DIRECTORY DESTINATION IF NOT EXIST
+				if( FALSE == C_dir_test( OutputDir ))
+					C_mkdir_with_parents( OutputDir );
+
+				Info->tmp_wav = C_strdup_printf( "%s/TmpRep.wav", conv.TmpRep );
+				Info->tmp_sox = C_strdup_printf( "%s/TmpRep.sox.wav", conv.TmpRep );
+
+				basename = C_path_get_basename( Info->path_name_file );
+				if( NULL != (Ptr = strchr( basename, '.' ))) *Ptr = '\0';
+
+				// ------------------------------------------------------------------------
+				//
+				// FROM:
+				//		FLAC | APE | WAVPACK | OGG | M4A | FILE_IS_VID_M4A | MPC | MP3 | WMA | SHORTEN | RM | DTS | AIF | AC3
+				// TO:
+				//		WAV
+				//
+				// ------------------------------------------------------------------------
+
+				switch( Info->type_infosong_file_is ) {
+
+				case FILE_IS_WAV :
+					{
+					INFO_WAV	*info_wav = (INFO_WAV *)Info->info;
+					info_tags = info_wav->tags;
+
+					if( TRUE == info_wav->BoolBwf ) {
+						PtrTabArgs = conv_with_sox_float_get_param(
+								Info->path_name_file,
+								Info->tmp_wav
+								);
+						conv_to_convert( PtrTabArgs, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV" );
+						PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+					}
+					else {
+						conv_copy_src_to_dest( Info->path_name_file, Info->tmp_wav );
+					}
+					}
+					break;
+
+				case FILE_IS_FLAC :
+					{
+					INFO_FLAC	*info_flac = (INFO_FLAC *)Info->info;
+					info_tags = info_flac->tags;
+
+					PtrTabArgs = conv_get_command_line(
+						FLAC_FLAC_TO_WAV,
+						Info->path_name_file,
+						Info->tmp_wav,
+						NULL,
+						Detail.Op_flac
+						);
+					conv_to_convert( PtrTabArgs, FLAC_FLAC_TO_WAV, "FLAC_FLAC_TO_WAV");
+					PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+					}
+					break;
+
+				case FILE_IS_APE :
+					{
+					INFO_APE	*info_ape = (INFO_APE *)Info->info;
+					info_tags = info_ape->tags;
+
+					PtrTabArgs = conv_get_command_line(
+						MAC_APE_TO_WAV,
+						Info->path_name_file,
+						Info->tmp_wav,
+						NULL,
+						Detail.Op_ape
+						);
+					conv_to_convert( PtrTabArgs, MAC_APE_TO_WAV, "MAC_APE_TO_WAV");
+					PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+					}
+					break;
+
+				case FILE_IS_WAVPACK :
+					{
+					INFO_WAVPACK	*info_wavpack = (INFO_WAVPACK *)Info->info;
+					info_tags = info_wavpack->tags;
+
+					PtrTabArgs = conv_get_command_line(
+						WVUNPACK_WAVPACK_TO_WAV,
+						Info->path_name_file,
+						Info->tmp_wav,
+						NULL,
+						Detail.Op_wavpack
+						);
+					conv_to_convert( PtrTabArgs, WVUNPACK_WAVPACK_TO_WAV, "WVUNPACK_WAVPACK_TO_WAV");
+					PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+					}
+					break;
+
+				case FILE_IS_MP3 :
+				case FILE_IS_OGG :
+					{
+					if( FILE_IS_MP3 == Info->type_infosong_file_is ) {
+						INFO_MP3	*info_mp3 = (INFO_MP3 *)Info->info;
+						info_tags = info_mp3->tags;
+					}
+					else if( FILE_IS_OGG == Info->type_infosong_file_is ) {
+						INFO_OGG	*info_ogg = (INFO_OGG *)Info->info;
+						info_tags = info_ogg->tags;
+					}
+
+					PtrTabArgs = conv_AllocTabArgs( &pos );
+					PtrTabArgs[ pos++ ] = C_strdup ("mplayer");
+					PtrTabArgs[ pos++ ] = C_strdup ("-nojoystick");
+					PtrTabArgs[ pos++ ] = C_strdup ("-nolirc");
+					PtrTabArgs[ pos++ ] = C_strdup ("-ao");
+					PtrTabArgs[ pos++ ] = C_strdup ("pcm");
+					PtrTabArgs[ pos++ ] = C_strdup( Info->path_name_file );
+					PtrTabArgs[ pos++ ] = C_strdup ("-ao");
+					PtrTabArgs[ pos++ ] = C_strdup_printf ("pcm:file=%s", Info->tmp_wav );
+					PtrTabArgs[ pos ] = NULL;
+					if( FILE_IS_OGG == Info->type_infosong_file_is ) {
+						conv_to_convert( PtrTabArgs, MPLAYER_OGG_TO_WAV, "MPLAYER_OGG_TO_WAV");
+						PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+					}
+					else {
+						conv_to_convert( PtrTabArgs, MPLAYER_MP3_TO_WAV, "MPLAYER_MP3_TO_WAV");
+						PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+
+						// Mon, 06 Jan 2014 08:33:58 +0100
+						// Isaak Babaev
+						// Must be 16 bits
+						Channels = 0;
+						Hertz = 0;
+						Bits = 0;
+						tagswav_file_GetBitrate( Info->tmp_wav, &Channels, &Hertz, &Bits );
+						if( Bits != 16 ) {
+							Bits = 16;
+							fileconv_change_quantification_with_sox( TRUE, Info->tmp_wav, Info->tmp_sox, Hertz, Channels, Bits );
+						}
+					}
+					}
+					break;
+
+				case FILE_IS_MPC :
+					{
+					INFO_MPC	*info_mpc = (INFO_MPC *)Info->info;
+					info_tags = info_mpc->tags;
+
+					PtrTabArgs = conv_AllocTabArgs( &pos );
+					PtrTabArgs [ pos++ ] = C_strdup ("mplayer");
+					PtrTabArgs [ pos++ ] = C_strdup ("-nojoystick");
+					PtrTabArgs [ pos++ ] = C_strdup ("-nolirc");
+					PtrTabArgs [ pos++ ] = C_strdup( Info->path_name_file );
+					PtrTabArgs [ pos++ ] = C_strdup ("-ao");
+					PtrTabArgs [ pos++ ] = C_strdup ("pcm");
+					PtrTabArgs [ pos++ ] = C_strdup ("-ao");
+					PtrTabArgs [ pos++ ] = C_strdup_printf ("pcm:file=%s", Info->tmp_wav );
+					PtrTabArgs [ pos++ ] = C_strdup ("-af");
+					PtrTabArgs [ pos++ ] = C_strdup ("channels=2");
+					PtrTabArgs [ pos++ ] = C_strdup ("-srate");
+					PtrTabArgs [ pos++ ] = C_strdup ("44100");
+					PtrTabArgs [ pos++ ] = NULL;
+					conv_to_convert( PtrTabArgs, MPLAYER_MPC_TO_WAV, "MPLAYER_MPC_TO_WAV");
+					PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+					}
+					break;
+
+				case FILE_IS_AC3 :
+					{
+					INFO_AC3	*info_ac3 = (INFO_AC3 *)Info->info;
+					info_tags = info_ac3->tags;
+
+					PtrTabArgs = conv_AllocTabArgs( &pos );
+					PtrTabArgs [ pos++ ] = C_strdup ("a52dec");
+					PtrTabArgs [ pos++ ] = C_strdup( Info->path_name_file );
+					PtrTabArgs [ pos++ ] = C_strdup ("-o");
+					PtrTabArgs [ pos++ ] = C_strdup ("wav");
+					PtrTabArgs [ pos++ ] = C_strdup (">");
+					PtrTabArgs [ pos++ ] = C_strdup( Info->tmp_wav );
+					PtrTabArgs [ pos++ ] = NULL;
+					conv_to_convert( PtrTabArgs, A52DEC_AC3_TO_WAV, "A52DEC_AC3_TO_WAV" );
+					PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+
+					tagswav_file_GetBitrate( Info->tmp_wav, &Channels, &Hertz, &Bits );
+					fileconv_change_quantification_with_sox( TRUE, Info->tmp_wav, Info->tmp_sox, Hertz, Channels, Bits );
+					}
+					break;
+
+				case FILE_IS_M4A :
+				case FILE_IS_VID_M4A :
+					{
+					INFO_M4A	*info_m4a = (INFO_M4A *)Info->info;
+					info_tags = info_m4a->tags;
+
+					PtrTabArgs = conv_AllocTabArgs( &pos );
+					PtrTabArgs [ pos++ ] = C_strdup ("mplayer");
+					PtrTabArgs [ pos++ ] = C_strdup ("-nojoystick");
+					PtrTabArgs [ pos++ ] = C_strdup ("-nolirc");
+					if( FILE_IS_VID_M4A == Info->type_infosong_file_is ) {
+						PtrTabArgs [ pos++ ] = C_strdup ("-novideo");
+						PtrTabArgs [ pos++ ] = C_strdup ("-vo");
+						PtrTabArgs [ pos++ ] = C_strdup ("null");
+					}
+					PtrTabArgs [ pos++ ] = C_strdup ("-ao");
+					PtrTabArgs [ pos++ ] = C_strdup ("pcm");
+					PtrTabArgs [ pos++ ] = C_strdup( Info->path_name_file );
+					PtrTabArgs [ pos++ ] = C_strdup ("-ao");
+					PtrTabArgs [ pos++ ] = C_strdup_printf ("pcm:file=%s", Info->tmp_wav );
+					if( FILE_IS_VID_M4A == Info->type_infosong_file_is ) {
+						PtrTabArgs [ pos++ ] = C_strdup ("-srate");
+						PtrTabArgs [ pos++ ] = C_strdup ("44100");
+					}
+					PtrTabArgs [ pos++ ] = NULL;
+					conv_to_convert( PtrTabArgs, MPLAYER_M4A_TO_WAV, "MPLAYER_M4A_TO_WAV");
+					PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+					}
+					break;
+
+				case FILE_IS_WMA :
+				case FILE_IS_RM :
+				case FILE_IS_DTS :
+				case FILE_IS_AIFF :
+					if( FILE_IS_WMA == Info->type_infosong_file_is ) {
+						INFO_WMA	*info_wma = (INFO_WMA *)Info->info;
+						info_tags = info_wma->tags;
+					}
+					else if( FILE_IS_RM == Info->type_infosong_file_is ) {
+						INFO_RM	*info_rm = (INFO_RM *)Info->info;
+						info_tags = info_rm->tags;
+					}
+					else if( FILE_IS_DTS == Info->type_infosong_file_is ) {
+						INFO_DTS	*info_dts = (INFO_DTS *)Info->info;
+						info_tags = info_dts->tags;
+					}
+					else if( FILE_IS_AIFF == Info->type_infosong_file_is ) {
+						INFO_AIFF	*info_aif = (INFO_AIFF *)Info->info;
+						info_tags = info_aif->tags;
+					}
+
+					PtrTabArgs = conv_AllocTabArgs( &pos );
+					PtrTabArgs [ pos++ ] = C_strdup ("mplayer");
+					PtrTabArgs [ pos++ ] = C_strdup ("-nojoystick");
+					PtrTabArgs [ pos++ ] = C_strdup ("-nolirc");
+					PtrTabArgs [ pos++ ] = C_strdup( Info->path_name_file );
+					PtrTabArgs [ pos++ ] = C_strdup ("-ao");
+					PtrTabArgs [ pos++ ] = C_strdup ("pcm");
+					PtrTabArgs [ pos++ ] = C_strdup ("-ao");
+					PtrTabArgs [ pos++ ] = C_strdup_printf ("pcm:file=%s", Info->tmp_wav );
+					PtrTabArgs [ pos++ ] = C_strdup ("-af");
+					PtrTabArgs [ pos++ ] = C_strdup ("channels=2");
+					PtrTabArgs [ pos++ ] = C_strdup ("-srate");
+					PtrTabArgs [ pos++ ] = C_strdup ("44100");
+					PtrTabArgs [ pos++ ] = NULL;
+					conv_to_convert( PtrTabArgs, MPLAYER_WMA_TO_WAV, "MPLAYER_WMA_TO_WAV");
+					PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+					break;
+
+				case FILE_IS_SHN :
+					{
+					INFO_SHN	*info_shn = (INFO_SHN *)Info->info;
+					info_tags = info_shn->tags;
+
+					PtrTabArgs = conv_AllocTabArgs( &pos );
+					PtrTabArgs [ pos++ ] = C_strdup ("shorten");
+					PtrTabArgs [ pos++ ] = C_strdup ("-x");
+					PtrTabArgs [ pos++ ] = C_strdup ("-b");
+					PtrTabArgs [ pos++ ] = C_strdup ("256");
+					PtrTabArgs [ pos++ ] = C_strdup ("-c");
+					PtrTabArgs [ pos++ ] = C_strdup ("2");
+					PtrTabArgs [ pos++ ] = C_strdup( Info->path_name_file );
+					PtrTabArgs [ pos++ ] = C_strdup( Info->tmp_wav );
+					PtrTabArgs [ pos++ ] = NULL;
+					conv_to_convert( PtrTabArgs, SHORTEN_SHN_TO_WAV, "SHORTEN_SHN_TO_WAV");
+					}
+					break;
+
+				case FILE_IS_NONE :
+				case FILE_IS_AAC :
+				case FILE_IS_WAVPACK_MD5 :
+				case FILE_IS_CUE :
+				case NBR_FILE_TO:
+					break;
+				}
+
+				// ------------------------------------------------------------------------
+				//
+				// S P L I T
+				//		WAV to WAV
+				//
+				// ------------------------------------------------------------------------
+				if( 0 != Detail.split_length )
+					split_wav( Info->tmp_wav, Detail.split, Detail.split_length );
+
+				// ------------------------------------------------------------------------
+				//
+				// S E T T I N G WAV
+				//
+				// ------------------------------------------------------------------------
+				if( 0 != Detail.frequency || 0 != Detail.track || 0 != Detail.quantification )
+					wav_change_setting( Info->tmp_wav, Detail.frequency, Detail.track, Detail.quantification );
+
+				tagswav_file_GetBitrate( Info->tmp_wav, &Channels, &Hertz, &Bits );
+				NewBits = Bits;
+
+				// ------------------------------------------------------------------------
+				//
+				// FROM:
+				//		WAV
+				// TO:
+				//		FLAC | APE | WAVPACK | OGG | M4A | FILE_IS_VID_M4A | AAC | MPC | MP3
+				//
+				// ------------------------------------------------------------------------
+
+				Info->tmp_flac = C_strdup_printf( "%s%s.flac", OutputDir, basename );
+				Info->tmp_ape = C_strdup_printf( "%s%s.ape", OutputDir, basename );
+				Info->tmp_wavpack = C_strdup_printf( "%s%s.wv", OutputDir, basename );
+				Info->tmp_sox_24 = C_strdup_printf( "%s/TmpRep_24.sox.wav", conv.TmpRep );
+				Info->tmp_ogg = C_strdup_printf( "%s%s.ogg", OutputDir, basename );
+				Info->tmp_m4a = C_strdup_printf( "%s%s.m4a", OutputDir, basename );
+				Info->tmp_aac = C_strdup_printf( "%s%s.aac", OutputDir, basename );
+				Info->tmp_mpc = C_strdup_printf( "%s%s.mpc", OutputDir, basename );
+				Info->tmp_mp3 = C_strdup_printf( "%s%s.mp3", OutputDir, basename );
+
+				for( i = 0; i < NBR_FILE_TO; i ++ ) {
+					if( TRUE == Detail.BoolTypeDest[ i ] ) {
+						switch( i ) {
+							case FILE_IS_FLAC:
+								if( Bits == 32 )
+									fileconv_change_quantification_with_sox( FALSE, Info->tmp_wav, Info->tmp_sox, Hertz, Channels, 24 );
+								PtrTabArgs = conv_get_command_line(
+									FLAC_WAV_TO_FLAC,
+									( Bits == 32 ) ? Info->tmp_sox : Info->tmp_wav,
+									Info->tmp_flac,
+									NULL,
+									Detail.Op_flac
+									);
+								conv_to_convert( PtrTabArgs, FLAC_WAV_TO_FLAC, "FLAC_WAV_TO_FLAC");
+								PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+								break;
+
+							case FILE_IS_APE:
+								// if( Bits != 16 );
+									fileconv_change_quantification_with_sox( FALSE, Info->tmp_wav, Info->tmp_sox, Hertz, Channels, 16 );
+								PtrTabArgs = conv_get_command_line(
+									MAC_WAV_TO_APE,
+									// ( Bits != 16 ) ? Info->tmp_sox : Info->tmp_wav,
+									Info->tmp_sox,
+									Info->tmp_ape,
+									NULL,
+									Detail.Op_ape
+									);
+								conv_to_convert( PtrTabArgs, MAC_WAV_TO_APE, "MAC_WAV_TO_APE");
+								PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+								break;
+
+							case FILE_IS_WAVPACK:
+								PtrTabArgs = conv_get_command_line(
+									WAVPACK_WAV_TO_WAVPACK,
+									Info->tmp_wav,
+									Info->tmp_wavpack,
+									(Detail.BoolNoTag == TRUE) ? NULL : info_tags,
+									Detail.Op_wavpack
+									);
+								conv_to_convert( PtrTabArgs, WAVPACK_WAV_TO_WAVPACK, "WAVPACK_WAV_TO_WAVPACK");
+								PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+								break;
+
+							case FILE_IS_WAV:
+								{
+								char *dest_wav = C_strdup_printf( "%s%s.wav", OutputDir, basename );
+								conv_copy_src_to_dest( Info->tmp_wav, dest_wav );
+
+								if( TRUE == Detail.bool_normalize )
+									Info->path_is_normalize = C_strdup( dest_wav );
+
+								free( dest_wav );
+								dest_wav = NULL;
+								}
+								break;
+
+							case FILE_IS_OGG:
+								if( Bits != 24 && Bits != 16 && Bits != 8 ) {
+									if (Bits > 24)						NewBits = 24;
+									else if (Bits > 16 && Bits < 24)	NewBits = (Bits - 16) < 3 ? 24 : 16;
+									else if (Bits > 8 && Bits < 16)		NewBits = (Bits - 8) < 3 ? 16 : 8;
+									else if (Bits < 8)					NewBits = 8;
+									Bits = NewBits;
+									fileconv_change_quantification_with_sox( FALSE, Info->tmp_wav, Info->tmp_sox, Hertz, Channels, 24 );
+								}
+								if( Bits == 24 ) {
+									PtrTabArgs = conv_with_sox_float_get_param(
+												( Bits != 24 && Bits != 16 && Bits != 8 ) ? Info->tmp_sox : Info->tmp_wav,
+												Info->tmp_sox_24
+												);
+									conv_to_convert( PtrTabArgs, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
+									PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+									conv_copy_src_to_dest( Info->tmp_sox_24, Info->tmp_sox );
+								}
+
+								PtrTabArgs = conv_get_command_line(
+									OGGENC_WAV_TO_OGG,
+									( Bits != 24 && Bits != 16 && Bits != 8 ) || ( Bits == 24 ) ? Info->tmp_sox : Info->tmp_wav,
+									Info->tmp_ogg,
+									(Detail.BoolNoTag == TRUE) ? NULL : info_tags,
+									Detail.Op_ogg
+									);
+								conv_to_convert( PtrTabArgs, OGGENC_WAV_TO_OGG, "OGGENC_WAV_TO_OGG");
+								PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+
+								if( TRUE == Detail.bool_normalize )
+									Info->path_is_normalize = C_strdup( Info->tmp_ogg );
+								break;
+
+							case FILE_IS_M4A:
+								if( Bits != 64 && Bits != 32 && Bits != 24 && Bits != 16 && Bits != 8 ) {
+									if (Bits > 64)						NewBits = 64;
+									else if (Bits > 32 && Bits < 64)	NewBits = 32;
+									else if (Bits > 24 && Bits < 32)	NewBits = 24;
+									else if (Bits > 16 && Bits < 24)	NewBits = (Bits - 16) < 3 ? 24 : 16;
+									else if (Bits > 8 && Bits < 16)		NewBits = (Bits - 8) < 3 ? 16 : 8;
+									else if (Bits < 8)					NewBits = 8;
+									NewBits = Bits;
+									fileconv_change_quantification_with_sox( FALSE, Info->tmp_wav, Info->tmp_sox, Hertz, Channels, NewBits );
+								}
+								else {
+									conv_copy_src_to_dest( Info->tmp_wav, Info->tmp_sox );
+								}
+								if( Bits == 32 || Bits == 24 ) {
+									PtrTabArgs = conv_with_sox_float_get_param(
+												Info->tmp_sox,
+												Info->tmp_sox_24
+												);
+									conv_to_convert( PtrTabArgs, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
+									PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+									conv_copy_src_to_dest( Info->tmp_sox_24, Info->tmp_sox );
+								}
+								PtrTabArgs = conv_get_command_line(
+									FAAC_WAV_TO_M4A,
+									Info->tmp_sox,
+									Info->tmp_m4a,
+									(Detail.BoolNoTag == TRUE) ? NULL : info_tags,
+									Detail.Op_m4a
+									);
+								conv_to_convert( PtrTabArgs, FAAC_WAV_TO_M4A, "FAAC_WAV_TO_M4A");
+								PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+								break;
+
+							case FILE_IS_AAC:
+								if( Bits != 64 && Bits != 32 && Bits != 24 && Bits != 16 && Bits != 8 ) {
+									if (Bits > 64)						NewBits = 64;
+									else if (Bits > 32 && Bits < 64)	NewBits = 32;
+									else if (Bits > 24 && Bits < 32)	NewBits = 24;
+									else if (Bits > 16 && Bits < 24)	NewBits = (Bits - 16) < 3 ? 24 : 16;
+									else if (Bits > 8 && Bits < 16)		NewBits = (Bits - 8) < 3 ? 16 : 8;
+									else if (Bits < 8)					NewBits = 8;
+									NewBits = Bits;
+									fileconv_change_quantification_with_sox( FALSE, Info->tmp_wav, Info->tmp_sox, Hertz, Channels, NewBits );
+								}
+								else {
+									conv_copy_src_to_dest( Info->tmp_wav, Info->tmp_sox );
+								}
+								if( Bits == 24 ) {
+									PtrTabArgs = conv_with_sox_float_get_param(
+											Info->tmp_sox,
+											Info->tmp_sox_24
+											);
+									conv_to_convert( PtrTabArgs, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
+									PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+									conv_copy_src_to_dest( Info->tmp_sox_24, Info->tmp_sox);
+								}
+								if( Hertz < 44100 ) {
+									PtrTabArgs = conv_AllocTabArgs( &pos );
+									PtrTabArgs [ pos++ ] = C_strdup ("mplayer");
+									PtrTabArgs [ pos++ ] = C_strdup ("-nojoystick");
+									PtrTabArgs [ pos++ ] = C_strdup ("-nolirc");
+									PtrTabArgs [ pos++ ] = C_strdup ( Info->tmp_sox );
+									PtrTabArgs [ pos++ ] = C_strdup ("-ao");
+									PtrTabArgs [ pos++ ] = C_strdup ("pcm");
+									PtrTabArgs [ pos++ ] = C_strdup ("-ao");
+									PtrTabArgs [ pos++ ] = C_strdup_printf( "pcm:file=%s", Info->tmp_sox_24 );
+									PtrTabArgs [ pos++ ] = C_strdup ("-srate");
+									PtrTabArgs [ pos++ ] = C_strdup ("44100");
+									PtrTabArgs [ pos++ ] = NULL;
+									conv_to_convert( PtrTabArgs, MPLAYER_WAV_TO_WAV, "MPLAYER_WAV_TO_WAV");
+									PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+									conv_copy_src_to_dest( Info->tmp_sox_24, Info->tmp_sox );
+								}
+								PtrTabArgs = conv_get_command_line(
+									AACPLUSENC_WAV_TO_AAC,
+									Info->tmp_sox,
+									Info->tmp_aac,
+									NULL,
+									Detail.Op_aac
+									);
+								conv_to_convert( PtrTabArgs, AACPLUSENC_WAV_TO_AAC, "AACPLUSENC_WAV_TO_AAC");
+								PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+								break;
+
+							case FILE_IS_MPC:
+								if( Bits != 64 || Bits != 32 || Bits != 24 || Bits != 16 || Bits != 8 ) {
+									if (Bits > 64)						NewBits = 64;
+									else if (Bits > 32 && Bits < 64)	NewBits = 32;
+									else if (Bits > 24 && Bits < 32)	NewBits = 24;
+									else if (Bits > 16 && Bits < 24)	NewBits = (Bits - 16) < 3 ? 24 : 16;
+									else if (Bits > 8 && Bits < 16)		NewBits = (Bits - 8) < 3 ? 16 : 8;
+									else if (Bits < 8)					NewBits = 8;
+									NewBits = Bits = 16;
+									fileconv_change_quantification_with_sox( FALSE, Info->tmp_wav, Info->tmp_sox, Hertz, Channels, NewBits );
+								}
+								else {
+									conv_copy_src_to_dest( Info->tmp_wav, Info->tmp_sox );
+								}
+								// SET WITH FLOAT FORMAT IF Bits == 24 || 32
+								if (Bits == 32 || Bits == 24) {
+									PtrTabArgs = conv_with_sox_float_get_param(
+											Info->tmp_sox,
+											Info->tmp_sox_24
+											);
+									conv_to_convert( PtrTabArgs, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
+									PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+									conv_copy_src_to_dest( Info->tmp_sox_24, Info->tmp_sox );
+								}
+								if( Hertz < 44100 ) {
+									PtrTabArgs = conv_AllocTabArgs( &pos );
+									PtrTabArgs [ pos++ ] = C_strdup ("mplayer");
+									PtrTabArgs [ pos++ ] = C_strdup ("-nojoystick");
+									PtrTabArgs [ pos++ ] = C_strdup ("-nolirc");
+									PtrTabArgs [ pos++ ] = C_strdup (Info->tmp_sox);
+									PtrTabArgs [ pos++ ] = C_strdup ("-ao");
+									PtrTabArgs [ pos++ ] = C_strdup ("pcm");
+									PtrTabArgs [ pos++ ] = C_strdup ("-ao");
+									PtrTabArgs [ pos++ ] = C_strdup_printf ("pcm:file=%s", Info->tmp_sox_24);
+									PtrTabArgs [ pos++ ] = C_strdup ("-srate");
+									PtrTabArgs [ pos++ ] = C_strdup ("44100");
+									PtrTabArgs [ pos++ ] = NULL;
+									conv_to_convert( PtrTabArgs, MPLAYER_WAV_TO_WAV, "MPLAYER_WAV_TO_WAV");
+									PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+									conv_copy_src_to_dest( Info->tmp_sox_24, Info->tmp_sox );
+								}
+								PtrTabArgs = conv_get_command_line(
+									MPPENC_WAV_TO_MPC,
+									Info->tmp_sox,
+									Info->tmp_mpc,
+									(Detail.BoolNoTag == TRUE) ? NULL : info_tags,
+									Detail.Op_mpc
+									);
+								conv_to_convert( PtrTabArgs, MPPENC_WAV_TO_MPC, "MPPENC_WAV_TO_MPC");
+								PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+								break;
+
+							case FILE_IS_MP3:
+								if( Info->type_infosong_file_is == FILE_IS_VID_M4A ||
+									Info->type_infosong_file_is == FILE_IS_M4A ) {
+									NewBits = 16;
+									fileconv_change_quantification_with_sox( FALSE, Info->tmp_wav, Info->tmp_sox, 44100, 2, 16 );
+								}
+								else if( Hertz == 48000 || Bits == 32 ) {
+									PtrTabArgs = conv_with_sox_float_get_param(
+											Info->tmp_wav,
+											Info->tmp_sox
+											);
+									conv_to_convert( PtrTabArgs, SOX_WAV_TO_WAV, "SOX_WAV_TO_WAV");
+									PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+								} else {
+									// CORRECTION
+									// http://forum.ubuntu-fr.org/viewtopic.php?pid=3271586#p3271586
+									// joelab07
+									if (Bits < 8)				NewBits = 8;
+									if (Bits > 16 && Bits < 24)	NewBits = (Bits - 16) < 3 ? 16 : 24;
+									if (Bits > 24 && Bits < 32)	NewBits = (Bits - 24) < 3 ? 24 : 32;
+									NewBits = Bits;
+									fileconv_change_quantification_with_sox( FALSE, Info->tmp_wav, Info->tmp_sox, Hertz, Channels, NewBits );
+								}
+								PtrTabArgs = conv_get_command_line(
+									LAME_WAV_TO_MP3,
+									Info->tmp_sox,
+									Info->tmp_mp3,
+									(Detail.BoolNoTag == TRUE) ? NULL : info_tags,
+									Detail.Op_mp3
+									);
+								conv_to_convert( PtrTabArgs, LAME_WAV_TO_MP3, "LAME_WAV_TO_MP3");
+								PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+
+								if( TRUE == Detail.bool_normalize )
+									Info->path_is_normalize = C_strdup( Info->tmp_mp3 );
+								break;
+						}
+					}
+				}
+
+				if( NULL != OutputDir ) {
+					free( OutputDir );
+					OutputDir = NULL;
+				}
+			}
+			list = C_list_next( list );
+
+			if( NULL != Info->tmp_wav ) {		free( Info->tmp_wav );		Info->tmp_wav = NULL;		}
+			if( NULL != Info->tmp_sox ) {		free( Info->tmp_sox );		Info->tmp_sox = NULL;		}
+			if( NULL != Info->tmp_flac ) {		free( Info->tmp_flac );		Info->tmp_flac = NULL;		}
+			if( NULL != Info->tmp_ape ) {		free( Info->tmp_ape );		Info->tmp_ape = NULL;		}
+			if( NULL != Info->tmp_wavpack ) {	free( Info->tmp_wavpack );	Info->tmp_wavpack = NULL;	}
+			if( NULL != Info->tmp_sox_24 ) {	free( Info->tmp_sox_24 );	Info->tmp_sox_24 = NULL;	}
+			if( NULL != Info->tmp_ogg ) {		free( Info->tmp_ogg );		Info->tmp_ogg = NULL;		}
+			if( NULL != Info->tmp_m4a ) {		free( Info->tmp_m4a );		Info->tmp_m4a = NULL;		}
+			if( NULL != Info->tmp_aac ) {		free( Info->tmp_aac );		Info->tmp_aac = NULL;		}
+			if( NULL != Info->tmp_mpc ) {		free( Info->tmp_mpc );		Info->tmp_mpc = NULL;		}
+			if( NULL != Info->tmp_mp3 ) {		free( Info->tmp_mp3 );		Info->tmp_mp3 = NULL;		}
+			if( NULL != basename ) {			free( basename );			basename = NULL;			}
+			if( NULL != OutputDir ) {			free( OutputDir );			OutputDir = NULL;			}
+		}
+		conv.TmpRep = utils_remove_temporary_rep( conv.TmpRep );
+	}
+}
+
+

xcfa-5.0.2.tar.gz/src_cli/file_is.c Added

@@ -0,0 +1,676 @@
+ /*
+ * file : lib/file_is.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#ifdef ENABLE_NLS
+	#include <libintl.h>
+	#define _(String) gettext (String)
+#endif
+
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "file_is.h"
+#include "global.h"
+
+
+
+
+// FILE IS VIDM4A ?
+//
+C_BOOL FileIs_vidm4a( char *namefile )
+{
+	FILE *fp = NULL;
+	char *buf = NULL;
+	int cpt;
+	C_BOOL bool_signature = FALSE;
+
+	if( (buf = (char *)malloc (sizeof(char) * 2048)) == NULL ) return (FALSE);
+	if( (fp = fopen (namefile, "rb")) != NULL ) {
+		fread( buf, 1, 2000, fp );
+		fclose (fp);
+	}
+
+	for (cpt = 0; cpt < 2000; cpt ++ ) {
+		if( buf [ cpt + 0 ] == 0x6D &&		// m
+		 buf [ cpt + 1 ] == 0x6F &&		// o
+		 buf [ cpt + 2 ] == 0x6F &&		// o
+		 buf [ cpt + 3 ] == 0x76 &&		// v
+		 buf [ cpt + 4 ] == 0x00 &&		// \0
+		 buf [ cpt + 5 ] == 0x00 &&		// \0
+		 buf [ cpt + 6 ] == 0x00 &&		// \0
+		 buf [ cpt + 7 ] == 0x6C &&		// l
+		 buf [ cpt + 8 ] == 0x6D &&		// m
+		 buf [ cpt + 9 ] == 0x76 &&		// v
+		 buf [ cpt + 10 ] == 0x68 &&		// h
+		 buf [ cpt + 11 ] == 0x64 ) {	// d
+
+		 bool_signature = TRUE;
+		 break;
+		}
+	}
+	free( buf );
+	buf = NULL;
+
+	return( bool_signature );
+}
+// FILE IS M4A ?
+//
+C_BOOL FileIs_m4a( char *namefile )
+{
+	FILE	*fp = NULL;
+	char	*buf = NULL;
+	int		cpt;
+	C_BOOL	bool_signature = FALSE;
+
+	if( (buf = (char *)malloc (sizeof(char) * 2048)) == NULL ) return (FALSE);
+	if( (fp = fopen (namefile, "rb")) != NULL ) {
+		fread( buf, 1, 2000, fp );
+		fclose (fp);
+	}
+
+	for (cpt = 0; cpt < 2000; cpt ++ ) {
+		if( buf [ cpt + 0 ] == 'l' &&
+		 buf [ cpt + 1 ] == 'i' &&
+		 buf [ cpt + 2 ] == 'b' &&
+		 buf [ cpt + 3 ] == 'f' &&
+		 buf [ cpt + 4 ] == 'a' &&
+		 buf [ cpt + 5 ] == 'a' &&
+		 buf [ cpt + 6 ] == 'c' ){
+		 bool_signature = TRUE;
+		 break;
+		}
+	}
+	free( buf );
+	buf = NULL;
+
+	return( bool_signature );
+}
+// FILE IS WAV ?
+//
+C_BOOL FileIs_wavpack (char *namefile)
+{
+	FILE *fp = NULL;
+	char str [ 42 ] = {'\0','\0','\0','\0','\0','\0','\0','\0'};
+
+	if ((fp = fopen (namefile, "rb")) != NULL) {
+		fread (&str[0], 1, 40, fp);
+		fclose (fp);
+	}
+
+	if (str [0] == 'w' &&
+	 str [1] == 'v' &&
+	 str [2] == 'p' &&
+	 str [3] == 'k' &&
+
+	 str [34] == 'R' &&
+	 str [35] == 'I' &&
+	 str [36] == 'F' &&
+	 str [37] == 'F') return (TRUE);
+
+	return (FALSE);
+}
+// FILE IS_CUE ?
+//
+C_BOOL	FileIs_cue( char *namefile )
+{
+	FILE	*fp = NULL;
+	char	*buf = NULL;
+	C_BOOL	bool_signature = FALSE;
+
+	if( (buf = (char *)malloc (sizeof(char) * 2048)) == NULL ) return (FALSE);
+	if( (fp = fopen (namefile, "rb")) != NULL ) {
+		fread( buf, 1, 2000, fp );
+		fclose (fp);
+		if( strstr( buf, "PERFORMER" ) &&
+			strstr( buf, "TITLE" ) &&
+			strstr( buf, "FILE" ) &&
+			strstr( buf, "TRACK" ) &&
+			strstr( buf, "INDEX" ) )
+			bool_signature = TRUE;
+	}
+	free( buf );
+	buf = NULL;
+
+	return( bool_signature );
+}
+// FILE IS WAV ?
+//
+typedef struct {		// entete fichier WAV */
+
+	char	tag1[ 5 ];	// ( 4 octets) : Constante "RIFF"
+	int		size1;		// ( 4 octets) : Taille du fichier
+	char	tag2 [ 15 ];// (14 octets) : Constante "WAVEfmt "
+	int		mode;		// ( 2 octets) : Mode (1 pour mono ou 2 pour stereo)
+	int		freq;		// ( 4 octets) : Frequence d'échantillonage (en Hertz)
+	int		bytepersec;	// ( 4 octets) : Nombre de bits par seconde de musique
+	int		nbrbyte;	// ( 2 octets) : Nombre d'octets par échantillon
+	int		format;		// ( 2 octets) : Nombre de bits par donnée
+	int		tag3;		// ( 4 octets) : Constante "data"
+	int		size2;		// ( 4 octets) : Taille du fichier moins 116 octets
+
+} HEADER_WAV;
+//
+//
+C_BOOL FileIs_wav (char *namefile)
+{
+	FILE *fp = NULL;
+	HEADER_WAV buf;
+
+	if ((fp = fopen (namefile, "r")) == NULL) return (FALSE);
+	fread(&buf.tag1, 1, 4, fp);
+	buf.tag1 [ 4 ] = '\0';
+	fread(&buf.tag2, 1, 4, fp);
+	fread(&buf.tag2, 1, 14, fp);
+	fclose (fp);
+	if ((buf.tag1 [ 0 ] == 'R' &&
+	 buf.tag1 [ 1 ] == 'I' &&
+	 buf.tag1 [ 2 ] == 'F' &&
+	 buf.tag1 [ 3 ] == 'F') &&
+
+	 (buf.tag2 [ 0 ] == 'W' &&
+	 buf.tag2 [ 1 ] == 'A' &&
+	 buf.tag2 [ 2 ] == 'V' &&
+	 buf.tag2 [ 3 ] == 'E')) return (TRUE);
+
+	return (FALSE);
+}
+// FILE IS SHN ?
+//
+C_BOOL FileIs_shn (char *namefile)
+{
+	FILE *fp = NULL;
+	char str [ 8 ] = {'\0','\0','\0','\0','\0','\0','\0','\0'};
+
+	if ((fp = fopen (namefile, "rb")) != NULL) {
+		fread (&str[0], 1, 4, fp);
+		fclose (fp);
+	}
+	if (str [0] == 'a' && str [1] == 'j' && str [2] == 'k' && str [3] == 'g') return (TRUE);
+
+	return (FALSE);
+}
+// FILE IS RM ?
+//
+/*
+$ file *.rm
+	audio01.rm: RealMedia file
+	audio02.rm: RealMedia file
+
+	en tête fichier RM
+	--- DEC --- --- HEX ---
+	[ 00 01 02 03 ] 2e 52 4d 46 = .RMF
+	[ 18 19 20 21 ] 50 52 4f 50 = PROP
+*/
+C_BOOL FileIs_rm (char *namefile)
+{
+	FILE *fp = NULL;
+	char *buf = NULL;
+	C_BOOL bool_signature = FALSE;
+
+	buf = (char *)malloc (sizeof(char) * 512);
+	if ((fp = fopen (namefile, "rb")) != NULL) {
+		fread (buf, 1, 500, fp);
+		fclose (fp);
+
+		if (buf [ 0 ] == 0x2e &&	// .
+		 buf [ 1 ] == 0x52 &&	// R
+		 buf [ 2 ] == 0x4d &&	// M
+		 buf [ 3 ] == 0x46 &&	// F
+
+		 buf [ 18 ] == 0x50 &&	// P
+		 buf [ 19 ] == 0x52 &&	// R
+		 buf [ 20 ] == 0x4f &&	// O
+		 buf [ 21 ] == 0x50)	{	// P
+
+			bool_signature = TRUE;
+		}
+	}
+	free (buf);
+	buf = NULL;
+
+	return (bool_signature);
+}
+// FILE IS OGG ?
+//
+C_BOOL FileIs_ogg (char *namefile)
+{
+	FILE	*fp = NULL;
+	char	*buf = NULL;
+	int		cpt;
+	C_BOOL	bool_signature = FALSE;
+
+	if ((buf = (char *)malloc (sizeof(char) * 2048)) == NULL) return (FALSE);
+	if ((fp = fopen (namefile, "rb")) != NULL) {
+		fread (buf, 1, 2000, fp);
+		fclose (fp);
+	}
+
+	for (cpt = 0; cpt < 2000; cpt ++) {
+		if (buf [ cpt + 0 ] == 'O' &&
+		 buf [ cpt + 1 ] == 'g' &&
+		 buf [ cpt + 2 ] == 'g' &&
+		 buf [ cpt + 3 ] == 'S') {
+		 bool_signature = TRUE;
+		 break;
+		}
+	}
+
+	if (bool_signature == TRUE) {
+		bool_signature = FALSE;
+		for (cpt = 0; cpt < 2000; cpt ++) {
+			if (buf [ cpt + 3 ] == 'v' &&
+			 buf [ cpt + 4 ] == 'o' &&
+			 buf [ cpt + 5 ] == 'r' &&
+			 buf [ cpt + 6 ] == 'b' &&
+			 buf [ cpt + 7 ] == 'i' &&
+			 buf [ cpt + 8 ] == 's'){
+			 bool_signature = TRUE;
+			 break;
+			}
+		}
+	}
+
+	free (buf);
+	buf = NULL;
+
+	return (bool_signature);
+}
+// FILE IS MPC ?
+//
+C_BOOL FileIs_mpc (char *namefile)
+{
+	FILE	*fp = NULL;
+	char	*buf = NULL;
+	int		cpt;
+	C_BOOL	bool_signature = FALSE;
+
+	buf = (char *)malloc (sizeof(char) * 1034);
+	if((fp = fopen (namefile, "rb")) != NULL) {
+		fread (buf, 1, 1024, fp);
+		fclose (fp);
+	}
+	//
+	// MPCKSH
+	//
+	for (cpt = 0; cpt < 1024; cpt ++) {
+		if (
+		 buf [ cpt + 0 ] == 0x4d &&	// M
+		 buf [ cpt + 1 ] == 0x50 &&	// P
+		 buf [ cpt + 2 ] == 0x2b		// +
+		 ) {
+		 bool_signature = TRUE;
+		 break;
+		}
+	}
+	if (FALSE == bool_signature) {
+		for (cpt = 0; cpt < 1024; cpt ++) {
+			if (
+			 buf [ cpt + 0 ] == 0x4d &&	// M
+			 buf [ cpt + 1 ] == 0x50 &&	// P
+			 buf [ cpt + 2 ] == 0x43 &&	// C
+			 buf [ cpt + 3 ] == 0x4b &&	// K
+			 buf [ cpt + 4 ] == 0x53 &&	// S
+			 buf [ cpt + 5 ] == 0x48		// H
+			 ) {
+			 bool_signature = TRUE;
+			 break;
+			}
+		}
+	}
+
+	free (buf);
+	buf = NULL;
+
+	return (bool_signature);
+}
+// FILE IS AC3 ?
+//
+C_BOOL FileIs_ac3 (char *namefile)
+{
+	FILE	*fp = NULL;
+	char	*buf = NULL;
+	C_BOOL	BoolSignature = FALSE;
+
+	buf = (char *)malloc (sizeof(char) * 100);
+	if((fp = fopen (namefile, "rb")) != NULL) {
+		fread (buf, 1, 50, fp);
+		fclose (fp);
+	}
+
+	if (buf[0] == 0x0b && buf[1] == 0x77) {
+		BoolSignature = TRUE;
+	}
+
+	free (buf);
+	buf = NULL;
+
+	return (BoolSignature);
+}
+// FILE IS MP3 ?
+//
+typedef struct {
+	char			magic[ 3 ];
+	char			songname[ 30 ];
+	char			artist[ 30 ];
+	char			album[ 30 ];
+	char			year[ 4 ];
+	char			note[ 28 ];
+	unsigned char	nnull;
+	unsigned char	track;
+	unsigned char	style;
+} ID3TAG;
+C_BOOL FileIs_mp3 (char *namefile)
+{
+	FILE	*fp = NULL;
+	char	*buf = NULL;
+	ID3TAG	begin;
+	ID3TAG	end;
+	C_BOOL	bool_signature = FALSE;
+	int i;
+	size_t	size;
+
+	fp = fopen (namefile, "rb");
+	if (NULL == fp) return (FALSE);
+
+	fread ( &begin, 128, 1, fp );
+	fseek ( fp, 0, SEEK_END );
+	fseek ( fp, ftell( fp ) - 128, SEEK_SET );
+	fread ( &end, 128, 1, fp );
+	fclose (fp);
+
+	// TEST SI FICHIER EST: AC3
+	// OCTET 0	OCTET 1
+	// 76543210	76543210
+	// 00001011	01110111
+	// 0b		77
+	// 11		119
+	if (begin.magic[0] == 0x0b && begin.magic[1] == 0x77) {
+		return (FALSE);
+	}
+
+	if (begin.magic[0] == 'I' && begin.magic[1] == 'D' && begin.magic[2] == '3') return (TRUE);
+	if (end.magic[0] == 'T' && end.magic[1] == 'A' && end.magic[2] == 'G') return (TRUE);
+
+	size = utils_get_size_file (namefile);
+	buf = malloc (sizeof (char) * (size + 10));
+	if ((fp = fopen (namefile, "rb"))) {
+		fread (buf, 1, size, fp);
+		fclose (fp);
+		for (i = 0; i < size; i ++) {
+			if (buf[i+0] == 'L' && buf[i+1] == 'A' && buf[i+2] == 'M' && buf[i+3] == 'E') {
+				bool_signature = TRUE;
+				break;
+			}
+		}
+	}
+
+	//
+	// http://mgc99.free.fr/InfoMP3.html
+	//
+	//
+	// La partie "audio" du MP3 commence par un entête de 4 octets. Ces 4 octets donnent des informations sur le type de MP3.
+	// Cet entête se trouve après les tag ID3 v2 s'il y en a. Il n'a pas de position précise dans le fichier, il faut le chercher.
+	// Il commence toujours par une série de 11 bits à 1 (FF Ex xx xx ou FF Fx xx xx).
+	// 1111 1111 - 111B BCCD - EEEE FFGH - IIJJ KLMM
+	// BB	version de MPEG (11-v1, 10-v2, 01-reserved, 00-v2.5)
+	// CC	numéro de layer (11-layer 1, 10-layer 2, 01-layer 3, 00-reserved)
+	// D	protection bit (0 protection par CRC, 2 octets suive l'entête. 1 pas de protection)
+	// EEEE bitrate index.
+	// FF	sampling rate frequency index.
+	// G	padding bit.
+	// H	private bit.
+	// II	chanel mode (11-single channel, 10-dual channel, 01-joint stéréo, 00-stéréo)
+	// JJ	mode extention seulement si "joint stéréo"
+	// K	copyright (1 copyright, 0 pas de copyright).
+	// L	original (1 original, 0 copie)
+	// MM	emphasis (11-CCIT J.17, 10-reserved, 01-50/15ms, 00-none)
+	//
+	/*
+	if (FALSE == bool_signature) {
+		for (i = 0; i < size; i ++) {
+			Dummy = buf[i+0] + buf[i+1];
+			Dummy &= 0x011111111111;
+			if (0x011111111111 == Dummy) {
+				bool_signature = TRUE;
+				printf("ICI EST MP3\n");
+				printf("\tsize = %lu\n", size );
+				printf("\ti = %d\n", i );
+				break;
+			}
+		}
+	}
+	*/
+	free (buf);
+	buf = NULL;
+
+	return (bool_signature);
+}
+// FILE IS FLAC ?
+//
+C_BOOL FileIs_flac (char *namefile)
+{
+	FILE	*fp = NULL;
+	char	*buf = NULL;
+	int		cpt;
+	C_BOOL	bool_signature = FALSE;
+
+	buf = (char *)malloc (sizeof(char) * 5124);
+	if ((fp = fopen (namefile, "rb")) != NULL) {
+		fread (buf, 1, 5120, fp);
+		fclose (fp);
+	}
+
+	for (cpt = 0; cpt < 5120; cpt ++) {
+		if (buf [ cpt + 0 ] == 0x66 &&	/* 'f' */
+		 buf [ cpt + 1 ] == 0x4c &&	/* 'L' */
+		 buf [ cpt + 2 ] == 0x61 &&	/* 'a' */
+		 buf [ cpt + 3 ] == 0x43) {	/* 'C' */
+		 bool_signature = TRUE;
+		 break;
+		}
+	}
+	free (buf);
+	buf = NULL;
+
+	return (bool_signature);
+}
+/*****************************************************************************************
+APE header that all APE files have in common (old and new)
+*****************************************************************************************
+struct APE_COMMON_HEADER
+{
+ char cID[4]; should equal 'MAC '
+ uint16 nVersion; version number * 1000 (3.81 = 3810)
+};
+
+*****************************************************************************************
+APE header structure for old APE files (3.97 and earlier)
+*****************************************************************************************
+struct APE_HEADER_OLD
+{
+ char cID[4]; should equal 'MAC '
+ uint16 nVersion; version number * 1000 (3.81 = 3810)
+ uint16 nCompressionLevel; the compression level
+ uint16 nFormatFlags; any format flags (for future use)
+ uint16 nChannels; the number of channels (1 or 2)
+ uint32 nSampleRate; the sample rate (typically 44100)
+ uint32 nHeaderBytes; the bytes after the MAC header that compose the WAV header
+ uint32 nTerminatingBytes; the bytes after that raw data (for extended info)
+ uint32 nTotalFrames; the number of frames in the file
+ uint32 nFinalFrameBlocks; the number of samples in the final frame
+};
+*****************************************************************************************/
+// FILE IS APE ?
+//
+// le prg 'file' est leurré par un tag id3 et ne reconnait qu'un mp3 !!!
+// il faut lire 05 ko de datas
+// bug signalé par @patachonf depuis:
+// 	http://forum.ubuntu-fr.org/viewtopic.php?pid=3739121#p3739121
+// [ resolu ]
+C_BOOL FileIs_ape (char *namefile)
+{
+	FILE	*fp = NULL;
+	char	*buf = NULL;
+	int		cpt;
+	C_BOOL	bool_signature = FALSE;
+
+	buf = (char *)malloc (sizeof(char) * 5120);
+	if ((fp = fopen (namefile, "rb")) != NULL) {
+		fread (buf, 1, 5000, fp);
+		fclose (fp);
+
+		for (cpt = 0; cpt < 5000; cpt ++) {
+			if (buf [ cpt + 0 ] == 0x4d &&	/* 'M' */
+			 buf [ cpt + 1 ] == 0x41 &&	/* 'A' */
+			 buf [ cpt + 2 ] == 0x43 &&	/* 'C' */
+			 buf [ cpt + 3 ] == 0x20) {	/* ' ' */
+			 bool_signature = TRUE;
+			 break;
+			}
+		}
+	}
+	free (buf);
+	buf = NULL;
+
+	return (bool_signature);
+}
+// FILE IS AIFF ?
+//
+/*
+POS	ASCII	HEXA
+00	F		46
+01	O		4f
+02	R		52
+03	M		4d
+04
+05
+06
+07
+08	A		41
+09	I		49
+10	F		46
+11	F		46
+12	C		43
+13	O		4f
+14	M		4d
+15	M		4d
+*/
+C_BOOL FileIs_aiff (char *namefile)
+{
+	FILE	*fp = NULL;
+	char	*buf = NULL;
+	C_BOOL	bool_signature = FALSE;
+
+	buf = (char *)malloc (sizeof(char) * 512);
+	if ((fp = fopen (namefile, "rb")) != NULL) {
+		fread (buf, 1, 500, fp);
+		fclose (fp);
+
+		if (buf [ 0 ] == 0x46 &&	// F
+		 buf [ 1 ] == 0x4f &&	// O
+		 buf [ 2 ] == 0x52 &&	// R
+		 buf [ 3 ] == 0x4d &&	// M
+
+		 buf [ 8 ] == 0x41 &&	// A
+		 buf [ 9 ] == 0x49 &&	// I
+		 buf [ 10 ] == 0x46 &&	// F
+		 buf [ 11 ] == 0x46 &&	// F
+		 buf [ 12 ] == 0x43 &&	// C
+		 buf [ 13 ] == 0x4f &&	// O
+		 buf [ 14 ] == 0x4d &&	// M
+		 buf [ 15 ] == 0x4d)	{	// M
+
+			bool_signature = TRUE;
+		}
+	}
+
+	free (buf);
+	buf = NULL;
+
+	return (bool_signature);
+}
+// FILE IS DTS ?
+//
+C_BOOL FileIs_dts (char *namefile)
+{
+	C_BOOL	bool_signature = FALSE;
+	char	Ext [ 8 ] = {'\0','\0','\0','\0','\0','\0','\0','\0',};
+	char	*Ptr;
+
+	Ptr = strrchr (namefile, '/');
+	if (Ptr) {
+		Ptr = strrchr (Ptr, '.');
+		if (Ptr) {
+			Ptr++;
+			if (*Ptr) Ext [0] = toupper (*Ptr++);
+			if (*Ptr) Ext [1] = toupper (*Ptr++);
+			if (*Ptr) Ext [2] = toupper (*Ptr++);
+			if (*Ptr) Ext [3] = toupper (*Ptr);
+			Ext [4] = '\0';
+
+			if (Ext[0] == 'D' && Ext[1] == 'T' && Ext[2] == 'S' && Ext[3] == '\0') bool_signature = TRUE;
+		}
+	}
+	return (bool_signature);
+}
+// FILE IS PNG ?
+//
+C_BOOL FileIs_png (char *namefile)
+{
+	FILE	*fp = NULL;
+	char	*buf = NULL;
+	int		cpt;
+	C_BOOL	bool_signature = FALSE;
+
+	buf = (char *)malloc (sizeof(char) * 5124);
+	if ((fp = fopen (namefile, "rb")) != NULL) {
+		fread (buf, 1, 5120, fp);
+		fclose (fp);
+	}
+
+	for (cpt = 0; cpt < 5120; cpt ++) {
+		if(
+			buf [ cpt + 0 ] == 0x50 &&	// 'P'
+			buf [ cpt + 1 ] == 0x4E &&	// 'N'
+			buf [ cpt + 2 ] == 0x47		// 'G'
+		 ) {
+		 bool_signature = TRUE;
+		 break;
+		}
+	}
+	free (buf);
+	buf = NULL;
+
+	return (bool_signature);
+}
+
+
+
+
+

xcfa-5.0.2.tar.gz/src_cli/file_is.h Added

@@ -0,0 +1,48 @@
+/*
+ *  file      : src/file_is.h
+ *  project   : xcfa_cli
+ *  copyright : (C) 2014 by BULIN Claude
+ *
+ *  This file is part of xcfa_cli project
+ *
+ *  xcfa_cli is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; version 3.
+ *
+ *  xcfa_cli is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ *  USA
+ */
+
+
+#ifndef file_is_h
+#define file_is_h 1
+
+#include "clib.h"
+
+// FILE_IS.C
+//
+C_BOOL	FileIs_vidm4a( char *namefile );
+C_BOOL	FileIs_m4a( char *namefile );
+C_BOOL	FileIs_wavpack( char *namefile );
+C_BOOL	FileIs_wav( char *namefile );
+C_BOOL	FileIs_cue( char *namefile );
+C_BOOL	FileIs_shn( char *namefile );
+C_BOOL	FileIs_rm( char *namefile );
+C_BOOL	FileIs_ogg( char *namefile );
+C_BOOL	FileIs_mpc( char *namefile );
+C_BOOL	FileIs_ac3( char *namefile );
+C_BOOL	FileIs_mp3( char *namefile );
+C_BOOL	FileIs_flac( char *namefile );
+C_BOOL	FileIs_ape( char *namefile );
+C_BOOL	FileIs_aiff( char *namefile );
+C_BOOL	FileIs_dts( char *namefile );
+C_BOOL	FileIs_png( char *namefile );
+
+#endif

xcfa-5.0.2.tar.gz/src_cli/get_info.c Added

@@ -0,0 +1,780 @@
+/*
+ * file : src/get_info.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#include <pthread.h>
+#include <sys/types.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <sys/utsname.h>
+
+#include "global.h"
+#include "tags.h"
+#include "get_info.h"
+#include "file_is.h"
+#include "prg_init.h"
+
+#define GET_MAX_CARS 1024
+
+typedef struct {
+	pid_t		code_fork;				// Num Code Fork
+	int			signal_numchildren;		// the signal handler
+	int			tube [ 2 ];				// for pipe
+} VAR_GET;
+
+VAR_GET VarGet;
+
+/*
+*---------------------------------------------------------------------------
+* SIGNAL
+*---------------------------------------------------------------------------
+*/
+void GetInfo_sigchld (int signum)
+{
+	int status;
+
+	wait(&status);
+ // if there are still children waiting
+ // re-install the signal handler
+	VarGet.signal_numchildren --;
+	if (VarGet.signal_numchildren > 0) {
+		// re-install the signal handler
+		signal (SIGCHLD, GetInfo_sigchld);
+	}
+}
+//
+//
+int GetInfo_exec_with_output (char **args, pid_t *p, int Streams)
+{
+	VarGet.signal_numchildren = 0;
+
+	if (pipe (VarGet.tube) != 0) {
+		fprintf (stderr, "error: pipe\n");
+		exit (1);
+	}
+	if ((*p = fork()) == 0) {
+		dup2 (VarGet.tube [ 1 ], Streams);	// STDOUT_FILENO STDERR_FILENO
+		close (VarGet.tube [ 1 ]);
+		execvp (args[0], args);
+		fprintf (stderr, "error: exec");
+		exit (2);
+	}
+	VarGet.signal_numchildren ++;
+	signal (SIGCHLD, GetInfo_sigchld);
+	close (VarGet.tube [ 1 ]);
+	return (VarGet.tube [ 0 ]);
+}
+
+
+//
+//
+CString *GetInfo_file (char *file)
+{
+	int fd;
+	int pos = 0;
+	char *args [ 10 ];
+	char buf [ GET_MAX_CARS + 10 ];
+	int size = 0;
+	CString *gstr = C_string_new();
+
+	args[pos++] = "file";
+	args[pos++] = "-b";
+	args[pos++] = "-z";
+	args[pos++] = "-n";
+	args[pos++] = file;
+	args[pos++] = NULL;
+
+	fd = GetInfo_exec_with_output (args, &VarGet.code_fork, STDOUT_FILENO);
+	do {
+		pos = -1;
+		do {
+			pos++;
+			if (pos >= GET_MAX_CARS) {
+				PRINT_FUNC_LF();
+				printf ("pos(%d) >= GET_MAX_CARS(%d)\n", pos, GET_MAX_CARS);
+				pos --;
+			}
+			size = read(fd, &buf[pos], 1);
+
+		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
+		/*
+		if (pos > 0 ) {
+			buf[pos ++ ] = '\n';
+			buf[pos] = '\0';
+			C_string_append_printf (gstr, "%s", buf);
+		}
+		*/
+		buf[pos ++ ] = '\n';
+		buf[pos] = '\0';
+		C_string_append_printf (gstr, "%s", buf);
+
+	} while (size != 0);
+
+	close(fd);
+	return (gstr);
+}
+
+
+//
+// RECONNAISSANCE ENTETE FICHIER:
+//	FILE_IS_NONE = 0,
+//	FILE_IS_FLAC,
+//	FILE_IS_WAV,
+//	FILE_IS_CUE,
+// FILE_IS_BFW,	// BROADCAST WAVE FORMAT
+//	FILE_IS_MP3,
+//	FILE_IS_OGG,
+//	/* Les fichiers au format AAC, portant l'extension
+//		.mp4( pour MPEG-4),
+//	 	.m4a( pour MPEG-4 Audio)
+//	 	.m4p( pour MPEG-4 Protégé),
+//	 sont globalement plus petits que les fichiers au format MP3. */
+//	FILE_IS_M4A,
+//	FILE_IS_VID_M4A,
+//	FILE_IS_AAC,
+//	FILE_IS_SHN,
+//	FILE_IS_WMA,
+//	FILE_IS_RM,
+//	FILE_IS_DTS,
+//	FILE_IS_AIFF,
+//	FILE_IS_MPC,
+//	FILE_IS_APE,
+//	FILE_IS_WAVPACK,
+//	FILE_IS_WAVPACK_MD5,
+//	FILE_IS_AC3,
+//
+TYPE_FILE_IS GetInfo_file_is( char *PathName )
+{
+	CString			*gstr = NULL;
+	TYPE_FILE_IS	TypeFileRet = FILE_IS_NONE;
+
+	gstr = GetInfo_file (PathName);
+	// printf( "gstr =\n%s\n", gstr->str );
+	// ABANDON SI LA COMMANDE file NE TROUVE PAS LE TYPE DE FICHIER
+	if( 0 == strcmp( gstr->str, "data" )) {
+		TypeFileRet = FILE_IS_NONE;
+		PRINT("ERROR: LA COMMANDE file NE TROUVE RIEN :/");
+	}
+	// UNE PETITE CHANCE SE PRESENTE ICI POUR AAC
+	else {
+		// FILE_IS_AAC
+		// 19 Waka Waka (This Time for Africa).m4a: ISO Media, MPEG v4 system, iTunes AAC-LC
+		// 4 Non Blondes - Whats Going On.m4a: ISO Media, MPEG v4 system, version 2
+		if( TRUE == FileIs_vidm4a( PathName )) {
+			TypeFileRet = FILE_IS_VID_M4A;
+		}
+		else if( strstr (gstr->str, "AAC" ) || strstr (gstr->str, "MPEG ADTS, AAC," )) {
+			TypeFileRet = FILE_IS_AAC;
+		}
+		// FILE_IS_WMA
+		else if (strstr (gstr->str, "Microsoft ASF")) {
+			TypeFileRet = FILE_IS_WMA;
+		}
+		// FILE_IS_VID_M4A
+		// WCC_RADIO_EP042.m4a:			ISO Media, MPEG v4 system, iTunes AAC-LC
+		//
+		// FILE_IS_M4A
+		// 21 The Academy.m4a:			ISO Media, MPEG v4 system, version 2
+		// 4 Non Blondes - Whats Going On.m4a:	ISO Media, MPEG v4 system, version 2
+		// audio.m4a:				ISO Media, MPEG v4 system, version 2
+		//
+		// FILE_IS_AAC
+		// 01_King_Porter_Stomp.aac:		MPEG ADTS, AAC, v4 LC, 22.05 kHz, stereo
+		// aif.aac:				MPEG ADTS, AAC, v4 LC, 22.05 kHz, stereo
+		// audio.aac:				MPEG ADTS, AAC, v2 LC, 48 kHz, stereo
+	}
+	if( FILE_IS_VID_M4A == TypeFileRet || FILE_IS_AAC == TypeFileRet || FILE_IS_WMA == TypeFileRet ) {
+		C_string_free( gstr );
+		gstr = NULL;
+		return( TypeFileRet );
+	}
+
+	// FILE_IS_VID_M4A
+	if( TRUE == FileIs_vidm4a( PathName )) {
+		TypeFileRet = FILE_IS_VID_M4A;
+	}
+	// FILE_IS_M4A
+	else if( TRUE == FileIs_m4a( PathName )) {
+		TypeFileRet = FILE_IS_M4A;
+	}
+	// FILE_IS_WAVPACK
+	// FILE_IS_WAVPACK_MD5
+	else if( TRUE == FileIs_wavpack( PathName )) {
+		TypeFileRet = FILE_IS_WAVPACK;
+	}
+	// FILE_IS_WAV
+	else if( TRUE == FileIs_wav( PathName )) {
+		TypeFileRet = FILE_IS_WAV;
+	}
+	// FILE_IS_CUE
+	else if( TRUE == FileIs_cue( PathName )) {
+		TypeFileRet = FILE_IS_CUE;
+	}
+	// FILE_IS_SHN
+	else if( TRUE == FileIs_shn( PathName )) {
+		TypeFileRet = FILE_IS_SHN;
+	}
+	// FILE_IS_RM
+	else if( TRUE == FileIs_rm( PathName )) {
+		TypeFileRet = FILE_IS_RM;
+	}
+	// FILE_IS_OGG
+	else if( TRUE == FileIs_ogg( PathName )) {
+		TypeFileRet = FILE_IS_OGG;
+	}
+	// FILE_IS_MPC
+	else if( TRUE == FileIs_mpc( PathName )) {
+		TypeFileRet = FILE_IS_MPC;
+	}
+	// FILE_IS_AC3
+	else if( TRUE == FileIs_ac3( PathName )) {
+		TypeFileRet = FILE_IS_AC3;
+	}
+	// FILE_IS_FLAC
+	else if( TRUE == FileIs_flac( PathName )) {
+		TypeFileRet = FILE_IS_FLAC;
+	}
+	// FILE_IS_APE
+	else if( TRUE == FileIs_ape( PathName )) {
+		TypeFileRet = FILE_IS_APE;
+	}
+	// FILE_IS_DTS
+	else if( TRUE == FileIs_dts( PathName )) {
+		TypeFileRet = FILE_IS_DTS;
+	}
+	// FILE_IS_AIFF
+	else if( TRUE == FileIs_aiff( PathName )) {
+		TypeFileRet = FILE_IS_AIFF;
+	}
+	// FILE_IS_MP3
+	else if( TRUE == FileIs_mp3( PathName )) {
+		TypeFileRet = FILE_IS_MP3;
+	}
+	// FILE_IS_MP3
+	// Without tag id3 :/
+	else if( strstr (gstr->str, "MPEG ADTS, layer III" )) {
+		TypeFileRet = FILE_IS_MP3;
+	}
+
+	C_string_free( gstr );
+	gstr = NULL;
+
+	return( TypeFileRet );
+}
+
+//
+//
+void GetInfo_set( INFO *p_Info )
+{
+	if ( p_Info->type_infosong_file_is == FILE_IS_FLAC ) p_Info->info = (INFO_FLAC *)tagsflac_get_info( p_Info );
+	else if( p_Info->type_infosong_file_is == FILE_IS_WAV ) p_Info->info = (INFO_WAV *)tagswav_get_info( p_Info );
+	else if( p_Info->type_infosong_file_is == FILE_IS_MP3 ) p_Info->info = tagsmp3_get_info( p_Info );
+	else if( p_Info->type_infosong_file_is == FILE_IS_OGG ) p_Info->info = tagsogg_get_info( p_Info );
+	else if( p_Info->type_infosong_file_is == FILE_IS_SHN ) p_Info->info = tagsshn_get_info( p_Info );
+	else if( p_Info->type_infosong_file_is == FILE_IS_WMA ) p_Info->info = tagswma_get_info( p_Info );
+	else if( p_Info->type_infosong_file_is == FILE_IS_RM ) p_Info->info = tagsrm_get_info( p_Info );
+	else if( p_Info->type_infosong_file_is == FILE_IS_DTS ) p_Info->info = tagsdts_get_info( p_Info );
+	else if( p_Info->type_infosong_file_is == FILE_IS_AIFF ) p_Info->info = tagsaiff_get_info( p_Info );
+	else if( p_Info->type_infosong_file_is == FILE_IS_M4A ) p_Info->info = tagsm4a_get_info( p_Info );
+	else if( p_Info->type_infosong_file_is == FILE_IS_VID_M4A ) p_Info->info = tagsm4a_get_info( p_Info );
+	else if( p_Info->type_infosong_file_is == FILE_IS_MPC ) p_Info->info = tagsmpc_get_info( p_Info );
+	else if( p_Info->type_infosong_file_is == FILE_IS_APE ) p_Info->info = tagsape_get_info( p_Info );
+	else if( p_Info->type_infosong_file_is == FILE_IS_WAVPACK ) p_Info->info = tagswavpack_get_info( p_Info );
+	else if( p_Info->type_infosong_file_is == FILE_IS_AC3 ) p_Info->info = tagsac3_get_info( p_Info );
+}
+
+//
+//
+void GetInfo_remove( INFO *p_Info )
+{
+	switch( p_Info->type_infosong_file_is ) {
+
+	case FILE_IS_NONE :
+	case FILE_IS_CUE :
+		break;
+	case FILE_IS_FLAC :
+		{
+		INFO_FLAC *info = (INFO_FLAC *)p_Info->info;
+		info = (INFO_FLAC *)tagsflac_remove_info( info );
+		}
+		break;
+	case FILE_IS_WAV :
+		{
+		INFO_WAV *info = (INFO_WAV *)p_Info->info;
+		info = (INFO_WAV *)tagswav_remove_info( info );
+		}
+		break;
+	case FILE_IS_MP3 :
+		{
+		INFO_MP3 *info = (INFO_MP3 *)p_Info->info;
+		info = (INFO_MP3 *)tagsmp3_remove_info( info );
+		}
+		break;
+	case FILE_IS_OGG :
+		{
+		INFO_OGG *info = (INFO_OGG *)p_Info->info;
+		info = (INFO_OGG *)tagsogg_remove_info( info );
+		}
+		break;
+	case FILE_IS_M4A :
+	case FILE_IS_VID_M4A :
+		{
+		INFO_M4A *info = (INFO_M4A *)p_Info->info;
+		info = (INFO_M4A *)tagsm4a_remove_info( info );
+		}
+		break;
+	case FILE_IS_AAC :
+		{
+		INFO_AAC *info = (INFO_AAC *)p_Info->info;
+		info = (INFO_AAC *)tagsaac_remove_info( info );
+		}
+		break;
+	case FILE_IS_SHN :
+		{
+		INFO_SHN *info = (INFO_SHN *)p_Info->info;
+		info = (INFO_SHN *)tagsshn_remove_info( info );
+		}
+		break;
+	case FILE_IS_WMA :
+		{
+		INFO_WMA *info = (INFO_WMA *)p_Info->info;
+		info = (INFO_WMA *)tagswma_remove_info( info );
+		}
+		break;
+	case FILE_IS_RM :
+		{
+		INFO_RM *info = (INFO_RM *)p_Info->info;
+		info = (INFO_RM *)tagsrm_remove_info( info );
+		}
+		break;
+	case FILE_IS_DTS :
+		{
+		INFO_DTS *info = (INFO_DTS *)p_Info->info;
+		info = (INFO_DTS *)tagsdts_remove_info( info );
+		}
+		break;
+	case FILE_IS_AIFF :
+		{
+		INFO_AIFF *info = (INFO_AIFF *)p_Info->info;
+		info = (INFO_AIFF *)tagsaiff_remove_info( info );
+		}
+		break;
+	case FILE_IS_MPC :
+		{
+		INFO_MPC *info = (INFO_MPC *)p_Info->info;
+		info = (INFO_MPC *)tagsmpc_remove_info( info );
+		}
+		break;
+	case FILE_IS_APE :
+		{
+		INFO_APE *info = (INFO_APE *)p_Info->info;
+		info = (INFO_APE *)tagsape_remove_info( info );
+		}
+		break;
+	case FILE_IS_WAVPACK :
+	case FILE_IS_WAVPACK_MD5 :
+		{
+		INFO_WAVPACK *info = (INFO_WAVPACK *)p_Info->info;
+		info = (INFO_WAVPACK *)tagswavpack_remove_info( info );
+		}
+		break;
+	case FILE_IS_AC3 :
+		{
+		INFO_AC3 *info = (INFO_AC3 *)p_Info->info;
+		info = (INFO_AC3 *)tagsac3_remove_info( info );
+		}
+		break;
+	case NBR_FILE_TO:
+		break;
+	}
+}
+
+//
+//
+CString *GetInfo_checkmp3 (char *file)
+{
+	int fd;
+	int pos = 0;
+	char *args [ 10 ];
+	char buf [ GET_MAX_CARS + 10 ];
+	int size = 0;
+	CString *gstr = NULL;
+
+
+	if( FALSE == PrgInit.bool_checkmp3 ) {
+		PRINT_FUNC_LF();
+		printf ("\tPrgInit.bool_checkmp3 = %s\n", PrgInit.bool_checkmp3 ? "TRUE" : "FALSE");
+		printf ("\tIL FAUT INSTALLER checkmp3 OU mp3check SUIVANT VOTRE DISTRIBUTION !\n\n");
+		return( NULL );
+	}
+
+	gstr = C_string_new();
+
+	// args[pos++] = PrgInit.name_checkmp3;
+	args[pos++] = prginit_get_name (NMR_checkmp3);
+	args[pos++] = "-a";
+	args[pos++] = "-v";
+
+	// TODO: @Tetsumaki
+	// http://forum.ubuntu-fr.org/viewtopic.php?pid=3889239#p3889239
+	// OPTION -i n'existe pas sous ARCHLINUX !!!
+	// args[pos++] = "-i";
+
+	args[pos++] = file;
+	args[pos++] = NULL;
+
+	/*
+	printf ("!-----------------------------------!\n");
+	printf ("! C H E C K M P 3 !\n");
+	printf ("!-----------------------------------!\n");
+	for (pos = 0; args[ pos ] != NULL; pos++)
+		printf ("args [ %02d ] = '%s'\n", pos, args [ pos ]);
+	printf ("\n");
+	*/
+
+	fd = GetInfo_exec_with_output (args, &VarGet.code_fork, STDOUT_FILENO);
+	do {
+		pos = -1;
+		do {
+			pos++;
+			if (pos >= GET_MAX_CARS) {
+				PRINT_FUNC_LF();
+				printf ("pos(%d) >= GET_MAX_CARS(%d)\n", pos, GET_MAX_CARS);
+				pos --;
+			}
+			size = read(fd, &buf[pos], 1);
+
+		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
+		if (pos > 0 ) {
+			buf[pos ++ ] = '\n';
+			buf[pos] = '\0';
+			C_string_append_printf (gstr, "%s", buf);
+		}
+	} while (size != 0);
+
+	close(fd);
+	return (gstr);
+}
+
+//
+//
+SHNTAG *GetInfo_free_shntool (SHNTAG *ShnTag)
+{
+	if (NULL != ShnTag) {
+		if (NULL != ShnTag->time)	{ free (ShnTag->time);	ShnTag->time = NULL; }
+		if (NULL != ShnTag->size)	{ free (ShnTag->size);	ShnTag->size = NULL; }
+
+		free (ShnTag);
+		ShnTag = NULL;
+	}
+	return ((SHNTAG *)NULL);
+}
+//
+//
+SHNTAG *GetInfo_shntool (char *file)
+{
+	int fd;
+	int pos = 0;
+	char *args [ 10 ];
+	char buf [ GET_MAX_CARS + 10 ];
+	int size = 0;
+	CString *gstr = C_string_new();
+	SHNTAG	*ShnTag = NULL;
+	char	*Ptr = NULL;
+
+	int	 Min;
+	int	 Sec;
+	int	 Hundr;
+
+	args[pos++] = "shntool";
+	args[pos++] = "info";
+	args[pos++] = file;
+	args[pos++] = NULL;
+	/*
+	printf ("!-----------------------------------!\n");
+	printf ("! S H N T O O L !\n");
+	printf ("!-----------------------------------!\n");
+	for (pos = 0; args[ pos ] != NULL; pos++)
+		printf ("args [ %02d ] = '%s'\n", pos, args [ pos ]);
+	printf ("\n");
+	*/
+
+	fd = GetInfo_exec_with_output (args, &VarGet.code_fork, STDOUT_FILENO);
+	do {
+		pos = -1;
+		do {
+			pos++;
+			if (pos >= GET_MAX_CARS) {
+				PRINT_FUNC_LF();
+				printf ("pos(%d) >= GET_MAX_CARS(%d)\n", pos, GET_MAX_CARS);
+				pos --;
+			}
+			size = read(fd, &buf[pos], 1);
+
+		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
+		if (pos > 0 ) {
+			buf[pos ++ ] = '\n';
+			buf[pos] = '\0';
+			C_string_append_printf (gstr, "%s", buf);
+		}
+	} while (size != 0);
+
+	close(fd);
+
+	ShnTag = malloc (sizeof (SHNTAG));
+
+	if ((Ptr = strstr (gstr->str, "Length:")) != NULL) {
+		Ptr = strchr (Ptr, ':');
+		Ptr ++;
+		while (*Ptr == ' ') Ptr ++;
+
+		Min = atoi (Ptr);
+
+		Ptr = strchr (Ptr, ':');
+		Ptr ++;
+		Sec = atoi (Ptr);
+
+		Ptr = strchr (Ptr, '.');
+		Ptr ++;
+		Hundr = atoi (Ptr);
+
+		ShnTag->SecTime = (double)(Min * 60) + (double)(Sec) + (double)(Hundr / 10.0);
+
+		ShnTag->time = C_strdup_printf ("%02d:%02d", Min, Sec);
+
+		if ((Ptr = strchr (ShnTag->time, '.')) != NULL) {
+			*Ptr = '\0';
+		}
+	}
+
+	ShnTag->size = C_strdup_printf ("%d Ko", (int)utils_get_size_file (file) / 1024);
+
+	C_string_free( gstr );
+
+	return ((SHNTAG *)ShnTag);
+}
+
+//
+//
+CString *GetInfo_faad (char *file)
+{
+	int fd;
+	int pos = 0;
+	char *args [ 10 ];
+	char buf [ GET_MAX_CARS + 10 ];
+	int size = 0;
+	CString *gstr = C_string_new();
+
+	args[pos++] = "faad";
+	args[pos++] = "-i";
+	args[pos++] = file;
+	args[pos++] = NULL;
+
+	/*
+	printf ("!-----------------------------------!\n");
+	printf ("! F A A D !\n");
+	printf ("!-----------------------------------!\n");
+	for (pos = 0; args[ pos ] != NULL; pos++)
+		printf ("args [ %02d ] = '%s'\n", pos, args [ pos ]);
+	printf ("\n");
+	*/
+
+	fd = GetInfo_exec_with_output (args, &VarGet.code_fork, STDERR_FILENO);
+	do {
+		pos = -1;
+		do {
+			pos++;
+			if (pos >= GET_MAX_CARS) {
+				PRINT_FUNC_LF();
+				printf ("pos(%d) >= GET_MAX_CARS(%d)\n", pos, GET_MAX_CARS);
+				pos --;
+			}
+			size = read(fd, &buf[pos], 1);
+
+		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
+		/*
+		if (pos > 0 ) {
+			buf[pos ++ ] = '\n';
+			buf[pos] = '\0';
+			C_string_append_printf (gstr, "%s", buf);
+		}
+		*/
+		buf[pos ++ ] = '\n';
+		buf[pos] = '\0';
+		C_string_append_printf (gstr, "%s", buf);
+
+	} while (size != 0);
+
+	close(fd);
+	return (gstr);
+}
+
+
+//
+//
+char *GetInfo_cpu (void)
+{
+	char	 buf [ GET_MAX_CARS + 10 ];
+	FILE	*fp;
+	char	*Ptr = NULL;
+
+	fp = fopen ("/proc/cpuinfo", "r");
+	while (fgets (buf, GET_MAX_CARS, fp) != NULL) {
+		// printf("BUF = %s", buf);
+		Ptr = buf;
+		if (*(Ptr + 0) == 'm' &&
+		 *(Ptr + 1) == 'o' &&
+		 *(Ptr + 2) == 'd' &&
+		 *(Ptr + 3) == 'e' &&
+		 *(Ptr + 4) == 'l' &&
+		 *(Ptr + 5) == ' ' &&
+		 *(Ptr + 6) == 'n' &&
+		 *(Ptr + 7) == 'a' &&
+		 *(Ptr + 8) == 'm' &&
+		 *(Ptr + 9) == 'e'
+
+		) {
+			// printf("---------BUF = %s", buf);
+
+			Ptr = buf;
+			while (*Ptr ++)
+				if (*Ptr == '\n') *Ptr = '\0';
+			for ( Ptr = buf; *Ptr != ':'; Ptr ++ );
+			Ptr ++;
+			while (*Ptr == ' ') Ptr ++;
+			// printf("---------BUF = %s", Ptr);
+
+			fclose (fp);
+			return (C_strdup (Ptr));
+		}
+	}
+	fclose (fp);
+	return (NULL);
+}
+//
+//
+void GetInfo_cpu_print (void)
+{
+	struct		utsname utsname;
+	char		*ptruname = NULL;
+	char		*ModelName = NULL;
+	HOST_CONF	 HostConf;
+
+	ModelName = GetInfo_cpu ();
+	HostConf.NbCpu = sysconf(_SC_NPROCESSORS_ONLN);
+	// printf ("_SC_NPROCESSORS_CONF : Le nombre de processeurs configure = %d\n", (int)sysconf(_SC_NPROCESSORS_CONF));
+	// printf ("_SC_NPROCESSORS_ONLN : Le nombre de processeurs actuellement en ligne (disponibles) = %d\n", (int)sysconf(_SC_NPROCESSORS_ONLN));
+	HostConf.TypeCpu = 8 * sizeof(void*);
+	if (uname (&utsname) == 0) {
+
+		strcpy (HostConf.Machine, utsname.machine);
+		if (strcmp (HostConf.Machine, "x86_64") == 0)
+			HostConf.BoolCpuIs64Bits = TRUE;
+		else	HostConf.BoolCpuIs64Bits = FALSE;
+
+		ptruname = C_strdup_printf (
+				"! sysname %s\n"
+				"! nodename %s\n"
+				"! release %s\n"
+				"! version %s\n"
+				"! machine %s\n"
+				"! %d CPU (%d bits)\n"
+				"! %s\n",
+			utsname.sysname, utsname.nodename, utsname.release, utsname.version, utsname.machine,
+			HostConf.NbCpu, HostConf.TypeCpu,
+			ModelName);
+		printf("%s",ptruname);
+	}
+	free (ModelName);
+	ModelName = NULL;
+	free (ptruname);
+	ptruname = NULL;
+}
+
+//
+//
+int GetInfo_level_get_from( TYPE_FILE_IS TypeFileIs, char *file )
+{
+	int pos = 0;
+	char *args [ 20 ];
+	int fd;
+	int size = -1;
+	char buf [ 1024 + 10 ];
+	int arrondit = -1;
+
+	if( FALSE == PrgInit.bool_normalize ) return( arrondit );
+
+	if( TypeFileIs == FILE_IS_WAV ) {
+		args[pos++] = prginit_get_name( NMR_normalize );
+		args[pos++] = "-q";
+		args[pos++] = "-n";
+		args[pos++] = file;
+		args[pos++] = NULL;
+	}
+	else if( TypeFileIs == FILE_IS_MP3 ) {
+		args[pos++] = "normalize-mp3";
+		args[pos++] = "-q";
+		args[pos++] = "-n";
+		args[pos++] = file;
+		args[pos++] = NULL;
+	}
+	else if( TypeFileIs == FILE_IS_OGG ) {
+		args[pos++] = "normalize-ogg";
+		args[pos++] = "-q";
+		args[pos++] = "-n";
+		args[pos++] = file;
+		args[pos++] = NULL;
+	}
+
+	fd = GetInfo_exec_with_output( args, &VarGet.code_fork, STDOUT_FILENO );
+	do {
+		pos = -1;
+		do {
+			pos++;
+			if (pos >= 1024) {
+				PRINT_FUNC_LF();
+				printf ("pos(%d) >= 1024\n", pos);
+				pos --;
+			}
+			size = read(fd, &buf[pos], 1);
+
+		} while ((buf[pos] != '\b') && (buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0));
+		pos ++;
+		buf[ pos ] = '\0';
+		if (strstr (buf, "dBFS")) {
+			arrondit = (int)roundf(atof(buf));
+		}
+	} while (size != 0);
+
+	close(fd);
+	VarGet.code_fork = -1;
+	return( arrondit );
+}

xcfa-5.0.2.tar.gz/src_cli/get_info.h Added

@@ -0,0 +1,56 @@
+ /*
+ *  file      : get_info.h
+ *  project   : xcfa_cli
+ *  copyright : (C) 2014 by BULIN Claude
+ *
+ *  This file is part of xcfa_cli project
+ *
+ *  xcfa_cli is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; version 3.
+ *
+ *  xcfa_cli is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ *  USA
+ */
+
+
+
+#ifndef get_info_h
+#define get_info_h 1
+
+#include "global.h"
+
+typedef struct {
+	uint	 SecTime;
+	char	*time;
+	char	*size;
+} SHNTAG;
+
+SHNTAG			*GetInfo_shntool (char *file);
+SHNTAG			*GetInfo_free_shntool (SHNTAG *ShnTag);
+CString			*GetInfo_file (char *file);
+CString			*GetInfo_checkmp3 (char *file);
+CString			*GetInfo_faad (char *file);
+CString			*GetInfo_ogginfo (char *file);
+CString			*GetInfo_which (char *file);
+CString			*GetInfo_metaflac (char *file);
+char			*GetInfo_cpu (void);
+void			GetInfo_cpu_print (void);
+char			*GetInfo_cpu_str (void);
+TYPE_FILE_IS	GetInfo_file_is (char *PathName);
+long			GetInfo_level_df (void);
+C_BOOL			GetInfo_level_bool_percent (void);
+int				GetInfo_level_get_from( TYPE_FILE_IS TypeFileIs, char *file );
+void			GetInfo_set( INFO *p_Info );
+void			GetInfo_remove( INFO *p_Info );
+void			GetInfo_cpu_print (void);
+
+#endif
+

xcfa-5.0.2.tar.gz/src_cli/global.h Added

@@ -0,0 +1,391 @@
+/*
+ * file : src/global.h
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+#ifndef global_h
+#define global_h 1
+
+#include "clib.h"
+
+typedef struct {
+	char		Machine [ 100 ];
+	int			NbCpu;
+	int			TypeCpu;
+	C_BOOL		BoolCpuIs64Bits;
+} HOST_CONF;
+
+extern HOST_CONF HostConf;
+
+#ifdef ENABLE_NLS
+	#include <libintl.h>
+	#define gettext_noop(x) (x)
+	#define _(String) gettext (String)
+#endif
+
+
+// Terminal color codes:
+//		printf( "\t%sNew text to see%s\n", BOLD_YELLOW, RESET );
+#define RESET			"\033[0m"			// RESET
+#define BLACK			"\033[30m"			// Black
+#define RED				"\033[31m"			// Red
+#define GREEN			"\033[32m"			// Green
+#define YELLOW			"\033[33m"			// Yellow
+#define BLUE			"\033[34m"			// Blue
+#define MAGENTA			"\033[35m"			// Magenta
+#define CYAN			"\033[36m"			// Cyan
+#define WHITE			"\033[37m"			// White
+#define BOLD_BLACK		"\033[1m\033[30m"	// Bold Black
+#define BOLD_RED		"\033[1m\033[31m"	// Bold Red
+#define BOLD_GREEN		"\033[1m\033[32m"	// Bold Green
+#define BOLD_YELLOW		"\033[1m\033[33m"	// Bold Yellow
+#define BOLD_BLUE		"\033[1m\033[34m"	// Bold Blue
+#define BOLD_MAGENTA	"\033[1m\033[35m"	// Bold Magenta
+#define BOLD_CYAN		"\033[1m\033[36m"	// Bold Cyan
+#define BOLD_WHITE		"\033[1m\033[37m"	// Bold White
+
+
+//
+// ---------------------------------------------------------------------------
+// DEBUG
+// ---------------------------------------------------------------------------
+//
+#define PRINT_FUNC_LF() printf( "%s :: %s (line = %d)\n", __FILE__, __FUNCTION__, __LINE__ )
+#define PRINT(str) printf( "%s :: %s(line = %d)\n\t%s\n", __FILE__, __FUNCTION__, __LINE__, str )
+
+typedef struct {
+	char			*Album;					// %b
+	char			*Artist;				// %a
+	char			*Title;					// %d
+	char			*Number;				// %c
+	int				 IntNumber;				//
+	char			*Genre;					// %g
+	int			 	IntGenre;				//
+	char			*Year;					// %e
+	int				 IntYear;				//
+	char			*Comment;				//
+	char			*Description;			//
+} TAGS;
+
+//
+// ---------------------------------------------------------------------------
+// I N F O _
+// ---------------------------------------------------------------------------
+//
+
+typedef struct {
+	char			*time;					// Temps d'ecoute
+	int			 	SecTime;				// Temps d'ecoute en secondes
+	char			*hertz;					//
+	TAGS			*tags;					// Tags
+} INFO_M4A;
+
+typedef struct {
+	char			*time;					// Temps d'ecoute
+	int				 SecTime;				// Temps d'ecoute en secondes
+	char			*hertz;					//
+	TAGS			*tags;					// Tags
+} INFO_AAC;
+
+typedef struct {
+	C_BOOL		 	BoolBwf;				// 'fmt ', 'bext', 'qlty', 'levl', 'link','axml'
+	char			*time;					// Temps d'ecoute
+	int			 	SecTime;				// Temps d'ecoute en secondes
+	char			*hertz;					// Taux d'échantillonnage en hertz( qualité du son)
+	char			*voie;					// 1, 2, 4, 6
+	char			*bits;					// 8, 16, ,24, 32 ou 64
+	TAGS			*tags;					// Tags
+	int				 LevelDbfs;				//
+} INFO_WAV;
+
+typedef enum {								// type: bitrate:
+	NONE_MPEG = -1,
+	MPEG_1 = 0,								// MPV_1 [ 32 40 48 56 64 80 96 112 128 160 192 224 256 320 ]
+	MPEG_2,									// MPV_2 [ 8 16 24 32 40 48 56 64 80 96 112 128 144 160 ]
+	MPEG_25									// MPV_25 [ 8 16 24 32 40 48 56 64 80 96 112 128 144 160 ]
+} MPEG_IS;
+
+typedef struct {
+	char			*bitrate;				//
+	char			*time;					// Temps d'ecoute
+	int			 	SecTime;				// Temps d'ecoute en secondes
+	MPEG_IS			 mpeg_is;				//
+	char			*size;					//
+	TAGS			*tags;					// Tags
+	int				LevelDbfs;				//
+} INFO_MP3;
+
+typedef struct {
+	char			*Channels;				//
+	char			*Rate;					//
+	char			*Nominal_bitrate;		//
+	char			*time;					// Temps d'ecoute
+	int				SecTime;				// Temps d'ecoute en secondes
+	char			*size;					//
+	TAGS			*tags;					// Tags
+	int			 	LevelDbfs;				//
+} INFO_OGG;
+
+typedef struct {
+	char			*time;					// Temps d'ecoute
+	int			 	SecTime;				// Temps d'ecoute en secondes
+	TAGS			*tags;					// Tags
+} INFO_FLAC;
+
+typedef struct {
+	TAGS			*tags;					// Tags
+} INFO_WMA;
+
+typedef struct {
+	TAGS			*tags;					// Tags
+} INFO_RM;
+
+typedef struct {
+	TAGS			*tags;					// Tags
+} INFO_DTS;
+
+typedef struct {
+	TAGS			*tags;					// Tags
+} INFO_AIFF;
+
+typedef struct {
+	char			*namefile;				// Nom complet du fichier
+	TAGS			*tags;					// Tags
+} INFO_MPC;
+
+typedef struct {
+	TAGS			*tags;					// Tags
+	char			*time;					// Temps d'ecoute
+	int			 	SecTime;				// Temps d'ecoute en secondes
+	char			*size;					//
+} INFO_SHN;
+
+typedef struct {
+	TAGS			*tags;					// Tags
+	char			*time;					// Temps d'ecoute
+	int			 	SecTime;				// Temps d'ecoute en secondes
+	char			*size;					//
+} INFO_APE;
+
+typedef struct {
+	TAGS			*tags;					// Tags
+	char			*time;					// Temps d'ecoute
+	int			 	SecTime;				// Temps d'ecoute en secondes
+	char			*size;					//
+} INFO_WAVPACK;
+
+typedef struct {
+	TAGS			*tags;					// Tags
+} INFO_AC3;
+
+
+typedef enum {
+	FILE_IS_NONE = 0,
+	FILE_IS_FLAC,
+	FILE_IS_WAV,
+	FILE_IS_CUE,
+	// FILE_IS_BFW,	// BROADCAST WAVE FORMAT
+	FILE_IS_MP3,
+	FILE_IS_OGG,
+	/* Les fichiers au format AAC, portant l'extension
+		.mp4( pour MPEG-4),
+	 	.m4a( pour MPEG-4 Audio)
+	 	.m4p( pour MPEG-4 Protégé),
+	 sont globalement plus petits que les fichiers au format MP3. */
+	FILE_IS_M4A,
+	FILE_IS_VID_M4A,
+	FILE_IS_AAC,
+	FILE_IS_SHN,
+	FILE_IS_WMA,
+	FILE_IS_RM,
+	FILE_IS_DTS,
+	FILE_IS_AIFF,
+	FILE_IS_MPC,
+	FILE_IS_APE,
+	FILE_IS_WAVPACK,
+	FILE_IS_WAVPACK_MD5,
+	FILE_IS_AC3,
+	NBR_FILE_TO
+} TYPE_FILE_IS;
+
+typedef struct {
+	char			*path_name_file;
+	char			*path;
+	char			*name_file;
+	TYPE_FILE_IS	type_infosong_file_is;
+	void			*info;					// INFO_xx
+	char			*path_is_normalize;
+	char			*tmp_wav;				// pathnames temporaires
+	char			*tmp_mp3;
+	char			*tmp_ogg;
+	char			*tmp_sox;
+	char			*tmp_sox_24;
+	char			*tmp_flac;
+	char			*tmp_ape;
+	char			*tmp_wavpack;
+	char			*tmp_m4a;
+	char			*tmp_aac;
+	char			*tmp_mpc;
+} INFO;
+
+
+typedef struct {							// Liste de recherche recursive si plusieurs fois --input sur ligne de commande
+	char		*PathNameFile;
+	char		*Jocker;
+} LIST_SEARCH;
+
+typedef enum {
+	OP_REPLAYGAIN_NONE = 0,
+	OP_REPLAYGAIN_CLEAR,
+	OP_REPLAYGAIN_ALBUM,
+	OP_REPLAYGAIN_TRACK
+} OP_REPLAYGAIN;
+
+typedef enum {
+	OP_NORMALISE_NONE = 0,
+	OP_NORMALISE_PEAK_ALBUM,					// NORM_PEAK_ALBUM
+	OP_NORMALISE_PEAK,							// NORM_PEAK
+	OP_NORMALISE_RMS_MIX_ALBUM,					// ( scan) NORM_RMS_MIX_ALBUM
+	OP_NORMALISE_RMS_FIX						// ( scan) NORM_RMS_FIX
+} OP_NORMALISE;
+
+// info | extract
+typedef enum {
+	OP_CUE_NONE = 0,
+	OP_CUE_INFO,
+	OP_CUE_EXTRACT
+} OP_CUE;
+
+typedef struct {
+	int				BoolVerboseMode;
+	int				Nice;
+	CList			*ListSearch;				// struct LIST_SEARCH
+	char			*OutputDir;
+	C_BOOL			BoolTypeDest[ NBR_FILE_TO ];
+	C_BOOL			BoolRecursiveMode;
+	CList			*ListFile;					// struct INFO
+	char			*Op_flac;					// Options tags
+	char			*Op_ape;
+	char			*Op_wavpack;
+	char			*Op_ogg;
+	char			*Op_m4a;
+	char			*Op_aac;
+	char			*Op_mpc;
+	char			*Op_mp3;
+	C_BOOL			BoolExtract2Src;
+	C_BOOL			BoolNoTag;					// tags
+	char			*tag_album;
+	char			*tag_artist;
+	char			*tag_title;
+	char			*tag_number;
+	char			*tag_genre;
+	char			*tag_year;
+	char			*tag_comment;
+	char			*tag_description;
+	double			split;
+	int				split_length;
+	int				frequency;					// Setting wav
+	int				track;
+	int				quantification;
+	OP_REPLAYGAIN	replaygain;
+	int				bool_peak;					// Normalize
+	int				bool_peak_album;
+	int				mix_rms_album;
+	int				fix_rms;
+	C_BOOL			bool_dest;					// --dest
+	C_BOOL			bool_split;					// --split --length
+	C_BOOL			bool_setting_wav;			// --frequency --track --quantification
+	C_BOOL			bool_normalize;				// --peak --peak_album --mix_rms_album --fix_rms
+
+	int				bool_info_files;			//
+	int				bool_info_tags;				//
+	int				bool_info_head;				//
+
+	OP_CUE			cue;
+
+} DETAIL;
+
+extern DETAIL Detail;
+
+
+//
+// ---------------------------------------------------------------------------
+// FILE_CONV.C
+// ---------------------------------------------------------------------------
+//
+void file_conv( void );
+C_BOOL fileconv_change_quantification_with_sox(
+						C_BOOL pbool_copy_dest_to_src,
+						char *p_src,
+						char *p_dest,
+						int p_Hertz,
+						int p_Channels,
+						int p_Bits
+						);
+
+//
+// ---------------------------------------------------------------------------
+// UTILS.C
+// ---------------------------------------------------------------------------
+//
+size_t	utils_get_size_file( char *PathName );
+char *utils_create_rep( char *path_name_rep );
+char *utils_remove_temporary_rep( char *path_tmprep );
+char *utils_get_dir_dest( INFO *p_Info );
+
+//
+// ---------------------------------------------------------------------------
+// SPLIT.C
+// ---------------------------------------------------------------------------
+//
+void split_wav( char *p_pathnamefile, double p_split_begin_ss, int p_split_length_ss );
+
+//
+// ---------------------------------------------------------------------------
+// WAV.C
+// ---------------------------------------------------------------------------
+//
+void wav_change_setting( char *p_pathnamefile, int p_frequency, int p_track, int p_quantification );
+void loop_wav_change_setting( int p_frequency, int p_track, int p_quantification );
+
+//
+// ---------------------------------------------------------------------------
+// REPLAYGAIN.C
+// ---------------------------------------------------------------------------
+//
+void replaygain_set( OP_REPLAYGAIN TypeReplaygain );
+
+//
+// ---------------------------------------------------------------------------
+// NORMALIZE.C
+// ---------------------------------------------------------------------------
+//
+void normalize_set( C_BOOL p_bool_peak, C_BOOL p_bool_peak_album, int p_mix_rms_album, int p_fix_rms );
+
+//
+// ---------------------------------------------------------------------------
+// CUE.C
+// ---------------------------------------------------------------------------
+//
+void cue_set( OP_CUE p_op_cue );
+
+
+#endif

xcfa-5.0.2.tar.gz/src_cli/main.c Added

@@ -0,0 +1,1449 @@
+/*
+ * file : src/main.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#ifdef ENABLE_NLS
+	#include <libintl.h>
+	#define _(String) gettext (String)
+#endif
+
+#include <locale.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <getopt.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <fnmatch.h>
+#include <unistd.h>
+
+#include "global.h"
+#include "get_info.h"
+#include "prg_init.h"
+#include "tags.h"
+
+
+char *get_current_dir_name(void);	// The caller should free(3) the returned buffer.
+
+DETAIL Detail = {
+	FALSE,				// C_BOOL		BoolVerboseMode
+	-1,					// int			Nice
+	NULL,				// CList		*ListSearch
+	NULL,				// char			*OutputDir
+	{},					// C_BOOL		BoolTypeDest[ NBR_FILE_TO ]
+	FALSE,				// C_BOOL		BoolRecursiveMode
+	NULL,				// CList		*ListFile
+	NULL,				// char			*Op_flac
+	NULL,				// char			*Op_ape
+	NULL,				// char			*Op_wavpack
+	NULL,				// char			*Op_ogg
+	NULL,				// char			*Op_m4a
+	NULL,				// char			*Op_aac
+	NULL,				// char			*Op_mpc
+	NULL,				// char			*Op_mp3
+	FALSE,				// C_BOOL		BoolExtract2Src
+	FALSE,				// C_BOOL		BoolNoTag
+	NULL,				// char			*tag_album
+	NULL,				// char			*tag_artist
+	NULL,				// char			*tag_title
+	NULL,				// char			*tag_number
+	NULL,				// char			*tag_genre
+	NULL,				// char			*tag_year
+	NULL,				// char			*tag_comment
+	NULL,				// char			*tag_description
+
+	0.0,				// double		split
+	0,					// int			split_length
+
+	0,					// int			frequency
+	0,					// int			track
+	0,					// int			quantification
+
+	OP_REPLAYGAIN_NONE,	// OP_REPLAYGAIN	replaygain
+
+						// Normalize
+	FALSE,				// C_BOOL		peak
+	FALSE,				// C_BOOL		peak_album
+	0,					// int			mix_rms_album
+	0,					// int			fix_rms
+
+	FALSE,				// C_BOOL		bool_dest				// --dest
+	FALSE,				// C_BOOL		bool_split				// --split --length
+	FALSE,				// C_BOOL		bool_setting_wav		// --frequency --track --quantification
+	FALSE,				// C_BOOL		bool_normalize			// --peak --peak_album --mix_rms_album --fix_rms
+
+	FALSE,				// C_BOOL		bool_info_files
+	FALSE,				// C_BOOL		bool_info_tags
+	FALSE,				// C_BOOL		bool_info_head
+
+	OP_CUE_NONE			// OP_CUE		cue
+
+};
+
+
+typedef struct {
+	TYPE_FILE_IS	TypeFileIs;
+	C_BOOL			*BoolFound_1;
+	char			*Err_1;
+	C_BOOL			*BoolFound_2;
+	char			*Err_2;
+	C_BOOL			*BoolFound_3;
+	char			*Err_3;
+} TST_FROM;
+TST_FROM ToWav[] = {
+{ FILE_IS_FLAC,		&PrgInit.bool_flac,		"FLAC not found",					NULL, NULL, NULL, NULL },
+{ FILE_IS_APE,		&PrgInit.bool_ape,		"MAC not found",					NULL, NULL, NULL, NULL },
+{ FILE_IS_WAVPACK,	&PrgInit.bool_wavpack,	"WAVPACK or WVUNPACK not found",	NULL, NULL, NULL, NULL },
+{ FILE_IS_OGG,		&PrgInit.bool_mplayer,	"MPLAYER not found",				&PrgInit.bool_sox,		"SOX not found",		NULL, NULL },
+{ FILE_IS_M4A,		&PrgInit.bool_mplayer,	"MPLAYER not found",				NULL, NULL, NULL, NULL },
+{ FILE_IS_MPC,		&PrgInit.bool_mplayer,	"MPLAYER not found",				NULL, NULL, NULL, NULL },
+{ FILE_IS_MP3,		&PrgInit.bool_mplayer,	"MPLAYER not found",				&PrgInit.bool_sox,		"SOX not found",		NULL, NULL },
+{ FILE_IS_WMA,		&PrgInit.bool_mplayer,	"MPLAYER not found",				NULL, NULL, NULL, NULL },
+{ FILE_IS_SHN,		&PrgInit.bool_shorten,	"SHORTEN not found",				NULL, NULL, NULL, NULL },
+{ FILE_IS_RM,		&PrgInit.bool_mplayer,	"MPLAYER not found",				NULL, NULL, NULL, NULL },
+{ FILE_IS_DTS,		&PrgInit.bool_mplayer,	"MPLAYER not found",				NULL, NULL, NULL, NULL },
+{ FILE_IS_AIFF,		&PrgInit.bool_mplayer,	"MPLAYER not found",				NULL, NULL, NULL, NULL },
+{ FILE_IS_AC3,		&PrgInit.bool_a52dec,	"A52DEC not found",					NULL, NULL, NULL, NULL },
+{ FILE_IS_WAV,		&PrgInit.bool_sox,		"SOX not found",					NULL, NULL, NULL, NULL },
+{ FILE_IS_MP3,		&PrgInit.bool_sox,		"SOX not found",					&PrgInit.bool_lame,		"LAME not found",		NULL, NULL },
+{-1}
+};
+TST_FROM ToOther[] = {
+{ FILE_IS_FLAC,		&PrgInit.bool_sox,		"SOX not found",					&PrgInit.bool_flac,		"FLAC not found",		NULL, NULL },
+{ FILE_IS_APE,		&PrgInit.bool_sox,		"SOX not found",					&PrgInit.bool_ape,		"MAC not found",		NULL, NULL },
+{ FILE_IS_WAVPACK,	&PrgInit.bool_wavpack,	"WAVPACK or WVUNPACK not found",	NULL, NULL, NULL, NULL },
+{ FILE_IS_OGG,		&PrgInit.bool_sox,		"SOX not found",					&PrgInit.bool_oggenc,	"OGGENC not found",		NULL, NULL },
+{ FILE_IS_M4A,		&PrgInit.bool_sox,		"SOX not found",					&PrgInit.bool_faad,		"FAAD not found",		NULL, NULL },
+{ FILE_IS_AAC,		&PrgInit.bool_sox,		"SOX not found",					&PrgInit.bool_mplayer,	"MPLAYER not found",	&PrgInit.bool_aacplusenc,	"AACPLUSENC not found" },
+{ FILE_IS_MPC,		&PrgInit.bool_sox,		"SOX not found",					&PrgInit.bool_mplayer,	"MPLAYER not found",	&PrgInit.bool_mppenc,		"MPPENC not found" },
+{ FILE_IS_MP3,		&PrgInit.bool_sox,		"SOX not found",					&PrgInit.bool_lame,		"LAME not found",		NULL, NULL },
+{-1}
+};
+TST_FROM ToReplaygain[] = {
+{ FILE_IS_FLAC,		&PrgInit.bool_flac,			"METAFLAC not found",			NULL, NULL, NULL, NULL },
+{ FILE_IS_MP3,		&PrgInit.bool_mp3gain,		"MP3GAIN not found",			NULL, NULL, NULL, NULL },
+{ FILE_IS_OGG,		&PrgInit.bool_vorbisgain,	"VORBISGAIN not found",			NULL, NULL, NULL, NULL },
+{ FILE_IS_WAVPACK,	&PrgInit.bool_wavpack,		"WVGAIN not found",				NULL, NULL, NULL, NULL },
+{-1}
+};
+
+
+TST_FROM ToNormalize[] = {
+{ FILE_IS_WAV,		&PrgInit.bool_normalize,	"normalize not found",			NULL, NULL, NULL, NULL },
+{ FILE_IS_MP3,		&PrgInit.bool_normalize,	"normalize-mp3 not found",		NULL, NULL, NULL, NULL },
+{ FILE_IS_OGG,		&PrgInit.bool_normalize,	"normalize-ogg not found",		NULL, NULL, NULL, NULL },
+{-1}
+};
+
+
+
+//
+// Return string from 'TYPE_FILE_IS p_from'
+//
+char *get_type( TYPE_FILE_IS p_from )
+{
+	int i = p_from;
+	switch( i ) {
+		case FILE_IS_WAV :		return("WAV");
+		case FILE_IS_FLAC :		return("FLAC");
+		case FILE_IS_APE :		return("APE");
+		case FILE_IS_WAVPACK :	return("WAVPACK");
+		case FILE_IS_MP3 :		return("MP3");
+		case FILE_IS_OGG :		return("OGG");
+		case FILE_IS_MPC :		return("MPC");
+		case FILE_IS_AC3 :		return("AC3");
+		case FILE_IS_M4A :		return("M4A");
+		case FILE_IS_VID_M4A :	return("M4A");
+		case FILE_IS_WMA :		return("WMA");
+		case FILE_IS_RM :		return("RM");
+		case FILE_IS_DTS :		return("DTS");
+		case FILE_IS_AIFF :		return("AIF");
+		case FILE_IS_SHN :		return("SHN");
+		case FILE_IS_AAC :		return("AAC");
+	}
+	return("???");
+}
+//
+// Search in tab 'TST_FROM *p_type' if 'TYPE_FILE_IS p_from' exist.
+// Return TRUE if ok else FALSE
+//
+C_BOOL tst_prg_extern( C_BOOL p_bool_print, TST_FROM *p_type, TYPE_FILE_IS p_from )
+{
+	C_BOOL	Ret = TRUE;
+	TST_FROM	*type = p_type;
+
+	while( type->TypeFileIs != -1 ) {
+		if( p_from == type->TypeFileIs ) {
+			if( NULL != type->BoolFound_1 && FALSE == *type->BoolFound_1 ) {
+				if( TRUE == p_bool_print) printf("\t%s%s %s\n", BOLD_RED, type->Err_1, RESET );
+				Ret = FALSE;
+			}
+			if( NULL != type->BoolFound_2 && FALSE == *type->BoolFound_2 ) {
+				if( TRUE == p_bool_print) printf("\t%s%s %s\n", BOLD_RED, type->Err_2, RESET );
+				Ret = FALSE;
+			}
+			if( NULL != type->BoolFound_3 && FALSE == *type->BoolFound_3 ) {
+				if( TRUE == p_bool_print) printf("\t%s%s %s\n", BOLD_RED, type->Err_3, RESET );
+				Ret = FALSE;
+			}
+		}
+		type ++;
+	}
+	return( Ret );
+}
+//
+// Returns TRUE if an external program is absent otherwise returns FALSE
+//
+C_BOOL get_is_err_in( TST_FROM *p_type )
+{
+	CList	*list = NULL;
+	INFO	*Info = NULL;
+
+	if( NULL != ( list = C_list_first( Detail.ListFile ))) {
+		while( list ) {
+			if( NULL != (Info = (INFO *)list->data) ) {
+				if( FALSE == tst_prg_extern( FALSE, p_type, Info->type_infosong_file_is ))
+					return( TRUE );
+			}
+			list = C_list_next( list );
+		}
+	}
+	return( FALSE );
+}
+
+//
+// Remove all memoty allocation
+//
+void remove_options( void )
+{
+	CList	*list = NULL;
+	INFO	*Info = NULL;
+	LIST_SEARCH	*ListSearch= NULL;
+
+	if( NULL != ( list = C_list_first( Detail.ListSearch ))) {
+		while( list ) {
+			if( NULL != (ListSearch = (LIST_SEARCH *)list->data) ) {
+				if( NULL != ListSearch->PathNameFile )	free( ListSearch->PathNameFile );
+				if( NULL != ListSearch->Jocker )		free( ListSearch->Jocker );
+				ListSearch->PathNameFile = ListSearch->Jocker = list->data = NULL;
+			}
+			list = C_list_next( list );
+		}
+		C_list_free( Detail.ListSearch );
+		Detail.ListSearch = NULL;
+	}
+
+	if( Detail.OutputDir != NULL ) {
+		free( Detail.OutputDir );
+		Detail.OutputDir = NULL;
+	}
+
+	if( NULL != ( list = C_list_first( Detail.ListFile ))) {
+		while( list ) {
+			if( NULL != (Info = (INFO *)list->data) ) {
+				GetInfo_remove( Info );
+				if( NULL != Info->path_name_file )		free( Info->path_name_file );
+				if( NULL != Info->path )				free( Info->path );
+				if( NULL != Info->name_file )			free( Info->name_file );
+				if( NULL != Info->path_is_normalize )	free( Info->path_is_normalize );
+				Info->path_is_normalize =
+					Info->path =
+						Info->name_file =
+							Info->path_name_file =
+								list->data = NULL;
+			}
+			list = C_list_next( list );
+		}
+		C_list_free( Detail.ListFile );
+		Detail.ListFile = NULL;
+	}
+
+	if( Detail.Op_flac != NULL ) {			free( Detail.Op_flac );			Detail.Op_flac = NULL;		}
+	if( Detail.Op_ape != NULL ) {			free( Detail.Op_ape );			Detail.Op_ape = NULL;		}
+	if( Detail.Op_wavpack != NULL ) {		free( Detail.Op_wavpack );		Detail.Op_wavpack = NULL;	}
+	if( Detail.Op_ogg != NULL ) {			free( Detail.Op_ogg );			Detail.Op_ogg = NULL;		}
+	if( Detail.Op_m4a != NULL ) {			free( Detail.Op_m4a );			Detail.Op_m4a = NULL;		}
+	if( Detail.Op_aac != NULL ) {			free( Detail.Op_aac );			Detail.Op_aac = NULL;		}
+	if( Detail.Op_mpc != NULL ) {			free( Detail.Op_mpc );			Detail.Op_mpc = NULL;		}
+	if( Detail.Op_mp3 != NULL ) {			free( Detail.Op_mp3 );			Detail.Op_mp3 = NULL;		}
+	if( Detail.tag_album != NULL ) {		free( Detail.tag_album );		Detail.tag_album = NULL;	}
+	if( Detail.tag_artist != NULL ) {		free( Detail.tag_artist );		Detail.tag_artist = NULL;	}
+	if( Detail.tag_title != NULL ) {		free( Detail.tag_title );		Detail.tag_title = NULL;	}
+	if( Detail.tag_number != NULL ) {		free( Detail.tag_number );		Detail.tag_number = NULL;	}
+	if( Detail.tag_genre != NULL ) {		free( Detail.tag_genre );		Detail.tag_genre = NULL;	}
+	if( Detail.tag_year != NULL ) {		free( Detail.tag_year );		Detail.tag_year = NULL;		}
+	if( Detail.tag_comment != NULL ) {		free( Detail.tag_comment );		Detail.tag_comment = NULL;	}
+	if( Detail.tag_description != NULL ) {	free( Detail.tag_description );	Detail.tag_description = NULL;	}
+}
+
+
+//
+// Print help and quit
+//
+void help( C_BOOL p_bool_halt )
+{
+	printf( "\n" );
+	printf( "!-------------------------------------------------------------\n" );
+	printf( "! %s\n", PACKAGE_STRING );
+	printf( "!-------------------------------------------------------------\n" );
+	printf( _("xcfa_cli is an implementation of xcfa in command line.\n"
+			"xcfa_cli is an application for conversion, normalization, reconfiguring wav files and cut audio files ...\n\n"
+			"What xcfa_cli can do:\n"
+			" - replaygain on files: flac, mp3, ogg, wavpack\n"
+			" - conversions:\n"
+			" - from files:\n"
+			" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, aif, ac3		\n"
+			" - to files:			\n"
+			" wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, aac\n"
+			" - conversion settings for file management:\n"
+			" flac, ape, wavpack, ogg, m4a, aac, mpc, mp3\n"
+			" - management tags\n"
+			" - management cue wav file\n"
+			" - manipulation of the frequency, track and bit wav files\n"
+			" - standardization on files: wav, mp3, ogg\n"
+			" - cuts (split) wav files\n"
+			" - displaying information on files\n") );
+
+	printf( "!-------------------------------------------------------------\n" );
+	GetInfo_cpu_print();
+	printf( "!-------------------------------------------------------------\n" );
+	prginit_print_info ();
+	printf( "!-------------------------------------------------------------\n" );
+	printf( "\n" );
+
+	printf( _(" --verbose Verbose mode\n"
+			" -h --help Print help mode and quit\n"
+			"\n"
+
+			" -i <\"file.type\"> --input <\"file.type\">\n"
+			" Input name file to convert in inverted commas, by example: --input \"*.flac\"\n"
+			" Type input files: wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, aif, ac3\n"
+			" -o <path_dest/> --output <path_dest/>\n"
+			" Destination folder. By default in the source file folder.\n"
+			" -d <wav,flac,ape,...> --dest <wav,flac,ape,...>\n"
+			" Destination file: wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, aac\n"
+			" -r --recursion Recursive search\n"
+			" -e --ext2src Extract in the source folder. This option is useful with '--recursion'\n"
+			" --nice <priority> Change the priority of running processes in the interval: 0 .. 20\n"
+			"\n"
+
+			"Management options with default parameters:\n"
+			"\n"
+			" --op_flac <\"-5\">\n"
+			" --op_ape <\"c2000\">\n"
+			" --op_wavpack <\"-y -j1\">\n"
+			" --op_ogg <\"--quality=3\">\n"
+			" --op_m4a <\"-q 100\">\n"
+			" --op_aac <\"48\">\n"
+			" --op_mpc <\"--verbose --overwrite --insane\">\n"
+			" --op_mp3 <\"-h --nohist --noreplaygain -b 128\">\n"
+			"\n"
+
+			"Displays information about the files:\n"
+			"\n"
+			" --info_files Displays time, level dBFS, frequency/track/quantification\n"
+			" --info_tags Displays tags\n"
+			" --info_head Displays head\n"
+			"\n"
+
+			"Management tags:\n"
+			"\n"
+			" --no_tag The tags will not be carried\n"
+			" --tag_album <\"tags\"> Tag of album\n"
+			" --tag_artist <\"tags\"> Tag of artist\n"
+			" --tag_title <\"tags\"> Tag of title\n"
+			" --tag_number <\"tags\"> Tag of number\n"
+			" --tag_genre <\"tags\"> Tag of genre\n"
+			" --tag_year <\"tags\"> Tag of year\n"
+			" --tag_comment <\"tags\"> Tag of comment\n"
+			" --tag_description <\"tags\"> Tag of description\n"
+			"\n"
+
+			"Management cue file:\n"
+			" -c <info|extract> --cue <info|extract>\n"
+			" info Provides information on a WAV or CUE file.\n"
+			" extract Extract all tracks of a WAV file.\n"
+			"\n"
+
+			"Management split:\n"
+			"\n"
+			" -s <hh:mm:ss> --split <hh:mm:ss> Mark the beginning of the file to be cut.\n"
+			" -l <sec> --length <sec> Specifies the length of the file to cut with the seconds parameter.\n"
+			"\n"
+
+			"Changing the settings of a WAV file:\n"
+			"\n"
+			" -f <num> --frequency <num> Changing the frequency: 8000, 22000, 32000, 44056, 44100, 48000, 88200, 96000 or other\n"
+			" -t <num> --track <num> Changing the number of tracks: 1, 2, 4, 6\n"
+			" -q <num> --quantification <num> Changing the quantification: 8, 16, 24, 32, 64\n"
+			"\n"
+
+			"Replaygain: dynamic modification for next files: FLAC, MP3, OGG, WAVPACK\n"
+			"\n"
+			" -g <clear|album|track> --replaygain <clear|album|track>\n"
+			" FLAC [ clear | album ]\n"
+			" MP3 [ clear | album | track ]\n"
+			" OGG [ clear | album | track ]\n"
+			" WAVPACK [ clear | album | track ]\n"
+			"\n"
+
+			"Normalize: static modification for next files: MP3, WAV, OGG\n"
+			" See an excellent article by @Dzef on standardization: http://ubunteros.tuxfamily.org/spip.php?article159\n"
+			"\n"
+			" --peak Action on a single file.\n"
+			" Maximum volume amplification for each file:\n"
+			" Increase the overall level of the signal so as to bring the level to 0 dBFS peak without changing dynamics.\n"
+			" --peak_album Action on a group of files.\n"
+			" Maximum volume boost for a group of files in accordance with the level of differences between each of them.\n"
+			" If the maximum level of one or more files is already at 0 dBFS, the level of all the selected files remain unchanged\n"
+			" after normalization. So this mode can be safely used almost systematically.\n"
+			" --mix_rms_album <dBFS> Action on a group of files.\n"
+			" Adjusting the average volume for a group of files respecting average level of the differences between each of them.\n"
+			" The selecting a value for a file modifies the other files in the group.\n"
+			" --fix_rms <dBFS> Action on a single file.\n"
+			" Adjusting the average volume of each file..\n"
+			"\n") );
+
+	printf( _("Example conversion:\n") );
+	printf( "\n" );
+	printf( " %s --input \"file.wav\" -d ogg --dest flac,mp, --output newfolder/\n", PACKAGE );
+	printf( " %s --input \"*.wav\" --dest ogg,flac,mp3 --output newfolder/ --recursive -op_mp3 \"--preset fast extreme\"\n", PACKAGE );
+	printf( " %s --input \"*.*\" -d mp3 --split 00:00:00 -l 30 -o newfolder/ --verbose --frequency 44100 --track 2 --quantification 16\n", PACKAGE );
+	printf( "\n" );
+
+	printf( _("Conversion example with two inputs:\n") );
+	printf( "\n" );
+	printf( " %s --input \"file.wav\" --input \"other_file.mp3\" -d ogg --dest flac,mpc --output newfolder/\n", PACKAGE );
+	printf( "\n" );
+
+	printf( _("Example split:\n") );
+	printf( "\n" );
+	printf( " %s --input \"file.wav\" --info_files\n", PACKAGE );
+	printf( " %s --input \"*.*\" -d mp3 --split 00:00:00 -l 30 -o newfolder/ --verbose\n", PACKAGE );
+	printf( " %s --input \"file.wav\" -d ogg,mpc --split 00:01:00 --length 22 --output newfolder/\n", PACKAGE );
+	printf( "\n" );
+
+	printf( _("Example cue:\n") );
+	printf( "\n" );
+	printf( " %s --input \"file.cue\" --cue info\n", PACKAGE );
+	printf( " %s --input \"file.cue\" --cue extract --output newfolder/\n", PACKAGE );
+	printf( " %s --input \"file.wav\" --cue info\n", PACKAGE );
+	printf( " %s --input \"file.wav\" --cue extract --output newfolder/\n", PACKAGE );
+	printf( "\n" );
+
+	printf( _("Example setting wav:\n") );
+	printf( "\n" );
+	printf( " %s -i \"file.wav\" -d wav -o newfolder/ --frequency 96000 --track 6 --quantification 32 --verbose\n", PACKAGE );
+	printf( "\n" );
+
+	printf( _("Example replaygain:\n") );
+	printf( "\n" );
+	printf( " %s -i \"*.*\" --replaygain clear\n", PACKAGE );
+	printf( " %s -i \"*.*\" --replaygain album\n", PACKAGE );
+	printf( "\n" );
+
+	printf( _("Example normalize:\n") );
+	printf( "\n" );
+	printf( " %s -i \"*.*\" --info_files\n", PACKAGE );
+	printf( " %s -i \"*.*\" --peak_album\n", PACKAGE );
+	printf( " %s -i \"*.*\" --peak\n", PACKAGE );
+	printf( " %s -i \"*.*\" --mix_rms_album -10\n", PACKAGE );
+	printf( " %s -i \"*.*\" --fix_rms -4\n", PACKAGE );
+	printf( "\n" );
+
+	printf( _("Example info:\n") );
+	printf( "\n" );
+	printf( " %s -i \"*.*\" --info_files --info_tags --info_head\n", PACKAGE );
+	printf( "\n" );
+
+	printf( "!-------------------------------------------------------------\n" );
+	printf( "! See [ $ man xcfa_cli ]\n" );
+	printf( "!-------------------------------------------------------------\n" );
+	printf( "\n" );
+
+	printf( "\n\n" );
+	remove_options();
+	if( TRUE == p_bool_halt) exit( EXIT_SUCCESS );
+}
+
+
+//
+// Return type file from 'char *p_type_dest'
+//
+int ret_type_dest( char *p_type_dest )
+{
+	if( strstr( p_type_dest, "flac" ))			return( FILE_IS_FLAC );
+	else if( strstr( p_type_dest, "ape" ))		return( FILE_IS_APE );
+	else if( strstr( p_type_dest, "wavpack" ))	return( FILE_IS_WAVPACK );
+	else if( strstr( p_type_dest, "wav" ))		return( FILE_IS_WAV );
+	else if( strstr( p_type_dest, "mp3" ))		return( FILE_IS_MP3 );
+	else if( strstr( p_type_dest, "ogg" ))		return( FILE_IS_OGG );
+	else if( strstr( p_type_dest, "mpc" ))		return( FILE_IS_MPC );
+	else if( strstr( p_type_dest, "ac3" ))		return( FILE_IS_AC3 );
+	else if( strstr( p_type_dest, "m4a" ))		return( FILE_IS_M4A );
+	else if( strstr( p_type_dest, "wma" ))		return( FILE_IS_WMA );
+	else if( strstr( p_type_dest, "rm" ))		return( FILE_IS_RM );
+	else if( strstr( p_type_dest, "dts" ))		return( FILE_IS_DTS );
+	else if( strstr( p_type_dest, "aif" ))		return( FILE_IS_AIFF );
+	else if( strstr( p_type_dest, "shn" ))		return( FILE_IS_SHN );
+	else if( strstr( p_type_dest, "aac" ))		return( FILE_IS_AAC );
+	return FILE_IS_NONE;
+}
+
+
+//
+// Analyse options from command line
+//
+void analyse_command_line( int argc, char *argv[] )
+{
+	int c;
+
+	while (1) {
+		static struct option long_options[] =
+ {
+			{ "verbose",		no_argument,		&Detail.BoolVerboseMode,	1 },
+
+			{ "help",			no_argument,		0,							'h' },
+			{ "input",			required_argument,	0,							'i' },
+			{ "output",			required_argument,	0,							'o' },
+			{ "dest",			required_argument,	0,							'd' },
+			{ "recursion",		no_argument,		0,							'r' },
+			{ "ext2src",		no_argument,		0,							'e' },
+
+			{ "op_flac",		required_argument,	0,							1 },
+			{ "op_ape",			required_argument,	0,							2 },
+			{ "op_wavpack",		required_argument,	0,							3 },
+			{ "op_ogg",			required_argument,	0,							4 },
+			{ "op_m4a",			required_argument,	0,							5 },
+			{ "op_aac",			required_argument,	0,							6 },
+			{ "op_mpc",			required_argument,	0,							7 },
+			{ "op_mp3",			required_argument,	0,							8 },
+			{ "no_tag",			no_argument,		0,							9 },
+			{ "tag_album",		required_argument,	0,							10 },
+			{ "tag_artist",		required_argument,	0,							11 },
+			{ "tag_title",		required_argument,	0,							12 },
+			{ "tag_number",		required_argument,	0,							13 },
+			{ "tag_genre",		required_argument,	0,							14 },
+			{ "tag_year",		required_argument,	0,							15 },
+			{ "tag_comment",	required_argument,	0,							16 },
+			{ "tag_description",required_argument,	0,							17 },
+
+			{ "split",			required_argument,	0,							's' },
+			{ "length",			required_argument,	0,							'l' },
+
+			{ "frequency",		required_argument,	0,							'f' },
+			{ "track",			required_argument,	0,							't' },
+			{ "quantification",	required_argument,	0,							'q' },
+
+			{ "replaygain",		required_argument,	0,							'g' },
+
+			{ "peak",			no_argument,		&Detail.bool_peak,			1 },
+			{ "peak_album",		no_argument,		&Detail.bool_peak_album,	1 },
+			{ "mix_rms_album",	required_argument,	0,							18 },
+			{ "fix_rms",		required_argument,	0,							19 },
+
+			{ "nice",			required_argument,	0,							20 },
+
+			{ "info_files",		no_argument,		&Detail.bool_info_files,	1 },
+			{ "info_tags",		no_argument,		&Detail.bool_info_tags,		1 },
+			{ "info_head",		no_argument,		&Detail.bool_info_head,		1 },
+
+			{ "cue",			required_argument,	0,							'c' },
+
+			{0, 0, 0, 0}
+		};
+		/* getopt_long stores the option index here. */
+		int option_index = 0;
+
+		c = getopt_long( argc, argv, "hi:o:d:res:l:f:t:q:g:c:", long_options, &option_index );
+
+		/* Detect the end of the options. */
+		if( c == -1 ) break;
+
+		switch( c ) {
+		case 0:
+			/* If this option set a flag, do nothing else now. */
+			if( long_options[option_index].flag != 0 ) break;
+			if( optarg ) printf(" with arg %s\n", optarg );
+			break;
+
+		// --op_flac	1
+		case 1 :
+			if( NULL == Detail.Op_flac ) Detail.Op_flac = C_strdup( optarg );
+			break;
+		// --op_ape		2
+		case 2 :
+			if( NULL == Detail.Op_ape ) Detail.Op_ape = C_strdup( optarg );
+			break;
+		// --op_wavpack	3
+		case 3 :
+			if( NULL == Detail.Op_wavpack ) Detail.Op_wavpack = C_strdup( optarg );
+			break;
+		// --op_ogg		4
+		case 4 :
+			if( NULL == Detail.Op_ogg ) Detail.Op_ogg = C_strdup( optarg );
+			break;
+		// --op_m4a		5
+		case 5 :
+			if( NULL == Detail.Op_m4a ) Detail.Op_m4a = C_strdup( optarg );
+			break;
+		// --op_aac		6
+		case 6 :
+			if( NULL == Detail.Op_aac ) Detail.Op_aac = C_strdup( optarg );
+			break;
+		// --op_mpc		7
+		case 7 :
+			if( NULL == Detail.Op_mpc ) Detail.Op_mpc = C_strdup( optarg );
+			break;
+		// --op_mp3		8
+		case 8 :
+			if( NULL == Detail.Op_mp3 ) Detail.Op_mp3 = C_strdup( optarg );
+			break;
+
+		// --no_tag		9
+		case 9 :
+			Detail.BoolNoTag = TRUE;
+			break;
+
+		// --tag_album			10
+		case 10 :
+			if( NULL == Detail.tag_album )
+				Detail.tag_album = C_strdup( optarg );
+			break;
+		// --tag_artist			11
+		case 11 :
+			if( NULL == Detail.tag_artist )
+				Detail.tag_artist = C_strdup( optarg );
+			break;
+		// --tag_title			12
+		case 12 :
+			if( NULL == Detail.tag_title )
+				Detail.tag_title = C_strdup( optarg );
+			break;
+		// --tag_number			13
+		case 13 :
+			if( NULL == Detail.tag_number )
+				Detail.tag_number = C_strdup( optarg );
+			break;
+		// --tag_genre			14
+		case 14 :
+			if( NULL == Detail.tag_genre )
+				Detail.tag_genre = C_strdup( optarg );
+			break;
+		// --tag_year			15
+		case 15 :
+			if( NULL == Detail.tag_year )
+				Detail.tag_year = C_strdup( optarg );
+			break;
+		// --tag_comment		16
+		case 16 :
+			if( NULL == Detail.tag_comment )
+				Detail.tag_comment = C_strdup( optarg );
+			break;
+		// --tag_description	17
+		case 17 :
+			if( NULL == Detail.tag_description )
+				Detail.tag_description = C_strdup( optarg );
+			break;
+
+		// --help -h
+		case 'h' :
+			help( TRUE );
+			break;
+
+		// --input -i
+		case 'i' :
+			{
+			/*
+			--input -i Input name file to convert in inverted commas: --input "*.flac"
+			L'option de la commande [ -i, --input ] doit imperativement etre entouree de guillemets:
+				$ xcfa_cli -i "*.wav"
+				$ xcfa_cli --input "*.wav" --input "*.ogg"
+			*/
+			LIST_SEARCH *ListSearch = (LIST_SEARCH *)malloc (sizeof (LIST_SEARCH));
+			if( *optarg == '/' ) {
+				char	*Ptr = NULL;
+				ListSearch->PathNameFile = C_strdup( optarg );
+				if( NULL != (Ptr = strrchr( ListSearch->PathNameFile, '/' ))) {
+					Ptr ++;
+					ListSearch->Jocker = C_strdup( Ptr );
+					*Ptr = '\0';
+				}
+			}
+			else {
+				char	*Ptr = NULL;
+				char	*str_current_dir = get_current_dir_name();
+				ListSearch->PathNameFile = C_strdup_printf( "%s/%s", str_current_dir, optarg );
+				free( str_current_dir );
+				str_current_dir = NULL;
+				if( NULL != (Ptr = strrchr( ListSearch->PathNameFile, '/' ))) {
+					Ptr ++;
+					ListSearch->Jocker = C_strdup( Ptr );
+					*Ptr = '\0';
+				}
+			}
+			Detail.ListSearch = C_list_append( Detail.ListSearch, ListSearch );
+			}
+			break;
+
+		// --output -o
+		case 'o' :
+			{
+			char *Ptr = NULL;
+			Detail.OutputDir = C_strdup_printf( "%s/", optarg );
+			if( NULL != ( Ptr = strstr( Detail.OutputDir, "//" ))) {
+				Ptr ++;
+				*Ptr = '\0';
+			}
+			}
+			break;
+
+		// --dest -d
+		case 'd' :
+			{
+			char *p = NULL;
+			p = strtok( optarg, "," );
+			while( p != NULL ) {
+				int Dest = ret_type_dest( p );
+				if( FILE_IS_NONE != Dest ) {
+					Detail.BoolTypeDest[ Dest ] = TRUE;
+					Detail.bool_dest = TRUE;
+				}
+				else {
+					printf( "%s", BOLD_RED );
+					printf(
+					"!-------------------------------------------------------------\n"
+					"! Unknown option for: --dest %s%s%s\n"
+					"!-------------------------------------------------------------\n"
+					" -d <wav,flac,ape,...> --dest <wav,flac,ape,...>\n"
+					" Destination file: wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, aac\n",
+					BOLD_YELLOW,
+					p,
+					BOLD_RED
+					);
+					printf( "%s", RESET );
+					exit( EXIT_SUCCESS );
+				}
+				p = strtok(NULL, ",");
+			}
+			}
+			break;
+
+		// --recursion -r
+		case 'r' :
+			Detail.BoolRecursiveMode = TRUE;
+			break;
+
+		// --ext2src -e
+		case 'e' :
+			Detail.BoolExtract2Src = TRUE;
+			break;
+
+		// --split -s [ hh:mm:ss ]
+		case 's' :
+			if( 0.0 == Detail.split) {
+				int	cpt = 0;
+				char *p = NULL;
+				p = strtok( optarg, ":" );
+				while( p != NULL ) {
+					if( 0 == cpt )
+						Detail.split += (double)atoi( p ) * 3600;
+					else if( 1 == cpt )
+						Detail.split += (double)atoi( p ) * 60;
+					else if( 2 == cpt )
+						Detail.split += (double)atoi( p );
+					else if( 3 == cpt )
+						Detail.split += (double)atoi( p ) / 100.0;
+					cpt ++;
+					p = strtok(NULL, ":");
+				}
+				if( cpt < 3 || cpt > 3 ) {
+					printf( "%s", BOLD_RED );
+					printf(
+					"!-------------------------------------------------------------\n"
+					"! Error option for: --split %shh:mm:ss%s\n"
+					"!-------------------------------------------------------------\n"
+					"Management split:\n"
+					"\n"
+					" -s <hh:mm:ss> --split <hh:mm:ss> Mark the beginning of the file to be cut.\n"
+					" -l <sec> --length <sec> Specifies the length of the file to cut with the seconds parameter.\n"
+					"\n",
+					BOLD_YELLOW,
+					BOLD_RED
+					);
+					printf( "%s", RESET );
+					exit( EXIT_SUCCESS );
+				}
+				Detail.bool_split = TRUE;
+			}
+			break;
+
+		// --length -l
+		case 'l' :
+			Detail.split_length = atoi( optarg );
+			Detail.bool_split = TRUE;
+			break;
+
+		// --frequency -f
+		case 'f' :
+			Detail.frequency = atoi( optarg );
+			Detail.bool_setting_wav = TRUE;
+			break;
+		// --track -t
+		case 't' :
+			Detail.track = atoi( optarg );
+			Detail.bool_setting_wav = TRUE;
+			break;
+		// --quantification -q
+		case 'q' :
+			Detail.quantification = atoi( optarg );
+			Detail.bool_setting_wav = TRUE;
+			break;
+
+		// --replaygain -g
+		case 'g' :
+			if( strcmp( optarg, "clear" ) == 0 )
+				Detail.replaygain = OP_REPLAYGAIN_CLEAR;
+			else if( strcmp( optarg, "album" ) == 0 )
+				Detail.replaygain = OP_REPLAYGAIN_ALBUM;
+			else if( strcmp( optarg, "track" ) == 0 )
+				Detail.replaygain = OP_REPLAYGAIN_TRACK;
+			else {
+				printf( "%s", BOLD_RED );
+				printf(
+					"!-------------------------------------------------------------\n"
+					"! Unknown option for: --replaygain %s%s%s\n"
+					"!-------------------------------------------------------------\n"
+					"Replaygain: dynamic modification for next files: FLAC, MP3, OGG, WAVPACK\n"
+					"\n"
+					" -g <clear|album|track> --replaygain <clear|album|track>\n"
+					" FLAC [ clear | album ]\n"
+					" MP3 [ clear | album | track ]\n"
+					" OGG [ clear | album | track ]\n"
+					" WAVPACK [ clear | album | track ]\n"
+					"\n",
+					BOLD_YELLOW,
+					optarg,
+					BOLD_RED
+					);
+				printf( "%s", RESET );
+				exit( EXIT_SUCCESS );
+			}
+			break;
+
+		// --peak					1
+			// Detail.bool_peak
+		// --peak_album				18
+			// Detail.bool_peak_album
+		// --mix_rms_album			19
+		case 18:
+			Detail.mix_rms_album = atoi( optarg );
+			break;
+		// --fix_rms				20
+		case 19:
+			Detail.fix_rms = atoi( optarg );
+			break;
+
+		// --nice
+		case 20 :
+			Detail.Nice = atoi( optarg );
+			break;
+
+		// --cue < info | extract >
+		//
+		case 'c' :
+			if( strcmp( optarg, "info" ) == 0 )
+				Detail.cue = OP_CUE_INFO;
+			else if( strcmp( optarg, "extract" ) == 0 )
+				Detail.cue = OP_CUE_EXTRACT;
+			else {
+				printf( "%s", BOLD_RED );
+				printf(
+					"!-------------------------------------------------------------\n"
+					"! Unknown option for: --cue %s%s%s\n"
+					"!-------------------------------------------------------------\n"
+					"Management cue file:\n"
+					" -c <info|extract> --cue <info|extract>\n"
+					" info Provides information on a WAV or CUE file.\n"
+					" extract Extract all tracks of a WAV file.\n"
+					"\n",
+					BOLD_YELLOW,
+					optarg,
+					BOLD_RED
+					);
+				printf( "%s", RESET );
+				exit( EXIT_SUCCESS );
+			}
+			break;
+
+		case '?':
+			/* getopt_long already printed an error message. */
+			help( FALSE );
+			printf( "%s\n\n", BOLD_RED );
+			printf("!------------------------------\n");
+			printf("! Invalid option\n" );
+			printf("!------------------------------\n");
+			printf( "%s\n\n", RESET );
+			exit( EXIT_SUCCESS );
+			break;
+
+		default:
+			help( TRUE );
+			abort ();
+		}
+	}
+
+	/* Print any remaining command line arguments (not options). */
+	if (optind < argc) {
+		help( FALSE );
+		printf( "%s", BOLD_RED );
+//		printf ("non-option ARGV-elements: \n");
+//		while (optind < argc)
+//			printf (" %s\n", argv[optind++] );
+//		printf( "\n" );
+		printf( "!-------------------------------------------------------------\n" );
+		printf( "! You must provide an entry with the parameter '--input'\n" );
+		printf( "! --input -i Input name file to convert in inverted commas, by example: --input %s\"*.flac\"%s\n", RESET, BOLD_RED );
+		printf( "! Type input files: wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, aif, ac3\n" );
+		printf( "! See [ $ xcfa_cli --help ]\n" );
+		printf( "! See [ $ man xcfa_cli ]\n" );
+		printf( "!-------------------------------------------------------------\n" );
+		printf( "\n" );
+		printf( "%s", RESET );
+		exit( EXIT_SUCCESS );
+	}
+
+	if( argc == 1 ) help( TRUE );
+
+	// DEFAULT OPTIONS CONVERT
+	if( Detail.Op_flac == NULL)		Detail.Op_flac		= C_strdup( "-5" );
+	if( Detail.Op_ape == NULL)		Detail.Op_ape		= C_strdup( "-c2000" );
+	if( Detail.Op_wavpack == NULL)	Detail.Op_wavpack	= C_strdup( "-y -j1" );
+	if( Detail.Op_ogg == NULL)		Detail.Op_ogg		= C_strdup( "--quality=3" );
+	if( Detail.Op_m4a == NULL)		Detail.Op_m4a		= C_strdup( "-q 100" );
+	if( Detail.Op_aac == NULL)		Detail.Op_aac		= C_strdup( "48" );
+	if( Detail.Op_mpc == NULL)		Detail.Op_mpc		= C_strdup( "--verbose --overwrite --insane" );
+	if( Detail.Op_mp3 == NULL)		Detail.Op_mp3		= C_strdup( "-h --nohist --noreplaygain -b 128" );
+
+	if( NULL == Detail.OutputDir ) {
+		char	*str_current_dir = get_current_dir_name();
+		Detail.OutputDir = C_strdup_printf( "%s/", str_current_dir );
+		free( str_current_dir );
+		str_current_dir = NULL;
+	}
+
+	if( TRUE == Detail.BoolNoTag ) {
+		if( Detail.tag_album != NULL ) {
+			free( Detail.tag_album );
+			Detail.tag_album = NULL;
+		}
+		if( Detail.tag_artist != NULL ) {
+			free( Detail.tag_artist );
+			Detail.tag_artist = NULL;
+		}
+		if( Detail.tag_title != NULL ) {
+			free( Detail.tag_title );
+			Detail.tag_title = NULL;
+		}
+		if( Detail.tag_number != NULL ) {
+			free( Detail.tag_number );
+			Detail.tag_number = NULL;
+		}
+		if( Detail.tag_genre != NULL ) {
+			free( Detail.tag_genre );
+			Detail.tag_genre = NULL;
+		}
+		if( Detail.tag_year != NULL ) {
+			free( Detail.tag_year );
+			Detail.tag_year = NULL;
+		}
+		if( Detail.tag_comment != NULL ) {
+			free( Detail.tag_comment );
+			Detail.tag_comment = NULL;
+		}
+		if( Detail.tag_description != NULL ) {
+			free( Detail.tag_description );
+			Detail.tag_description = NULL;
+		}
+	}
+}
+
+
+//
+// From 'char *Directory' search 'char *jocker'.
+// Recursive search is applied if Detail.BoolRecursiveMode is TRUE
+//
+void fileanalyze_recherche_recursive( char *Directory, char *jocker )
+{
+	DIR *dp;
+	struct dirent *entry;
+	struct stat statbuf;
+	char	*Ptr = NULL;
+	TYPE_FILE_IS	TypeFileRet = FILE_IS_NONE;
+
+	if( NULL == ( dp = opendir( Directory ))) {
+		if( TRUE == C_file_test( Directory ) && utils_get_size_file( Directory ) > 100 ) {
+			if( !fnmatch( jocker, Directory, 0 )) {
+				// Accepted file:
+				// wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, aif, ac3
+				TypeFileRet = GetInfo_file_is( Directory );
+				if( TypeFileRet == FILE_IS_WAV || TypeFileRet == FILE_IS_FLAC || TypeFileRet == FILE_IS_WAVPACK ||
+					TypeFileRet == FILE_IS_OGG || TypeFileRet == FILE_IS_M4A || TypeFileRet == FILE_IS_VID_M4A ||
+					TypeFileRet == FILE_IS_MPC || TypeFileRet == FILE_IS_MP3 || TypeFileRet == FILE_IS_WMA ||
+					TypeFileRet == FILE_IS_SHN || TypeFileRet == FILE_IS_RM || TypeFileRet == FILE_IS_DTS ||
+					TypeFileRet == FILE_IS_AIFF || TypeFileRet == FILE_IS_AC3 || TypeFileRet == FILE_IS_VID_M4A ||
+					TypeFileRet == FILE_IS_CUE ) {
+
+					INFO *Info = (INFO *)malloc (sizeof (INFO));
+					Info->path_name_file = C_strdup( Directory );
+					Info->path = C_strdup( Info->path_name_file );
+					if( NULL != (Ptr = strrchr( Info->path, '/' ))) {
+						Ptr ++;
+					}
+					else {
+						Ptr = Info->path;
+					}
+					Info->name_file = C_strdup( Ptr );
+					Info->type_infosong_file_is = TypeFileRet;
+					Info->info = NULL;
+					Info->path_is_normalize = NULL;
+					Info->tmp_wav = NULL;
+					Info->tmp_sox = NULL;
+					Info->tmp_sox_24 = NULL;
+					Info->tmp_flac = NULL;
+					Info->tmp_ape = NULL;
+					Info->tmp_wavpack = NULL;
+					Info->tmp_ogg = NULL;
+					Info->tmp_m4a = NULL;
+					Info->tmp_aac = NULL;
+					Info->tmp_mpc = NULL;
+					Info->tmp_mp3 = NULL;
+					GetInfo_set( Info );
+					Detail.ListFile = C_list_append( Detail.ListFile, Info );
+				}
+			}
+		}
+		return;
+	}
+	chdir (Directory);
+	while ((entry = readdir (dp)) != NULL) {
+		lstat (entry->d_name, &statbuf);
+		if (S_ISDIR (statbuf.st_mode)) {
+			if (strcmp (".", entry->d_name) == 0 || strcmp ("..", entry->d_name) == 0) continue;
+			if( Detail.BoolRecursiveMode == TRUE )
+				fileanalyze_recherche_recursive (entry->d_name, jocker );
+		}
+		else {
+			if( !fnmatch( jocker, entry->d_name, 0 )) {
+				char	*str_current_dir = get_current_dir_name();
+
+				INFO *Info = (INFO *)malloc (sizeof (INFO));
+				Info->path_name_file = C_strdup_printf( "%s/%s", str_current_dir, entry->d_name );
+				// Accepted file:
+				// wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, aif, ac3
+				TypeFileRet = GetInfo_file_is( Info->path_name_file );
+				if( TypeFileRet == FILE_IS_WAV || TypeFileRet == FILE_IS_FLAC || TypeFileRet == FILE_IS_WAVPACK ||
+					TypeFileRet == FILE_IS_OGG || TypeFileRet == FILE_IS_M4A || TypeFileRet == FILE_IS_VID_M4A ||
+					TypeFileRet == FILE_IS_MPC || TypeFileRet == FILE_IS_MP3 || TypeFileRet == FILE_IS_WMA ||
+					TypeFileRet == FILE_IS_SHN || TypeFileRet == FILE_IS_RM || TypeFileRet == FILE_IS_DTS ||
+					TypeFileRet == FILE_IS_AIFF || TypeFileRet == FILE_IS_AC3 || TypeFileRet == FILE_IS_VID_M4A ||
+					TypeFileRet == FILE_IS_CUE ) {
+
+					Info->path = C_strdup( Info->path_name_file );
+					if( NULL != (Ptr = strrchr( Info->path, '/' ))) {
+						Ptr ++;
+						Info->name_file = C_strdup( Ptr );
+						*Ptr = '\0';
+					}
+					else {
+						Ptr = Info->path;
+						Info->name_file = C_strdup( Ptr );
+					}
+					Info->type_infosong_file_is = TypeFileRet;
+					Info->info = NULL;
+					Info->path_is_normalize = NULL;
+					Info->tmp_wav = NULL;
+					Info->tmp_sox = NULL;
+					Info->tmp_sox_24 = NULL;
+					Info->tmp_flac = NULL;
+					Info->tmp_ape = NULL;
+					Info->tmp_wavpack = NULL;
+					Info->tmp_ogg = NULL;
+					Info->tmp_m4a = NULL;
+					Info->tmp_aac = NULL;
+					Info->tmp_mpc = NULL;
+					Info->tmp_mp3 = NULL;
+					GetInfo_set( Info );
+					Detail.ListFile = C_list_append( Detail.ListFile, Info );
+				}
+				else {
+					free( Info->path_name_file );
+					Info->path_name_file = NULL;
+					free( Info );
+					Info = NULL;
+				}
+				free( str_current_dir );
+				str_current_dir = NULL;
+			}
+		}
+	}
+	chdir ("..");
+	closedir (dp);
+}
+
+
+//
+// Print all option from command line.
+// If necessary applications of convertion are present then return TRUE else FALSE.
+//
+C_BOOL test_and_print_options( void )
+{
+	C_BOOL	BoolRet = TRUE;
+	CList	*list = NULL;
+	INFO	*Info = NULL;
+	int		i;
+
+	if( NULL == Detail.ListFile ) {
+		printf( "%s", BOLD_RED );
+		printf( "!-------------------------------------------------------------\n" );
+		printf( "! You must provide an entry with the parameter '--input'\n" );
+		printf( "! --input -i Input name file to convert in inverted commas, by exemple: --input %s\"*.flac\"%s\n", RESET, BOLD_RED );
+		printf( "! Type input files: wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, wma, shorten, rm, dts, aif, ac3\n" );
+		printf( "! See [ $ xcfa_cli --help ]\n" );
+		printf( "! See [ $ man xcfa_cli ]\n" );
+		printf( "!-------------------------------------------------------------\n" );
+		printf( "\n" );
+		printf( "%s", RESET );
+		return( FALSE );
+	}
+
+	if( TRUE == Detail.bool_info_files || TRUE == Detail.bool_info_tags || TRUE == Detail.bool_info_head ) {
+		if( NULL != ( list = C_list_first( Detail.ListFile ))) {
+			while( list ) {
+				if( NULL != (Info = (INFO *)list->data) ) {
+
+					printf("\n%s\n", Info->path_name_file );
+
+					if( TRUE == Detail.bool_info_files ) {
+						printf( "\t!-------------------------------------------------------------\n" );
+						printf( "\t! --info_files\n" );
+						printf( "\t!-------------------------------------------------------------\n" );
+						if( FILE_IS_FLAC == Info->type_infosong_file_is ) {
+							printf("\ttime = %s\n", ((INFO_FLAC *)Info->info)->time );
+						}
+						else if( FILE_IS_WAV == Info->type_infosong_file_is ) {
+							printf("\ttime = %s\n", ((INFO_WAV *)Info->info)->time );
+							printf("\tLevelDbfs = %d dBFS\n", ((INFO_WAV *)Info->info)->LevelDbfs );
+							printf("\tfrequency = %s track = %s quantification = %s\n",
+									((INFO_WAV *)Info->info)->hertz,
+									((INFO_WAV *)Info->info)->voie,
+									((INFO_WAV *)Info->info)->bits
+									);
+						}
+						else if( FILE_IS_MP3 == Info->type_infosong_file_is ) {
+							printf("\ttime = %s\n", ((INFO_MP3 *)Info->info)->time );
+							printf("\tLevelDbfs = %d dBFS\n", ((INFO_MP3 *)Info->info)->LevelDbfs );
+						}
+						else if( FILE_IS_OGG == Info->type_infosong_file_is ) {
+							printf("\ttime = %s\n", ((INFO_OGG *)Info->info)->time );
+							printf("\tLevelDbfs = %d dBFS\n", ((INFO_OGG *)Info->info)->LevelDbfs );
+						}
+						else if( FILE_IS_M4A == Info->type_infosong_file_is ||
+								 FILE_IS_VID_M4A == Info->type_infosong_file_is ) {
+							printf("\ttime = %s\n", ((INFO_M4A *)Info->info)->time );
+							printf("\tfrequency = %s\n", ((INFO_M4A *)Info->info)->hertz );
+						}
+						else if( FILE_IS_AAC == Info->type_infosong_file_is ) {
+							printf("\ttime = %s\n", ((INFO_AAC *)Info->info)->time );
+							printf("\tfrequency = %s\n", ((INFO_AAC *)Info->info)->hertz );
+						}
+						else if( FILE_IS_SHN == Info->type_infosong_file_is ) {
+							printf("\ttime = %s\n", ((INFO_SHN *)Info->info)->time );
+						}
+						else if( FILE_IS_APE == Info->type_infosong_file_is ) {
+							printf("\ttime = %s\n", ((INFO_APE *)Info->info)->time );
+						}
+						else if( FILE_IS_WAVPACK == Info->type_infosong_file_is ) {
+							printf("\ttime = %s\n", ((INFO_WAVPACK *)Info->info)->time );
+						}
+						else {
+							printf("\tNone for %s\n", get_type( Info->type_infosong_file_is ));
+						}
+					}
+
+					if( TRUE == Detail.bool_info_tags ) {
+						printf( "\t!-------------------------------------------------------------\n" );
+						printf( "\t! --info_tags\n" );
+						printf( "\t!-------------------------------------------------------------\n" );
+						if( FILE_IS_FLAC == Info->type_infosong_file_is ) {
+							tags_print( Info->path_name_file, ((INFO_FLAC *)Info->info)->tags );
+						}
+						else if( FILE_IS_WAV == Info->type_infosong_file_is ) {
+							tags_print( Info->path_name_file, ((INFO_WAV *)Info->info)->tags );
+						}
+						else if( FILE_IS_MP3 == Info->type_infosong_file_is ) {
+							tags_print( Info->path_name_file, ((INFO_MP3 *)Info->info)->tags );
+						}
+						else if( FILE_IS_OGG == Info->type_infosong_file_is ) {
+							tags_print( Info->path_name_file, ((INFO_OGG *)Info->info)->tags );
+						}
+						else if( FILE_IS_M4A == Info->type_infosong_file_is ||
+								 FILE_IS_VID_M4A == Info->type_infosong_file_is ) {
+							tags_print( Info->path_name_file, ((INFO_M4A *)Info->info)->tags );
+						}
+						else if( FILE_IS_AAC == Info->type_infosong_file_is ) {
+							tags_print( Info->path_name_file, ((INFO_AAC *)Info->info)->tags );
+						}
+						else if( FILE_IS_SHN == Info->type_infosong_file_is ) {
+							tags_print( Info->path_name_file, ((INFO_SHN *)Info->info)->tags );
+						}
+						else if( FILE_IS_WMA == Info->type_infosong_file_is ) {
+							tags_print( Info->path_name_file, ((INFO_WMA *)Info->info)->tags );
+						}
+						else if( FILE_IS_RM == Info->type_infosong_file_is ) {
+							tags_print( Info->path_name_file, ((INFO_RM *)Info->info)->tags );
+						}
+						else if( FILE_IS_DTS == Info->type_infosong_file_is ) {
+							tags_print( Info->path_name_file, ((INFO_DTS *)Info->info)->tags );
+						}
+						else if( FILE_IS_AIFF == Info->type_infosong_file_is ) {
+							tags_print( Info->path_name_file, ((INFO_AIFF *)Info->info)->tags );
+						}
+						else if( FILE_IS_MPC == Info->type_infosong_file_is ) {
+							tags_print( Info->path_name_file, ((INFO_MPC *)Info->info)->tags );
+						}
+						else if( FILE_IS_APE == Info->type_infosong_file_is ) {
+							tags_print( Info->path_name_file, ((INFO_APE *)Info->info)->tags );
+						}
+						else if( FILE_IS_WAVPACK == Info->type_infosong_file_is ) {
+							tags_print( Info->path_name_file, ((INFO_WAVPACK *)Info->info)->tags );
+						}
+						else if( FILE_IS_AC3 == Info->type_infosong_file_is ) {
+							tags_print( Info->path_name_file, ((INFO_AC3 *)Info->info)->tags );
+						}
+						else {
+							printf("\tNone for %s\n", get_type( Info->type_infosong_file_is ));
+						}
+					}
+
+					if( TRUE == Detail.bool_info_head ) {
+						printf( "\t!-------------------------------------------------------------\n" );
+						printf( "\t! --info_head\n" );
+						printf( "\t!-------------------------------------------------------------\n" );
+						if( FILE_IS_WAV == Info->type_infosong_file_is ) {
+							tagswav_print_header( Info->path_name_file );
+						}
+						else if( FILE_IS_MPC == Info->type_infosong_file_is ) {
+							tagsmpc_print_header( Info->path_name_file );
+						}
+						else {
+							printf("\tNone for %s\n", get_type( Info->type_infosong_file_is ));
+						}
+					}
+				}
+				list = C_list_next( list );
+			}
+		}
+		printf( "\n" );
+		return( FALSE );
+	}
+
+	// Test the presence of external programs for: REPLAYGAIN
+	if( OP_REPLAYGAIN_NONE != Detail.replaygain ) {
+		if( TRUE == get_is_err_in( ToReplaygain )) {
+			printf( "!-------------------------------------------------------------\n" );
+			printf( "! Error to REPLAYGAIN:\n");
+			printf( "!-------------------------------------------------------------\n" );
+			if( NULL != ( list = C_list_first( Detail.ListFile ))) {
+				while( list ) {
+					if( NULL != (Info = (INFO *)list->data) ) {
+						i = Info->type_infosong_file_is;
+						switch( i ) {
+						case FILE_IS_FLAC:
+						case FILE_IS_MP3:
+						case FILE_IS_OGG:
+						case FILE_IS_WAVPACK:
+							printf("%s\n", Info->path_name_file );
+							if( FALSE == tst_prg_extern( TRUE, ToReplaygain, Info->type_infosong_file_is ))
+								BoolRet = FALSE;
+						}
+					}
+					list = C_list_next( list );
+				}
+			}
+			printf("\n");
+			BoolRet = FALSE;
+		}
+	}
+
+	// Test the presence of external programs for: NORMALIZE
+	if(	FALSE != Detail.bool_peak || FALSE != Detail.bool_peak_album || 0 != Detail.mix_rms_album || 0 != Detail.fix_rms ) {
+		if( TRUE == get_is_err_in( ToNormalize )) {
+			printf( "!-------------------------------------------------------------\n" );
+			printf( "! Error to NORMALIZE:\n");
+			printf( "!-------------------------------------------------------------\n" );
+			if( NULL != ( list = C_list_first( Detail.ListFile ))) {
+				while( list ) {
+					if( NULL != (Info = (INFO *)list->data) ) {
+						i = Info->type_infosong_file_is;
+						switch( i ) {
+						case FILE_IS_WAV:
+						case FILE_IS_MP3:
+						case FILE_IS_OGG:
+							printf("%s\n", Info->path_name_file );
+							if( FALSE == tst_prg_extern( TRUE, ToNormalize, Info->type_infosong_file_is ))
+								BoolRet = FALSE;
+						}
+					}
+					list = C_list_next( list );
+				}
+			}
+			printf("\n");
+			BoolRet = FALSE;
+		}
+	}
+
+	// Test the presence of external programs for: CONVERSION
+	if( TRUE == Detail.bool_dest || TRUE == Detail.bool_split || TRUE == Detail.bool_setting_wav ) {
+		if( TRUE == get_is_err_in( ToWav )) {
+			printf( "!-------------------------------------------------------------\n" );
+			printf( "! Error to CONV:\n");
+			printf( "!-------------------------------------------------------------\n" );
+			if( NULL != ( list = C_list_first( Detail.ListFile ))) {
+				while( list ) {
+					if( NULL != (Info = (INFO *)list->data) ) {
+						printf("%s\n", Info->path_name_file );
+						printf("\t*TO WAV\n");
+						if( FALSE == tst_prg_extern( TRUE, ToWav, Info->type_infosong_file_is ))
+							BoolRet = FALSE;
+					}
+					list = C_list_next( list );
+				}
+			}
+			for( i = 0; i < NBR_FILE_TO; i ++ )
+				if( TRUE == Detail.BoolTypeDest[ i ] ) {
+					printf("\tTO %s\n", get_type( i ));
+					if( FALSE == tst_prg_extern( TRUE, ToOther, i ))
+						BoolRet = FALSE;
+				}
+			printf("\n");
+			BoolRet = FALSE;
+		}
+	}
+	if( FALSE == BoolRet )
+		prginit_print_info();
+
+	return( BoolRet );
+}
+
+
+/* int main (int argc, char *argv[], char **envp)
+ *
+ * argc designe le nombre darguments transmis au moment du lancement de lexecutable
+ * argv designe le vecteur contenant les differents arguments
+ * envp designe le vecteur contenant les informations sur lenvironnement
+ */
+int main( int argc, char *argv[], char **envp )
+{
+	CList	*list = NULL;
+	LIST_SEARCH *ListSearch = NULL;
+#ifdef ENABLE_NLS
+	setlocale( LC_ALL, "" );
+	bindtextdomain( GETTEXT_PACKAGE, LOCALE_DIR );
+	bind_textdomain_codeset( GETTEXT_PACKAGE, "UTF-8" );
+	textdomain( GETTEXT_PACKAGE );
+#endif
+	prginit_scan();
+	analyse_command_line( argc, &argv[0] );
+	if( NULL != ( list = C_list_first( Detail.ListSearch )))
+		while( list ) {
+			if( NULL != (ListSearch = (LIST_SEARCH *)list->data) )
+				fileanalyze_recherche_recursive( ListSearch->PathNameFile, ListSearch->Jocker );
+			list = C_list_next( list );
+		}
+
+	Detail.bool_normalize =	TRUE == Detail.bool_peak || TRUE == Detail.bool_peak_album || 0 != Detail.mix_rms_album || 0 != Detail.fix_rms;
+	if( TRUE == test_and_print_options() ) {
+
+		if( OP_REPLAYGAIN_CLEAR == Detail.replaygain )
+			replaygain_set( Detail.replaygain );
+
+		if( OP_REPLAYGAIN_ALBUM == Detail.replaygain || OP_REPLAYGAIN_TRACK == Detail.replaygain )
+			replaygain_set( Detail.replaygain );
+
+		if( TRUE == Detail.bool_split && FALSE == Detail.bool_dest ) {
+			printf( "%s", BOLD_RED );
+			printf(	"!-------------------------------------------------------------\n"
+					"! Option %s--dest%s not found\n"
+					"!-------------------------------------------------------------\n"
+					" -d <wav,flac,ape,...> --dest <wav,flac,ape,...>\n"
+					" Destination file: wav, flac, ape, wavpack, ogg, m4a, mpc, mp3, aac\n"
+					"\n",
+					BOLD_YELLOW,
+					BOLD_RED
+					);
+			printf( "%s", RESET );
+
+		}
+		if( TRUE == Detail.bool_dest ) {
+			file_conv();
+		}
+		else if( TRUE == Detail.bool_setting_wav ) {
+			loop_wav_change_setting( Detail.frequency, Detail.track, Detail.quantification );
+		}
+		if( TRUE == Detail.bool_normalize ) {
+			normalize_set( Detail.bool_peak, Detail.bool_peak_album, Detail.mix_rms_album, Detail.fix_rms );
+		}
+
+		// OP_CUE_INFO
+		// OP_CUE_EXTRACT
+		if( OP_CUE_NONE != Detail.cue )
+			cue_set( Detail.cue );
+
+	}
+
+	remove_options();
+	printf( "\n" );
+
+	exit( EXIT_SUCCESS );
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

xcfa-5.0.2.tar.gz/src_cli/normalize.c Added

@@ -0,0 +1,241 @@
+/*
+ * file : src/normalize.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+// #include <fcntl.h>	// PROCESSUS NON-BLOQUANT
+
+#include "global.h"
+#include "conv.h"
+
+
+// p_type_infosong_file_is = FILE_IS_MP3 | FILE_IS_WAV | FILE_IS_OGG
+//
+CList *normalize_get_list( TYPE_FILE_IS p_type_infosong_file_is )
+{
+	CList	*list = NULL;
+	INFO	*Info = NULL;
+	CList	*list_normalize = NULL;
+
+	if( NULL != ( list = C_list_first( Detail.ListFile ))) {
+		while( list ) {
+			if( NULL != (Info = (INFO *)list->data) ) {
+				if( Info->type_infosong_file_is == p_type_infosong_file_is )
+					list_normalize = C_list_append( list_normalize, Info->path_is_normalize ? Info->path_is_normalize : Info->path_name_file );
+			}
+			list = C_list_next( list );
+		}
+	}
+	return( list_normalize );
+}
+CList *normalize_remove_glist( CList *p_list_normalize )
+{
+	CList *list = NULL;
+
+	if( p_list_normalize != NULL ) {
+		list = C_list_first( p_list_normalize );
+		while( list ) {
+			list->data = NULL;
+			list = C_list_next( list );
+		}
+		C_list_free( p_list_normalize );
+		p_list_normalize = NULL;
+	}
+	return( (CList *)NULL );
+}
+
+/*
+! Normalize: static modification for next files: MP3, WAV, OGG
+! See an excellent article by @Dzef on standardization: http://ubunteros.tuxfamily.org/spip.php?article159
+!
+! --peak Action on a single file.
+! Increase the overall level of the signal so as to bring the level to 0 dBFS peak without changing dynamics.
+! --peak_album Action on a group of files.
+! If the maximum level of one or more files is already at 0 dBFS, the level of all the selected files remain unchanged
+! after normalization. That is why this mode can be safely used almost systematically.
+! --mix_rms_album <dBFS> Action on a group of files.
+! The selecting a value for a file modifies the other files in the group.
+! --fix_rms <dBFS> Action on a single file.
+! The selecting a value for a file.
+*/
+void normalize_set( C_BOOL p_bool_peak, C_BOOL p_bool_peak_album, int p_mix_rms_album, int p_fix_rms )
+{
+	int		pos;
+	char	**PtrTabArgs = NULL;
+	CList	*list_normalize = NULL;
+	CList	*list = NULL;
+	INFO	*Info = NULL;
+	int	tab_file [ 3 ] = { FILE_IS_MP3, FILE_IS_WAV, FILE_IS_OGG };
+	int	cpt;
+
+	if( TRUE == p_bool_peak ) {
+		if( NULL != ( list = C_list_first( Detail.ListFile ))) {
+			while( list ) {
+				if( NULL != (Info = (INFO *)list->data) ) {
+					if( Info->type_infosong_file_is == FILE_IS_MP3 ||
+						Info->type_infosong_file_is == FILE_IS_WAV ||
+						Info->type_infosong_file_is == FILE_IS_OGG ) {
+
+						PtrTabArgs = conv_AllocTabArgs( &pos );
+
+						if( Info->type_infosong_file_is == FILE_IS_MP3 )
+							PtrTabArgs [ pos++ ] = C_strdup( "normalize-mp3" );
+						else if( Info->type_infosong_file_is == FILE_IS_WAV )
+							PtrTabArgs [ pos++ ] = C_strdup( "normalize" );
+						else if( Info->type_infosong_file_is == FILE_IS_OGG )
+							PtrTabArgs [ pos++ ] = C_strdup( "normalize-ogg" );
+
+						PtrTabArgs [ pos++ ] = C_strdup( "--peak" );
+						PtrTabArgs [ pos++ ] = C_strdup( Info->path_is_normalize ? Info->path_is_normalize : Info->path_name_file );
+						PtrTabArgs [ pos++ ] = C_strdup( "--" );
+						PtrTabArgs [ pos++ ] = NULL;
+						conv_to_convert( PtrTabArgs, NORMALISE_EXEC, "NORMALISE_EXEC peak" );
+						PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+					}
+				}
+				list = C_list_next( list );
+			}
+		}
+	}
+	else if( TRUE == p_bool_peak_album ) {
+		for( cpt = 0; cpt < 3; cpt ++ ) {
+			if( NULL != (list_normalize = normalize_get_list( tab_file [ cpt ] ))) {
+
+				PtrTabArgs = conv_AllocTabArgs( &pos );
+
+				if( FILE_IS_MP3 == tab_file [ cpt ] )
+					PtrTabArgs [ pos++ ] = C_strdup( "normalize-mp3" );
+				else if( FILE_IS_WAV == tab_file [ cpt ] )
+					PtrTabArgs [ pos++ ] = C_strdup( "normalize" );
+				else if( FILE_IS_OGG == tab_file [ cpt ] )
+					PtrTabArgs [ pos++ ] = C_strdup( "normalize-ogg" );
+
+				PtrTabArgs [ pos++ ] = C_strdup( "-n" );
+				list = C_list_first( list_normalize );
+				while( list ) {
+					if( NULL != list->data )
+						PtrTabArgs [ pos++ ] = C_strdup( list->data );
+					list = C_list_next( list );
+				}
+				PtrTabArgs [ pos++ ] = NULL;
+				// GET LEVEL to get value 'conv.value_PEAK_RMS_GROUP_ARGS'
+				conv_to_convert( PtrTabArgs, NORMALISE_GET_LEVEL, "NORMALISE_GET_LEVEL" );
+				PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+
+				// EXEC
+
+				PtrTabArgs = conv_AllocTabArgs( &pos );
+
+				if( FILE_IS_MP3 == tab_file [ cpt ] )
+					PtrTabArgs [ pos++ ] = C_strdup( "normalize-mp3" );
+				else if( FILE_IS_WAV == tab_file [ cpt ] )
+					PtrTabArgs [ pos++ ] = C_strdup( "normalize" );
+				else if( FILE_IS_OGG == tab_file [ cpt ] )
+					PtrTabArgs [ pos++ ] = C_strdup( "normalize-ogg" );
+
+				PtrTabArgs [ pos++ ] = C_strdup_printf( "%d,0000dB", (int)conv.value_PEAK_RMS_GROUP_ARGS );
+				list = C_list_first( list_normalize );
+				while( list ) {
+					if( NULL != list->data )
+						PtrTabArgs [ pos++ ] = C_strdup( list->data );
+					list = C_list_next( list );
+				}
+				PtrTabArgs [ pos++ ] = NULL;
+				conv_to_convert( PtrTabArgs, NORMALISE_EXEC, "NORMALISE_EXEC peak_albu" );
+				PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+				list_normalize = normalize_remove_glist( list_normalize );
+			}
+		}
+	}
+	else if( p_mix_rms_album < 0 ) {
+		for( cpt = 0; cpt < 3; cpt ++ ) {
+			if( NULL != (list_normalize = normalize_get_list( tab_file [ cpt ] ))) {
+
+				PtrTabArgs = conv_AllocTabArgs( &pos );
+
+				if( FILE_IS_MP3 == tab_file [ cpt ] )
+					PtrTabArgs [ pos++ ] = C_strdup( "normalize-mp3" );
+				else if( FILE_IS_WAV == tab_file [ cpt ] )
+					PtrTabArgs [ pos++ ] = C_strdup( "normalize" );
+				else if( FILE_IS_OGG == tab_file [ cpt ] )
+					PtrTabArgs [ pos++ ] = C_strdup( "normalize-ogg" );
+
+				PtrTabArgs [ pos++ ] = C_strdup( "-a" );
+				PtrTabArgs [ pos++ ] = C_strdup_printf( "%d,0000dB", p_mix_rms_album );
+				PtrTabArgs [ pos++ ] = C_strdup( "--batch" );
+				list = C_list_first( list_normalize );
+				while( list ) {
+					if( NULL != list->data )
+						PtrTabArgs [ pos++ ] = C_strdup( list->data );
+					list = C_list_next( list );
+				}
+				PtrTabArgs [ pos++ ] = NULL;
+				conv_to_convert( PtrTabArgs, NORMALISE_EXEC, "NORMALISE_EXEC mix_rms_album" );
+				PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+				list_normalize = normalize_remove_glist( list_normalize );
+			}
+		}
+	}
+	else if( p_fix_rms < 0 ) {
+		if( NULL != ( list = C_list_first( Detail.ListFile ))) {
+			while( list ) {
+				if( NULL != (Info = (INFO *)list->data) ) {
+					if( Info->type_infosong_file_is == FILE_IS_MP3 ||
+						Info->type_infosong_file_is == FILE_IS_WAV ||
+						Info->type_infosong_file_is == FILE_IS_OGG ) {
+
+						PtrTabArgs = conv_AllocTabArgs( &pos );
+
+						if( Info->type_infosong_file_is == FILE_IS_MP3 )
+							PtrTabArgs [ pos++ ] = C_strdup( "normalize-mp3" );
+						else if( Info->type_infosong_file_is == FILE_IS_WAV )
+							PtrTabArgs [ pos++ ] = C_strdup( "normalize" );
+						else if( Info->type_infosong_file_is == FILE_IS_OGG )
+							PtrTabArgs [ pos++ ] = C_strdup( "normalize-ogg" );
+
+						PtrTabArgs [ pos++ ] = C_strdup( "-a" );
+						PtrTabArgs [ pos++ ] = C_strdup_printf( "%d,0000dB", p_fix_rms );
+						PtrTabArgs [ pos++ ] = C_strdup( Info->path_is_normalize ? Info->path_is_normalize : Info->path_name_file );
+						PtrTabArgs [ pos++ ] = NULL;
+						conv_to_convert( PtrTabArgs, NORMALISE_EXEC, "NORMALISE_EXEC fix_rms" );
+						PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+					}
+				}
+				list = C_list_next( list );
+			}
+		}
+	}
+}
+
+
+
+
+
+
+
+

xcfa-5.0.2.tar.gz/src_cli/prg_init.c Added

@@ -0,0 +1,288 @@
+/*
+ * file : src/prg_init.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#include <string.h>
+#include <stdio.h>
+
+#include "global.h"
+#include "prg_init.h"
+
+
+/*
+*---------------------------------------------------------------------------
+* VARIABLES
+*---------------------------------------------------------------------------
+*/
+
+
+
+PRGINIT PrgInit;
+
+
+TABLEAU_PRG_EXTERN TableauPrgExtern [ NMR_MAX_TABLEAU ] = {
+
+{
+"a52dec",								// NAME1
+"",										// NAME2
+"",										// NAME3
+&PrgInit.bool_a52dec,					// FOUND
+NULL,									// PTR ON Name 1 | 2 | 3
+gettext_noop(" Decode ATSC A/52 audio streams")
+},
+{
+"aacplusenc",							// NAME1
+"",										// NAME2
+"",										// NAME3
+&PrgInit.bool_aacplusenc,				// FOUND
+NULL,									// PTR ON Name 1 | 2 | 3
+gettext_noop(" AAC+ encoder")
+},
+{
+"mp3check",								// NAME1
+"checkmp3",								// NAME2
+"mp3_check",							// NAME3
+&PrgInit.bool_checkmp3,					// FOUND
+NULL,									// PTR ON Name 1 | 2 | 3
+gettext_noop(" Cherche des renseignements sur les formats mp3")
+},
+{
+"faac",									// NAME1
+"",										// NAME2
+"",										// NAME3
+&PrgInit.bool_faac,						// FOUND
+NULL,									// PTR ON Name 1 | 2 | 3
+gettext_noop(" Audio Codeur freeware")
+},
+{
+"faad",									// NAME1
+"faad2",								// NAME2
+"",										// NAME3
+&PrgInit.bool_faad,						// FOUND
+NULL,									// PTR ON Name 1 | 2 | 3
+gettext_noop(" MPEG-4 AAC decodeur")
+},
+{
+"flac",									// NAME1
+"",										// NAME2
+"",										// NAME3
+&PrgInit.bool_flac,						// FOUND
+NULL,									// PTR ON Name 1 | 2 | 3
+gettext_noop(" Conversion wav : flac")
+},
+{
+"lame",									// NAME1
+"",										// NAME2
+"",										// NAME3
+&PrgInit.bool_lame,						// FOUND
+NULL,									// PTR ON Name 1 | 2 | 3
+gettext_noop(" Conversion wav : mp3")
+},
+// ADD
+{
+"mac",									// NAME1
+"",										// NAME2
+"",										// NAME3
+&PrgInit.bool_ape,						// FOUND
+NULL,									// PTR ON Name 1 | 2 | 3
+gettext_noop(" Monkey's Audio Console Front End : APE")
+},
+// ADD TO amd64 and i386
+{
+"mpcdec",								// NAME1
+"mppdec",								// NAME2
+"mpc123",								// NAME3
+&PrgInit.bool_mpc123_mppdec,			// FOUND
+NULL,									// PTR ON Name 1 | 2 | 3
+gettext_noop(" MusePack commandline utilities")
+},
+{
+"mpcenc",								// NAME1
+"mppenc",								// NAME2
+"",										// NAME3
+&PrgInit.bool_mppenc,					// FOUND
+NULL,									// PTR ON Name 1 | 2 | 3
+gettext_noop(" MusePack commandline utilities")
+},
+{
+"mplayer",								// NAME1
+"",										// NAME2
+"",										// NAME3
+&PrgInit.bool_mplayer,					// FOUND
+NULL,									// PTR ON Name 1 | 2 | 3
+gettext_noop(" Lecteur et extracteur")
+},
+{
+"mp3gain",								// NAME1
+"",										// NAME2
+"",										// NAME3
+&PrgInit.bool_mp3gain,					// FOUND
+NULL,									// PTR ON Name 1 | 2 | 3
+gettext_noop(" Replaygain pour les fichiers mp3")
+},
+{
+"normalize-audio",						// NAME1
+"normalize",							// NAME2
+"",										// NAME3
+&PrgInit.bool_normalize,				// FOUND
+NULL,									// PTR ON Name 1 | 2 | 3
+gettext_noop(" Normaliseur de fichier wav")
+},
+{
+"libnotify-bin",						// NAME1
+"notify-send",							// NAME2
+"",										// NAME3
+&PrgInit.bool_notify_send,				// FOUND
+NULL,									// PTR ON Name 1 | 2 | 3
+gettext_noop(" A program to send desktop notifications")
+},
+{
+"shorten",								// NAME1
+"",										// NAME2
+"",										// NAME3
+&PrgInit.bool_shorten,					// FOUND
+NULL,									// PTR ON Name 1 | 2 | 3
+gettext_noop(" Forte compression au format wave")
+},
+{
+"shntool",								// NAME1
+"",										// NAME2
+"",										// NAME3
+&PrgInit.bool_shntool,					// FOUND
+NULL,									// PTR ON Name 1 | 2 | 3
+gettext_noop(" Decoupage de fichiers sans decodage")
+},
+{
+"sox",									// NAME1
+"",										// NAME2
+"",										// NAME3
+&PrgInit.bool_sox,						// FOUND
+NULL,									// PTR ON Name 1 | 2 | 3
+gettext_noop(" Transformation universelle de fichiers son")
+},
+{
+"oggenc",								// NAME1
+"",										// NAME2
+"",										// NAME3
+&PrgInit.bool_oggenc,					// FOUND
+NULL,									// PTR ON Name 1 | 2 | 3
+gettext_noop(" Conversion wav : ogg")
+},
+{
+"vorbisgain",							// NAME1
+"",										// NAME2
+"",										// NAME3
+&PrgInit.bool_vorbisgain,				// FOUND
+NULL,									// PTR ON Name 1 | 2 | 3
+gettext_noop(" Replaygain pour les fichiers ogg")
+},
+{
+"wavpack",								// NAME1
+"",										// NAME2
+"",										// NAME3
+&PrgInit.bool_wavpack,					// FOUND
+NULL,									// PTR ON Name 1 | 2 | 3
+gettext_noop(" WAVPACK Hybrid Lossless Audio Compressor")
+}
+};
+
+
+
+// GET INFOS FROM STRUCT
+//
+char *prginit_get_name (TYPE_PROGINIT TypeEnum)
+{
+	return ((char *)TableauPrgExtern [ TypeEnum ] . PtrName);
+}
+//
+//
+char *prginit_get_Description (TYPE_PROGINIT TypeEnum)
+{
+	return (gettext((char *)TableauPrgExtern [ TypeEnum ] . Description));
+}
+//
+//
+C_BOOL prginit_elem_is_present (TYPE_PROGINIT TypeEnum)
+{
+	return ((C_BOOL)*TableauPrgExtern [ TypeEnum ] . BoolFound);
+}
+//
+//
+void prginit_print_info (void)
+{
+	int	index;
+
+	// printf ("!------------------------------\n");
+	printf ("! INSTALL NAME DESCRIPTION\n");
+	printf( "!-------------------------------------------------------------\n" );
+	for (index = 0; index < NMR_MAX_TABLEAU; index ++)
+		printf(
+			"!%s %s %-12s %s%s\n",
+			(*TableauPrgExtern [ index ] . BoolFound == TRUE) ?	RESET : BOLD_RED,
+			(*TableauPrgExtern [ index ] . BoolFound == TRUE) ? "Yes " : " NO --> ",
+			TableauPrgExtern [ index ] . PtrName,
+			TableauPrgExtern [ index ] . Description,
+			RESET
+				);
+	// printf ("!------------------------------\n\n");
+}
+//
+//
+void prginit_scan (void)
+{
+	int	index;
+
+	for (index = 0; index < NMR_MAX_TABLEAU; index ++) {
+
+		// INIT VAR
+
+		*TableauPrgExtern [ index ] . BoolFound = FALSE;
+		TableauPrgExtern [ index ] . PtrName = NULL;
+
+		// CHERCHE LE NOM APPROPRIE SUIVANT LA DISTRIBUTION UTILISEE
+
+		*TableauPrgExtern [ index ] . BoolFound = C_find_program_in_path (TableauPrgExtern [ index ] . Name1);
+		TableauPrgExtern [ index ] . PtrName = TableauPrgExtern [ index ] .Name1;
+
+		if (*TableauPrgExtern [ index ] . BoolFound == FALSE) {
+			if (*TableauPrgExtern [ index ] . Name2 != '\0') {
+				if ((*TableauPrgExtern [ index ] . BoolFound = C_find_program_in_path (TableauPrgExtern [ index ] . Name2)) == TRUE) {
+					TableauPrgExtern [ index ] . PtrName = TableauPrgExtern [ index ] .Name2;
+				}
+			}
+		}
+
+		if (*TableauPrgExtern [ index ] . BoolFound == FALSE) {
+			if (*TableauPrgExtern [ index ] . Name3 != '\0') {
+				if ((*TableauPrgExtern [ index ] . BoolFound = C_find_program_in_path (TableauPrgExtern [ index ] . Name3)) == TRUE) {
+					TableauPrgExtern [ index ] . PtrName = TableauPrgExtern [ index ] .Name3;
+				}
+			}
+		}
+	}
+}
+
+

xcfa-5.0.2.tar.gz/src_cli/prg_init.h Added

@@ -0,0 +1,93 @@
+/*
+ *  file      : src/prg_init.h
+ *  project   : xcfa_cli
+ *  copyright : (C) 2014 by BULIN Claude
+ *
+ *  This file is part of xcfa_cli project
+ *
+ *  xcfa_cli is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; version 3.
+ *
+ *  xcfa_cli is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ *  USA
+ */
+
+
+
+#ifndef prg_init_h
+#define prg_init_h 1
+
+
+typedef enum {
+	NMR_a52dec = 0,						//
+	NMR_aacplusenc,						//
+	NMR_checkmp3,						//
+	NMR_faac,							//
+	NMR_faad,							//
+	NMR_flac,							//
+	NMR_lame,							//
+	NMR_mac,							//
+	NMR_musepack_tools_mppdec,			//
+	NMR_musepack_tools_mppenc,			//
+	NMR_mplayer,						//
+	NMR_mp3gain,						//
+	NMR_normalize,						//
+	NMR_libnotify_bin,					//
+	NMR_shorten,						//
+	NMR_shntool,						//
+	NMR_sox,							//
+	NMR_vorbis_tools_oggenc,			//
+	NMR_vorbisgain,						//
+	NMR_wavpack,						//
+	NMR_MAX_TABLEAU						//
+} TYPE_PROGINIT;
+
+typedef struct {
+	char		*Name1;					// NAME1
+	char		*Name2;					// NAME2
+	char		*Name3;					// NAME3
+	C_BOOL		*BoolFound;				// FOUND
+	char		*PtrName;				// PTR ON Name 1 | 2 | 3
+	char		*Description;			// DESCRIPTION TREE-VIEW
+} TABLEAU_PRG_EXTERN;
+
+typedef struct {
+	C_BOOL	bool_a52dec;			//
+	C_BOOL	bool_notify_send;		//
+	C_BOOL	bool_ape;				//
+	C_BOOL	bool_mpc123_mppdec;		//
+	C_BOOL	bool_mppenc;			//
+	C_BOOL	bool_cdda2wav;			//
+	C_BOOL	bool_lame;				//
+	C_BOOL	bool_oggenc;			//
+	C_BOOL	bool_sox;				//
+	C_BOOL	bool_normalize;			//
+	C_BOOL	bool_checkmp3;			//
+	C_BOOL	bool_faad;				//
+	C_BOOL	bool_faac;				//
+	C_BOOL	bool_mplayer;			//
+	C_BOOL	bool_shorten;			//
+	C_BOOL	bool_vorbisgain;		//
+	C_BOOL	bool_flac;				//
+	C_BOOL	bool_mp3gain;			//
+	C_BOOL	bool_wavpack;			//
+	C_BOOL	bool_shntool;			//
+	C_BOOL	bool_aacplusenc;		//
+} PRGINIT;
+
+extern PRGINIT PrgInit;
+
+char		*prginit_get_name (TYPE_PROGINIT TypeEnum);
+void		prginit_scan( void );
+void		prginit_print_info( void );
+
+#endif
+

xcfa-5.0.2.tar.gz/src_cli/replaygain.c Added

@@ -0,0 +1,230 @@
+/*
+ * file : src/replaygain.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+// #include <fcntl.h>	// PROCESSUS NON-BLOQUANT
+
+#include "global.h"
+#include "conv.h"
+
+
+
+//
+// Renvoie une liste de pointeur sur les fichier de type 'TYPE_FILE_IS p_type_infosong_file_is'
+// depuis la liste choisie par l'utilisateur ou renvoie NULL
+//
+CList *replaygain_get_list( TYPE_FILE_IS p_type_infosong_file_is )
+{
+	CList		*list = NULL;
+	INFO		*Info = NULL;
+	CList		*list_replaygain = NULL;
+
+	if( NULL != ( list = C_list_first( Detail.ListFile ))) {
+		while( list ) {
+			if( NULL != (Info = (INFO *)list->data) ) {
+				if( Info->type_infosong_file_is == p_type_infosong_file_is )
+					list_replaygain = C_list_append( list_replaygain, Info->path_name_file );
+			}
+			list = C_list_next( list );
+		}
+	}
+	return( list_replaygain );
+}
+//
+// Annule le pointeur de structure et detruit la liste 'CList *p_list'
+// Renvoie NULL
+//
+CList *replaygain_remove_glist( CList *p_list )
+{
+	CList *list = NULL;
+
+	if( p_list != NULL ) {
+		list = C_list_first( p_list );
+		while( list ) {
+			list->data = NULL;
+			list = C_list_next( list );
+		}
+		C_list_free( p_list );
+		p_list = NULL;
+	}
+	return( (CList *)NULL );
+}
+//
+// FILE_IS_FLAC, FILE_IS_MP3, FILE_IS_OGG, FILE_IS_WAVPACK
+//
+C_BOOL replaygain_verify_list( void )
+{
+	CList		*list = NULL;
+	INFO		*Info = NULL;
+
+	if( NULL != ( list = C_list_first( Detail.ListFile ))) {
+		while( list ) {
+			if( NULL != (Info = (INFO *)list->data) ) {
+				if( Info->type_infosong_file_is == FILE_IS_FLAC ||
+					Info->type_infosong_file_is == FILE_IS_MP3 ||
+					Info->type_infosong_file_is == FILE_IS_OGG ||
+					Info->type_infosong_file_is == FILE_IS_WAVPACK )
+					return( TRUE );
+			}
+			list = C_list_next( list );
+		}
+	}
+	return( FALSE );
+}
+
+
+/*
+ Verify if exist file type:
+ FILE_IS_FLAC
+ FILE_IS_MP3
+ FILE_IS_OGG
+ FILE_IS_WAVPACK
+ and assign type 'OP_REPLAYGAIN TypeReplaygain'
+
+
+ ! Replaygain: dynamic modification for next files: FLAC, MP3, OGG, WAVPACK
+ !
+ ! -g <clear|album|track> --replaygain <clear|album|track>
+ ! FLAC [ clear | album ]
+ ! MP3 [ clear | album | track ]
+ ! OGG [ clear | album | track ]
+ ! WAVPACK [ clear | album | track ]
+*/
+void replaygain_set( OP_REPLAYGAIN TypeReplaygain )
+{
+	CList	*list_replaygain = NULL;
+	CList	*list = NULL;
+	int		pos;
+	char	**PtrTabArgs = NULL;
+	int		tab_file [ 4 ] = { FILE_IS_FLAC, FILE_IS_MP3, FILE_IS_OGG, FILE_IS_WAVPACK };
+	int		cpt;
+	C_BOOL	bool_replaygain = FALSE;
+	char	StrReplaygainDetail[ 40 ];
+
+	if( FALSE == replaygain_verify_list() ) {
+		printf( "%s", BOLD_RED );
+		printf("\n!--- R E P L A Y G A I N -----------------------------------!\n");
+		printf( "! \n");
+		printf( "! File: FLAC or MP3 or OGG or WAVPACK not found\n" );
+		printf( "! \n");
+		printf( "!------------------------------------------------------------!\n" );
+		printf( "\n" );
+		printf( "%s", RESET );
+		return;
+	}
+
+	for( cpt = 0; cpt < 4; cpt ++ ) {
+		if( NULL != (list_replaygain = replaygain_get_list( tab_file [ cpt ] ))) {
+
+			bool_replaygain = FALSE;
+			PtrTabArgs = conv_AllocTabArgs( &pos );
+
+			if( FILE_IS_FLAC == tab_file [ cpt ] && OP_REPLAYGAIN_TRACK != TypeReplaygain ) {
+
+				bool_replaygain = TRUE;
+				PtrTabArgs [ pos++ ] = C_strdup( "metaflac" );
+				if( OP_REPLAYGAIN_CLEAR == TypeReplaygain )
+					PtrTabArgs [ pos++ ] = C_strdup( "--remove-replay-gain" );
+				else if( OP_REPLAYGAIN_ALBUM == TypeReplaygain )
+					PtrTabArgs [ pos++ ] = C_strdup( "--add-replay-gain" );
+
+			}
+			else if( FILE_IS_MP3 == tab_file [ cpt ] ) {
+
+				bool_replaygain = TRUE;
+				PtrTabArgs [ pos++ ] = C_strdup( "mp3gain" );
+				if( OP_REPLAYGAIN_CLEAR == TypeReplaygain ) {
+					PtrTabArgs [ pos++ ] = C_strdup( "-s" );
+					PtrTabArgs [ pos++ ] = C_strdup( "d" );
+				}
+				else if( OP_REPLAYGAIN_ALBUM == TypeReplaygain ) {
+					PtrTabArgs [ pos++ ] = C_strdup( "-a" );
+					PtrTabArgs [ pos++ ] = C_strdup( "-p" );
+					PtrTabArgs [ pos++ ] = C_strdup( "-c" );
+					PtrTabArgs [ pos++ ] = C_strdup( "-f" );
+					PtrTabArgs [ pos++ ] = C_strdup( "-T" );
+				}
+				else if( OP_REPLAYGAIN_TRACK == TypeReplaygain ) {
+					PtrTabArgs [ pos++ ] = C_strdup( "-r" );
+					PtrTabArgs [ pos++ ] = C_strdup( "-p" );
+					PtrTabArgs [ pos++ ] = C_strdup( "-c" );
+					PtrTabArgs [ pos++ ] = C_strdup( "-f" );
+					PtrTabArgs [ pos++ ] = C_strdup( "-T" );
+				}
+
+			}
+			else if( FILE_IS_OGG == tab_file [ cpt ] ) {
+
+				bool_replaygain = TRUE;
+				PtrTabArgs [ pos++ ] = C_strdup( "vorbisgain" );
+				if( OP_REPLAYGAIN_CLEAR == TypeReplaygain )
+					PtrTabArgs [ pos++ ] = C_strdup ("-c" );
+				else if( OP_REPLAYGAIN_ALBUM == TypeReplaygain )
+					PtrTabArgs [ pos++ ] = C_strdup ("-a" );
+				else if( OP_REPLAYGAIN_TRACK == TypeReplaygain );
+					// None op
+
+			}
+			else if( FILE_IS_WAVPACK == tab_file [ cpt ] ) {
+
+				bool_replaygain = TRUE;
+				PtrTabArgs [ pos++ ] = C_strdup ("wvgain" );
+				if( OP_REPLAYGAIN_CLEAR == TypeReplaygain )
+					PtrTabArgs [ pos++ ] = C_strdup( "-c" );
+				else if( OP_REPLAYGAIN_ALBUM == TypeReplaygain )
+					PtrTabArgs [ pos++ ] = C_strdup( "-a" );
+				else if( OP_REPLAYGAIN_TRACK == TypeReplaygain );
+					// None op
+
+			}
+
+			if( TRUE == bool_replaygain ) {
+				list = C_list_first( list_replaygain );
+				while( list ) {
+					if( NULL != list->data )
+						PtrTabArgs [ pos++ ] = C_strdup( list->data );
+					list = C_list_next( list );
+				}
+				PtrTabArgs [ pos++ ] = NULL;
+
+				if( OP_REPLAYGAIN_CLEAR == TypeReplaygain )
+					strcpy( StrReplaygainDetail, "REPLAYGAIN clear" );
+				else if( OP_REPLAYGAIN_ALBUM == TypeReplaygain )
+					strcpy( StrReplaygainDetail, "REPLAYGAIN album" );
+				else if( OP_REPLAYGAIN_TRACK == TypeReplaygain )
+					strcpy( StrReplaygainDetail, "REPLAYGAIN track" );
+
+				conv_to_convert( PtrTabArgs, REPLAYGAIN, StrReplaygainDetail );
+			}
+			PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+			list_replaygain = replaygain_remove_glist( list_replaygain );
+		}
+	}
+}
+

xcfa-5.0.2.tar.gz/src_cli/split.c Added

@@ -0,0 +1,143 @@
+/*
+ * file : src/split.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "global.h"
+#include "tags.h"
+#include "conv.h"
+
+
+//
+// Split file 'char *p_pathnamefile' from 'double p_split_begin_ss' for a length of 'int p_split_length_ss'
+//
+void split_wav( char *p_pathnamefile, double p_split_begin_ss, int p_split_length_ss )
+{
+	WAVE	WaveHeader;
+	double	Percent = 0.;
+	double	PercentBegin;
+	double	PercentEnd;
+	char	*NewName = NULL;
+	char	*buffer = NULL;
+	FILE	*fp = NULL;
+	size_t	Ret;
+	size_t	RetRead;
+	size_t	WriteValue;
+
+	if (FALSE == tagswav_read_file( p_pathnamefile, &WaveHeader )) {
+		tagswav_close_file( &WaveHeader );
+		printf ( "%s", BOLD_RED );
+		printf("\n!--- S P L I T ----------------\n");
+		printf ( "! File not found to split operation: \"%s\"", p_pathnamefile );
+		printf ( "%s\n\n", RESET );
+		return;
+	}
+	if( (p_split_begin_ss + p_split_length_ss) > (WaveHeader.DATA.Subchunk2Size / WaveHeader.FMT.ByteRate) ) {
+		printf ( "%s", BOLD_RED );
+		printf("\n!--- S P L I T ----------------\n");
+		printf ( "! The size of the '--split' and '--length' is greater than the size of the file." );
+		printf ( "! %s\n", p_pathnamefile );
+		printf ( "! %d secondes\n", WaveHeader.DATA.Subchunk2Size / WaveHeader.FMT.ByteRate );
+		printf ( "%s\n\n", RESET );
+		tagswav_close_file( &WaveHeader );
+		return;
+	}
+
+	PercentBegin = (((double)p_split_begin_ss * (double)WaveHeader.FMT.ByteRate) / WaveHeader.DATA.Subchunk2Size) * 100.0;
+	PercentEnd = (((double)p_split_length_ss * (double)WaveHeader.FMT.ByteRate) / WaveHeader.DATA.Subchunk2Size) * 100.0;
+	PercentEnd += PercentBegin;
+
+	NewName = C_strdup_printf( "%s.split.wav", p_pathnamefile );
+
+	printf("\n!--- S P L I T ---------------------------------------------!\n");
+	printf( "! %s\n", p_pathnamefile );
+	printf( "! %s\n", NewName );
+
+	buffer = (char *)malloc ((sizeof(char) * BUFSIZ) + 10);
+
+	fp = fopen( NewName, "w" );
+	// ECRITURE ENTETE FICHIER WAV
+	fwrite( &WaveHeader.RIFF.ChunkID, 4, 1, fp );		// RIFF
+	fwrite( &WaveHeader.RIFF.ChunkSize, 4, 1, fp );		// taille du fichier entier en octets (sans compter les 8 octets de ce champ et le champ précédent
+	fwrite( &WaveHeader.RIFF.Format, 4, 1, fp );		// WAVE
+	fwrite( &WaveHeader.FMT.Subchunk1ID, 4, 1, fp );	// 'fmt '
+	fwrite( &WaveHeader.FMT.Subchunk1Size, 4, 1, fp );	// taille en octet des données à suivre
+	fwrite( &WaveHeader.FMT.AudioFormat, 2, 1, fp );	// format de compression (une valeur autre que 1 indique une compression)
+	fwrite( &WaveHeader.FMT.NumChannels, 2, 1, fp );	// nombre de canaux
+	fwrite( &WaveHeader.FMT.SampleRate, 4, 1, fp );		// fréquence d'échantillonage (nombre d'échantillons par secondes)
+	fwrite( &WaveHeader.FMT.ByteRate, 4, 1, fp );		// nombre d'octects par secondes
+	fwrite( &WaveHeader.FMT.Blockalign, 2, 1, fp );		// nombre d'octects pour coder un échantillon
+	fwrite( &WaveHeader.FMT.BitsPerSample, 2, 1, fp );	// nombre de bits pour coder un échantillon
+	fwrite( &WaveHeader.DATA.Subchunk2ID, 4, 1, fp );	// 'data'
+	fwrite( &WaveHeader.DATA.Subchunk2Size, 4, 1, fp );	// taille des données audio( nombre total d'octets codant les données audio)
+
+	RetRead = 0;
+	WriteValue = 0;
+	while(( Ret = fread (buffer, 1, BUFSIZ, WaveHeader.file )) > 0) {
+		RetRead += Ret;
+		Percent = (float)(RetRead / (float)WaveHeader.DATA.Subchunk2Size) * 100.0;
+		if( Percent >= PercentBegin ) {
+			fwrite( buffer, Ret, 1, fp );
+			WriteValue += Ret;
+	 	}
+		if( Percent > PercentEnd ) break;
+	}
+	/*
+	fseek( fp, 4L, SEEK_SET );
+	WriteValue += 44;
+	WriteValue -= 8;
+	fwrite( &WriteValue, 4, 1, fp );	// taille du fichier entier en octets (sans compter les 8 octets de ce champ et le champ précédent
+	fseek( fp, 40L, SEEK_SET );
+	WriteValue += 8;
+	WriteValue -= 44;
+	fwrite( &WriteValue, 4, 1, fp );	// taille des données audio( nombre total d'octets codant les données audio )
+	*/
+	fseek( fp, 40L, SEEK_SET );
+	fwrite( &WriteValue, 4, 1, fp );	// taille des données audio( nombre total d'octets codant les données audio )
+	fseek( fp, 4L, SEEK_SET );
+	WriteValue += 44;
+	WriteValue -= 8;
+	fwrite( &WriteValue, 4, 1, fp );	// taille du fichier entier en octets (sans compter les 8 octets de ce champ et le champ précédent
+
+	tagswav_close_file( &WaveHeader );
+	fclose (fp );
+	fp = NULL;
+
+	conv_copy_src_to_dest( NewName, p_pathnamefile );
+
+	remove( NewName );
+
+	free( NewName );
+	NewName = NULL;
+	free( buffer );
+	buffer = NULL;
+}
+
+

xcfa-5.0.2.tar.gz/src_cli/tags.c Added

@@ -0,0 +1,342 @@
+/*
+ * file : src/tags.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#include <sys/types.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "global.h"
+#include "tags.h"
+#include <taglib/tag_c.h>
+
+
+
+//
+//
+TAGS *tags_alloc( void )
+{
+	TAGS *new_tag = (TAGS *)malloc (sizeof (TAGS));
+	new_tag->Album = NULL;
+	new_tag->Artist = NULL;
+	new_tag->Title = NULL;
+	new_tag->Number = NULL;
+	new_tag->Genre = NULL;
+	new_tag->Year = NULL;
+	new_tag->Comment = NULL;
+	new_tag->Description = NULL;
+	new_tag->IntNumber = 1;
+	new_tag->IntGenre = 1;
+	new_tag->IntYear = 1962;
+	return( (TAGS *)new_tag );
+}
+//
+//
+TAGS *tags_remove (TAGS *p_tags)
+{
+	if (NULL != p_tags) {
+		if( NULL != p_tags->Album ) 		{	free( p_tags->Album );		p_tags->Album = NULL;		}
+		if( NULL != p_tags->Artist )		{ 	free( p_tags->Artist );		p_tags->Artist = NULL;		}
+		if( NULL != p_tags->Title )			{	free( p_tags->Title );		p_tags->Title = NULL;		}
+		if( NULL != p_tags->Number )		{	free( p_tags->Number );		p_tags->Number = NULL;		}
+		if( NULL != p_tags->Genre )			{ 	free( p_tags->Genre );		p_tags->Genre = NULL;		}
+		if( NULL != p_tags->Year )			{ 	free( p_tags->Year );			p_tags->Year = NULL;		}
+		if( NULL != p_tags->Comment )		{ 	free( p_tags->Comment );		p_tags->Comment = NULL;		}
+		if( NULL != p_tags->Description )	{ 	free( p_tags->Description );	p_tags->Description = NULL;	}
+		free( p_tags );
+		p_tags = NULL;
+	}
+	return( (TAGS *)NULL );
+}
+
+
+//
+//
+void tags_complementation( TAGS *p_tags, char *path_name_file )
+{
+	char *Ptr = NULL;
+
+	// Album
+	// Artist
+	if( p_tags->Artist == NULL ) {
+		if( NULL != (Ptr = strrchr( path_name_file, '/' ))) {
+			Ptr ++;
+			p_tags->Artist = C_strdup( Ptr );
+		}
+		else {
+			p_tags->Artist = C_strdup( path_name_file );
+		}
+		if( NULL != (Ptr = strrchr( p_tags->Artist, '.' ))) *Ptr = '\0';
+	}
+	// Title
+	if( p_tags->Title == NULL ) {
+		if( NULL != (Ptr = strrchr( path_name_file, '/' ))) {
+			Ptr ++;
+			p_tags->Title = C_strdup( Ptr );
+		}
+		else {
+			p_tags->Title = C_strdup( path_name_file );
+		}
+		if( NULL != (Ptr = strrchr( p_tags->Title, '.' ))) *Ptr = '\0';
+	}
+	// Number
+	// IntNumber
+	if( NULL == p_tags->Number ) {
+		p_tags->Number = C_strdup( "1" );
+		p_tags->IntNumber = 1;
+	} else {
+		p_tags->IntNumber = atoi( p_tags->Number );
+	}
+	// Genre
+	// IntGenre
+	if( NULL == p_tags->Genre ) {
+		p_tags->Genre = C_strdup( "1" );
+		p_tags->IntGenre = 1;
+	} else {
+		p_tags->IntGenre = atoi( p_tags->Genre );
+	}
+	// Year
+	// IntYear
+	if( NULL == p_tags->Year ) {
+		p_tags->Year = C_strdup( "1962" );
+		p_tags->IntYear = 1962;
+	} else {
+		p_tags->IntYear = atoi( p_tags->Year );
+	}
+	// Comment
+	// Description
+}
+
+
+STRUCT_TAGS_FILE_MP3 StructTagsFileMp3 [] = {
+
+{123, "A Cappella"},
+{ 74, "Acid Jazz"},
+{ 73, "Acid Punk"},
+{ 34, "Acid"},
+{ 99, "Acoustic"},
+{ 40, "Alt. Rock"},
+{ 20, "Alternative"},
+{ 26, "Ambient"},
+{145, "Anime"},
+{ 90, "Avantgarde"},
+{116, "Ballad"},
+{ 41, "Bass"},
+{135, "Beat"},
+{ 85, "Bebob"},
+{ 96, "Big Band"},
+{138, "Black Metal"},
+{ 89, "Bluegrass"},
+{ 0, "Blues"},
+{107, "Booty Bass"},
+{132, "BritPop"},
+{ 65, "Cabaret"},
+{ 88, "Celtic"},
+{104, "Chamber Music"},
+{102, "Chanson"},
+{ 97, "Chorus"},
+{136, "Christian Gangsta Rap"},
+{ 61, "Christian Rap"},
+{141, "Christian Rock"},
+{ 1, "Classic Rock"},
+{ 32, "Classical"},
+{128, "Club-House"},
+{112, "Club"},
+{ 57, "Comedy"},
+{140, "Contemporary Christian"},
+{ 2, "Country"},
+{139, "Crossover"},
+{ 58, "Cult"},
+{125, "Dance Hall"},
+{ 3, "Dance"},
+{ 50, "Darkwave"},
+{ 22, "Death Metal"},
+{ 4, "Disco"},
+{ 55, "Dream"},
+{127, "Drum & Bass"},
+{122, "Drum Solo"},
+{120, "Duet"},
+{ 98, "Easy Listening"},
+{ 52, "Electronic"},
+{ 48, "Ethnic"},
+{124, "Euro-House"},
+{ 25, "Euro-Techno"},
+{ 54, "Eurodance"},
+{ 84, "Fast-Fusion"},
+{ 81, "Folk/Rock"},
+{115, "Folklore"},
+{ 80, "Folk"},
+{119, "Freestyle"},
+{ 5, "Funk"},
+{ 30, "Fusion"},
+{ 36, "Game"},
+{ 59, "Gangsta Rap"},
+{126, "Goa"},
+{ 38, "Gospel"},
+{ 91, "Gothic Rock"},
+{ 49, "Gothic"},
+{ 6, "Grunge"},
+{ 79, "Hard Rock"},
+{129, "Hardcore"},
+{137, "Heavy Metal"},
+{ 7, "Hip-Hop"},
+{ 35, "House"},
+{100, "Humour"},
+{131, "Indie"},
+{ 19, "Industrial"},
+{ 46, "Instrumental Pop"},
+{ 47, "Instrumental Rock"},
+{ 33, "Instrumental"},
+{146, "JPop"},
+{ 29, "Jazz+Funk"},
+{ 8, "Jazz"},
+{ 63, "Jungle"},
+{ 86, "Latin"},
+{ 71, "Lo-Fi"},
+{ 45, "Meditative"},
+{142, "Merengue"},
+{ 9, "Metal"},
+{148, "Misc"},
+{ 77, "Musical"},
+{ 82, "National Folk"},
+{ 64, "Native American"},
+{133, "Negerpunk"},
+{ 10, "New Age"},
+{ 10, "NewAge"},
+{ 66, "New Wave"},
+{ 39, "Noise"},
+{ 11, "Oldies"},
+{103, "Opera"},
+{ 12, "Other"},
+{ 75, "Polka"},
+{134, "Polsk Punk"},
+{ 53, "Pop-Folk"},
+{ 62, "Pop/Funk"},
+{ 13, "Pop"},
+{109, "Porn Groove"},
+{117, "Power Ballad"},
+{ 23, "Pranks"},
+{108, "Primus"},
+{ 92, "Progressive Rock"},
+{ 93, "Psychedelic Rock"},
+{ 67, "Psychedelic"},
+{121, "Punk Rock"},
+{ 43, "Punk"},
+{ 14, "R&B"},
+{ 15, "Rap"},
+{ 68, "Rave"},
+{ 16, "Reggae"},
+{ 76, "Retro"},
+{ 87, "Revival"},
+{118, "Rhythmic Soul"},
+{ 78, "Rock & Roll"},
+{ 17, "Rock"},
+{143, "Salsa"},
+{114, "Samba"},
+{110, "Satire"},
+{ 69, "Showtunes"},
+{ 21, "Ska"},
+{111, "Slow Jam"},
+{ 95, "Slow Rock"},
+{105, "Sonata"},
+{ 42, "Soul"},
+{ 37, "Sound Clip"},
+{ 24, "Soundtrack"},
+{ 56, "Southern Rock"},
+{ 44, "Space"},
+{101, "Speech"},
+{ 83, "Swing"},
+{ 94, "Symphonic Rock"},
+{106, "Symphony"},
+{147, "Synthpop"},
+{113, "Tango"},
+{ 51, "Techno-Industrial"},
+{ 18, "Techno"},
+{130, "Terror"},
+{144, "Thrash Metal"},
+{ 60, "Top 40"},
+{ 70, "Trailer"},
+{ 31, "Trance"},
+{ 72, "Tribal"},
+{ 27, "Trip-Hop"},
+{ 28, "Vocal"},
+{102, "Chanson française"},
+{-1, NULL}
+};
+//
+//
+int tags_get_genre_by_value( char *p_name )
+{
+	int		i;
+	int		RetNum = 1;
+	char	*NameSrc = C_ascii_strdown( p_name );
+	char	*NameStruct = NULL;
+
+	for( i=0; StructTagsFileMp3[ i ].num != -1; i++ ) {
+		NameStruct = C_ascii_strdown( StructTagsFileMp3[ i ].name );
+		if( strlen( NameSrc ) == strlen( NameStruct ) && 0 == strncmp( NameSrc, NameStruct, strlen( NameSrc ))) {
+			RetNum = StructTagsFileMp3[ i ].num;
+			break;
+		}
+		free( NameStruct );	NameStruct = NULL;
+	}
+	if( NULL != NameSrc )	 { free( NameSrc );		NameSrc = NULL;		}
+	if( NULL != NameStruct ) { free( NameStruct );	NameStruct = NULL;	}
+	return( RetNum );
+}
+//
+//
+char *tags_get_genre_by_name( int value )
+{
+	int i;
+
+	if( value < 0 || value > 148 ) return ((char *)NULL );
+	for( i=0; StructTagsFileMp3[ i ].num != value; i++ );
+	return( (char *)StructTagsFileMp3[ i ].name );
+}
+
+
+//
+//
+void tags_print( char *p_namefile, TAGS *p_tags )
+{
+	printf("\tAlbum = %s\n", p_tags->Album ? p_tags->Album : "" );
+	printf("\tArtist = %s\n", p_tags->Artist ? p_tags->Artist : "" );
+	printf("\tTitle = %s\n", p_tags->Title ? p_tags->Title : "" );
+	printf("\tNumber = %s\n", p_tags->Number ? p_tags->Number : "" );
+	printf("\tIntNumber = %d\n", p_tags->IntNumber );
+	printf("\tGenre = %s\n", p_tags->Genre ? p_tags->Genre : "" );
+	printf("\tIntGenre = %d\n", p_tags->IntGenre );
+	printf("\tYear = %s\n", p_tags->Year ? p_tags->Year : "" );
+	printf("\tIntYear = %d\n", p_tags->IntYear );
+	printf("\tComment = %s\n", p_tags->Comment ? p_tags->Comment : "" );
+	printf("\tDescription = %s\n", p_tags->Description ? p_tags->Description : "" );
+}
+

xcfa-5.0.2.tar.gz/src_cli/tags.h Added

@@ -0,0 +1,222 @@
+/*
+ * file : src/tags.h
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+
+#ifndef tags_h
+#define tags_h 1
+
+#include <stdio.h>
+
+typedef enum {
+	TAG_WAVE_IS_NONE = 0,
+	TAG_WAVE_IS_FMT,
+	TAG_WAVE_IS_BEXT
+} TAG_WAV_IS_FMT_BEXT;
+
+
+typedef struct {
+
+	struct {
+		char	ChunkID[4];		//( 4 octets) : contient les lettres "RIFF" pour indiquer que le fichier est codé selon la norme RIFF
+		uint 	ChunkSize;		//( 4 octets) : taille du fichier entier en octets( sans compter les 8 octets de ce champ et le champ précédent CunkID
+		char	Format[4];		//( 4 octets) : correspond au format du fichier donc ici, contient les lettres "WAVE" car fichier est au format wave
+	} RIFF;
+
+	TAG_WAV_IS_FMT_BEXT	TagWavIsFmtBext;
+
+	struct {
+		char	Subchunk1ID[4];	//( 4 octets) : contient les lettres "fmt " pour indiquer les données à suivre décrivent le format des données audio
+		uint 	Subchunk1Size;	//( 4 octets) : taille en octet des données à suivre( qui suivent cette variable) 16 Pour un fichier PCM
+		short	AudioFormat;	//( 2 octets) : format de compression( une valeur autre que 1 indique une compression)
+		short	NumChannels;	//( 2 octets) : nombre de canaux
+								// 	1 pour mono,
+								// 	2 pour stéréo
+								// 	3 pour gauche, droit et centre
+								// 	4 pour face gauche, face droit, arrière gauche, arrière droit
+								// 	5 pour gauche, centre, droit, surround( ambiant)
+								// 	6 pour centre gauche, gauche, centre, centre droit, droit, surround( ambiant)
+		uint 	SampleRate;		//( 4 octets) : fréquence d'échantillonage, ex 44100, 44800( nombre d'échantillons par secondes)
+		uint 	ByteRate;		//( 4 octets) : nombre d'octects par secondes
+		short	Blockalign;		//( 2 octets) : nombre d'octects pour coder un échantillon
+		short	BitsPerSample;	//( 2 octets) : nombre de bits pour coder un échantillon
+	} FMT;
+
+	struct {
+		char	Subchunk2ID[4];	//( 4 octets) : contient les lettres "data" pour indiquer que les données à suivre sont les données audio( les échantillons et)
+		uint 	Subchunk2Size;	//( 4 octets) : taille des données audio( nombre total d'octets codant les données audio)
+		uint	*data;			//( 4 octets) : données audio... les échantillons
+								// DATAS[] : [Octets du Sample 1 du Canal 1] [Octets du Sample 1 du Canal 2] [Octets du Sample 2 du Canal 1] [Octets du Sample 2 du Canal 2]
+	} DATA;
+
+	FILE		*file;			// Handle du fichier si different de NULL
+} WAVE;
+
+//
+// ---------------------------------------------------------------------------
+// TAGS_WAV.C
+// ---------------------------------------------------------------------------
+//
+INFO_WAV	*tagswav_remove_info( INFO_WAV *info );
+INFO_WAV	*tagswav_get_info( INFO *p_info );
+C_BOOL		tagswav_file_GetBitrate( char *namefile, int *Channels, int *Hertz, int *Bits );
+C_BOOL		tagswav_read_file( char *wave_file, WAVE *WaveHeader );
+void		tagswav_close_file( WAVE *WaveHeader );
+void		tagswav_print_header( char *p_PathNameFile );
+
+//
+// ---------------------------------------------------------------------------
+// TAGS.C
+// ---------------------------------------------------------------------------
+//
+typedef struct {
+	int num;
+	char *name;
+} STRUCT_TAGS_FILE_MP3;
+//
+//
+extern	STRUCT_TAGS_FILE_MP3 StructTagsFileMp3 [];
+
+TAGS		*tags_alloc( void );
+TAGS		*tags_remove( TAGS *tags );
+void		tags_complementation( TAGS *p_tags, char *path_name_file );
+int			tags_get_genre_by_value( char *p_name );
+char		*tags_get_genre_by_name( int value );
+void		tags_print( char *p_namefile, TAGS *p_tags );
+
+
+//
+// ---------------------------------------------------------------------------
+// TAGS_FLAC.C
+// ---------------------------------------------------------------------------
+//
+INFO_FLAC	*tagsflac_remove_info( INFO_FLAC *info );
+INFO_FLAC	*tagsflac_get_info( INFO *p_info );
+
+//
+// ---------------------------------------------------------------------------
+// TAGS_MP3.C
+// ---------------------------------------------------------------------------
+//
+INFO_MP3	*tagsmp3_remove_info( INFO_MP3 *info );
+INFO_MP3	*tagsmp3_get_info( INFO *p_info );
+
+//
+// ---------------------------------------------------------------------------
+// TAGS_OGG.C
+// ---------------------------------------------------------------------------
+//
+INFO_OGG	*tagsogg_remove_info( INFO_OGG *info );
+INFO_OGG	*tagsogg_get_info( INFO *p_info );
+
+//
+// ---------------------------------------------------------------------------
+// TAGS_M4A_.C
+// ---------------------------------------------------------------------------
+//
+INFO_M4A	*tagsm4a_remove_info( INFO_M4A *info );
+INFO_M4A	*tagsm4a_get_info( INFO *p_info );
+
+//
+// ---------------------------------------------------------------------------
+// TAGS_AAC_.C
+// ---------------------------------------------------------------------------
+//
+INFO_AAC	*tagsaac_remove_info( INFO_AAC *info );
+
+//
+// ---------------------------------------------------------------------------
+// TAGS_SHN.C
+// ---------------------------------------------------------------------------
+//
+INFO_SHN	*tagsshn_remove_info( INFO_SHN *info );
+INFO_SHN	*tagsshn_get_info( INFO *p_info );
+
+//
+// ---------------------------------------------------------------------------
+// TAGS_WMA.C
+// ---------------------------------------------------------------------------
+//
+INFO_WMA	*tagswma_remove_info( INFO_WMA *info );
+INFO_WMA	*tagswma_get_info( INFO *p_info );
+
+//
+// ---------------------------------------------------------------------------
+// TAGS_MPC.C
+// ---------------------------------------------------------------------------
+//
+INFO_MPC	*tagsmpc_remove_info( INFO_MPC *info );
+INFO_MPC	*tagsmpc_get_info( INFO *p_info );
+void		tagsmpc_print_header( char *mpc_file );
+
+//
+// ---------------------------------------------------------------------------
+// TAGS_APE.C
+// ---------------------------------------------------------------------------
+//
+INFO_APE	*tagsape_remove_info( INFO_APE *info );
+INFO_APE	*tagsape_get_info( INFO *p_info );
+
+//
+// ---------------------------------------------------------------------------
+// TAGS_WAVPACK.C
+// ---------------------------------------------------------------------------
+//
+INFO_WAVPACK	*tagswavpack_remove_info( INFO_WAVPACK *info );
+INFO_WAVPACK	*tagswavpack_get_info( INFO *p_info );
+
+//
+// ---------------------------------------------------------------------------
+// TAGS_RM.C
+// ---------------------------------------------------------------------------
+//
+INFO_RM		*tagsrm_remove_info( INFO_RM *info );
+INFO_RM		*tagsrm_get_info( INFO *p_info );
+
+//
+// ---------------------------------------------------------------------------
+// TAGS_DTS.C
+// ---------------------------------------------------------------------------
+//
+INFO_DTS	*tagsdts_remove_info( INFO_DTS *info );
+INFO_DTS	*tagsdts_get_info( INFO *p_info );
+
+//
+// ---------------------------------------------------------------------------
+// TAGS_AIFF.C
+// ---------------------------------------------------------------------------
+//
+INFO_AIFF	*tagsaiff_remove_info( INFO_AIFF *info );
+INFO_AIFF	*tagsaiff_get_info( INFO *p_info );
+
+//
+// ---------------------------------------------------------------------------
+// TAGS_AC3.C
+// ---------------------------------------------------------------------------
+//
+INFO_AC3	*tagsac3_remove_info( INFO_AC3 *info );
+INFO_AC3	*tagsac3_get_info( INFO *p_info );
+
+
+#endif
+
+

xcfa-5.0.2.tar.gz/src_cli/tags_aac.c Added

@@ -0,0 +1,59 @@
+/*
+ * file : src/tags_aac.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#include <sys/types.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "global.h"
+#include "tags.h"
+#include <taglib/tag_c.h>
+
+
+/*
+*---------------------------------------------------------------------------
+* REMOVE
+*---------------------------------------------------------------------------
+*/
+
+INFO_AAC *tagsaac_remove_info (INFO_AAC *info)
+{
+	if (info) {
+		if (NULL != info->time)		{ free (info->time);	info->time = NULL;	}
+		if (NULL != info->hertz)	{ free (info->hertz);	info->hertz = NULL;	}
+
+		info->tags = (TAGS *)tags_remove (info->tags);
+
+		free (info);
+		info = NULL;
+	}
+	return ((INFO_AAC *)NULL);
+}
+

xcfa-5.0.2.tar.gz/src_cli/tags_ac3.c Added

@@ -0,0 +1,85 @@
+/*
+ * file : src/tags_ac3.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#include <sys/types.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "global.h"
+#include "tags.h"
+#include <taglib/tag_c.h>
+
+
+
+
+/*
+*---------------------------------------------------------------------------
+* REMOVE HEADER
+*---------------------------------------------------------------------------
+*/
+INFO_AC3 *tagsac3_remove_info (INFO_AC3 *info)
+{
+	if (info) {
+		info->tags = (TAGS *)tags_remove (info->tags);
+
+		free (info);
+		info = NULL;
+	}
+	return ((INFO_AC3 *)NULL);
+}
+
+/*
+*---------------------------------------------------------------------------
+* GET HEADER
+*---------------------------------------------------------------------------
+*/
+INFO_AC3 *tagsac3_get_info( INFO *p_info )
+{
+	INFO_AC3 *ptrinfo = NULL;
+
+	ptrinfo = (INFO_AC3 *)malloc (sizeof (INFO_AC3));
+	if (ptrinfo == NULL) return (NULL);
+
+	ptrinfo->tags = (TAGS *)tags_alloc ();
+	tags_complementation( ptrinfo->tags, p_info->path_name_file );
+
+	return ((INFO_AC3 *)ptrinfo);
+}
+
+
+
+
+
+
+
+
+
+
+

xcfa-5.0.2.tar.gz/src_cli/tags_aiff.c Added

@@ -0,0 +1,85 @@
+/*
+ * file : src/tags_aiff.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#include <sys/types.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "global.h"
+#include "tags.h"
+#include <taglib/tag_c.h>
+
+
+
+
+/*
+*---------------------------------------------------------------------------
+* REMOVE HEADER
+*---------------------------------------------------------------------------
+*/
+INFO_AIFF *tagsaiff_remove_info (INFO_AIFF *info)
+{
+	if (info) {
+		info->tags = (TAGS *)tags_remove (info->tags);
+
+		free (info);
+		info = NULL;
+	}
+	return ((INFO_AIFF *)NULL);
+}
+
+/*
+*---------------------------------------------------------------------------
+* GET HEADER
+*---------------------------------------------------------------------------
+*/
+INFO_AIFF *tagsaiff_get_info( INFO *p_info )
+{
+	INFO_AIFF *ptrinfo = NULL;
+
+	ptrinfo = (INFO_AIFF *)malloc (sizeof (INFO_AIFF));
+	if (ptrinfo == NULL) return (NULL);
+
+	ptrinfo->tags = (TAGS *)tags_alloc ();
+	tags_complementation( ptrinfo->tags, p_info->path_name_file );
+
+	return ((INFO_AIFF *)ptrinfo);
+}
+
+
+
+
+
+
+
+
+
+
+

xcfa-5.0.2.tar.gz/src_cli/tags_ape.c Added

@@ -0,0 +1,130 @@
+/*
+ * file : src/tags_ape.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#include <sys/types.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "global.h"
+#include "get_info.h"
+#include "tags.h"
+#include <taglib/tag_c.h>
+
+
+/*
+*---------------------------------------------------------------------------
+* VARIABLES
+*---------------------------------------------------------------------------
+*/
+
+/*****************************************************************************************
+APE header that all APE files have in common (old and new)
+*****************************************************************************************
+struct APE_COMMON_HEADER
+{
+ char cID[4]; should equal 'MAC '
+ uint16 nVersion; version number * 1000 (3.81 = 3810)
+};
+
+*****************************************************************************************
+APE header structure for old APE files (3.97 and earlier)
+*****************************************************************************************
+struct APE_HEADER_OLD
+{
+ char cID[4]; should equal 'MAC '
+ uint16 nVersion; version number * 1000 (3.81 = 3810)
+ uint16 nCompressionLevel; the compression level
+ uint16 nFormatFlags; any format flags (for future use)
+ uint16 nChannels; the number of channels (1 or 2)
+ uint32 nSampleRate; the sample rate (typically 44100)
+ uint32 nHeaderBytes; the bytes after the MAC header that compose the WAV header
+ uint32 nTerminatingBytes; the bytes after that raw data (for extended info)
+ uint32 nTotalFrames; the number of frames in the file
+ uint32 nFinalFrameBlocks; the number of samples in the final frame
+};
+*****************************************************************************************/
+
+
+
+/*
+*---------------------------------------------------------------------------
+* GET HEADER
+*---------------------------------------------------------------------------
+*/
+
+INFO_APE *tagsape_remove_info (INFO_APE *info)
+{
+	if (info) {
+		if (NULL != info->time)		{ free (info->time); info->time = NULL;	}
+		if (NULL != info->size)		{ free (info->size);info->size = NULL;	}
+
+		info->tags = (TAGS *)tags_remove (info->tags);
+
+		free (info);
+		info = NULL;
+	}
+	return ((INFO_APE *)NULL);
+}
+
+
+void tags_ape_print( INFO_APE *ptrinfo )
+{
+	printf( "time = %s\n", ptrinfo->time );
+	printf( "SecTime = %d\n", ptrinfo->SecTime );
+	printf( "size = %s\n", ptrinfo->size );
+}
+
+
+INFO_APE *tagsape_get_info( INFO *p_info )
+{
+	INFO_APE	*ptrinfo = NULL;
+	SHNTAG		*ShnTag = GetInfo_shntool ( p_info->path_name_file );
+	int		m;
+	int		s;
+	int		sec;
+
+	ptrinfo = (INFO_APE *)malloc (sizeof (INFO_APE));
+	if (ptrinfo == NULL) return (NULL);
+	ptrinfo->tags = (TAGS *)tags_alloc ();
+
+	ptrinfo->size = C_strdup (ShnTag->size);
+	ptrinfo->SecTime =
+	sec = ShnTag->SecTime;
+	s = sec % 60; sec /= 60;
+	m = sec % 60; sec /= 60;
+	if (sec > 0) ptrinfo->time = C_strdup_printf ("%02d:%02d:%02d", sec, m, s);
+	else ptrinfo->time = C_strdup_printf ("00:%02d:%02d", m, s);
+
+	tags_complementation( ptrinfo->tags, p_info->path_name_file );
+
+	ShnTag = GetInfo_free_shntool (ShnTag);
+
+	return ((INFO_APE *)ptrinfo);
+}

xcfa-5.0.2.tar.gz/src_cli/tags_dts.c Added

@@ -0,0 +1,94 @@
+/*
+ * file : src/tags_dts.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#include <sys/types.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "global.h"
+#include "tags.h"
+#include <taglib/tag_c.h>
+
+
+
+/*
+*---------------------------------------------------------------------------
+* FILE IS DTS ?
+*---------------------------------------------------------------------------
+*/
+/*
+$ file *
+	audio.dts: data
+*/
+
+/*
+*---------------------------------------------------------------------------
+* REMOVE HEADER
+*---------------------------------------------------------------------------
+*/
+INFO_DTS *tagsdts_remove_info (INFO_DTS *info)
+{
+	if (info) {
+		info->tags = (TAGS *)tags_remove (info->tags);
+
+		free (info);
+		info = NULL;
+	}
+	return ((INFO_DTS *)NULL);
+}
+
+/*
+*---------------------------------------------------------------------------
+* GET HEADER
+*---------------------------------------------------------------------------
+*/
+INFO_DTS *tagsdts_get_info( INFO *p_info )
+{
+	INFO_DTS *ptrinfo = NULL;
+
+	ptrinfo = (INFO_DTS *)malloc (sizeof (INFO_DTS));
+	if (ptrinfo == NULL) return (NULL);
+
+	ptrinfo->tags = (TAGS *)tags_alloc ();
+	tags_complementation( ptrinfo->tags, p_info->path_name_file );
+
+	return ((INFO_DTS *)ptrinfo);
+}
+
+
+
+
+
+
+
+
+
+
+

xcfa-5.0.2.tar.gz/src_cli/tags_flac.c Added

@@ -0,0 +1,138 @@
+/*
+ * file : src/tags_flac.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#include <sys/types.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "global.h"
+#include "tags.h"
+#include <taglib/tag_c.h>
+
+
+/*
+*---------------------------------------------------------------------------
+* VARIABLES
+*---------------------------------------------------------------------------
+*/
+
+
+
+
+/*
+*---------------------------------------------------------------------------
+* GET HEADER
+*---------------------------------------------------------------------------
+*/
+
+INFO_FLAC *tagsflac_remove_info (INFO_FLAC *info)
+{
+	if (info) {
+		free (info->time);
+
+		info->tags = (TAGS *)tags_remove (info->tags);
+
+		free (info);
+		info = NULL;
+	}
+	return ((INFO_FLAC *)NULL);
+}
+
+
+void tags_flac_print( INFO_FLAC *ptrinfo )
+{
+	printf( "time = %s\n", ptrinfo->time );
+	printf( "SecTime = %d\n", ptrinfo->SecTime );
+}
+
+
+INFO_FLAC *tagsflac_get_info (INFO *p_info)
+{
+	TagLib_File	*file;
+	TagLib_Tag	*tag;
+	INFO_FLAC	*ptrinfo = NULL;
+	const TagLib_AudioProperties *properties;
+	int		m;
+	int		s;
+	int		sec;
+
+	ptrinfo = (INFO_FLAC *)malloc (sizeof (INFO_FLAC));
+	if (ptrinfo == NULL) return (NULL);
+	ptrinfo->tags = (TAGS *)tags_alloc ();
+
+	if ((file = taglib_file_new (p_info->path_name_file))) {
+
+		taglib_set_strings_unicode(FALSE);
+		tag = taglib_file_tag(file);
+		properties = taglib_file_audioproperties(file);
+
+		ptrinfo->tags->Title = C_strdup (taglib_tag_title(tag));
+		ptrinfo->tags->Artist = C_strdup (taglib_tag_artist(tag));
+		ptrinfo->tags->Album = C_strdup (taglib_tag_album(tag));
+		ptrinfo->tags->IntYear = taglib_tag_year(tag);
+		ptrinfo->tags->Year = C_strdup_printf ("%d", ptrinfo->tags->IntYear);
+		ptrinfo->tags->Comment = C_strdup (taglib_tag_comment(tag));
+		ptrinfo->tags->IntNumber = taglib_tag_track(tag);
+		ptrinfo->tags->Number = C_strdup_printf ("%d", ptrinfo->tags->IntNumber);
+		ptrinfo->tags->Genre = C_strdup (taglib_tag_genre(tag));
+		ptrinfo->tags->IntGenre = tags_get_genre_by_value (ptrinfo->tags->Genre);
+		ptrinfo->SecTime = taglib_audioproperties_length(properties);
+
+		sec = taglib_audioproperties_length(properties);
+		s = sec % 60; sec /= 60;
+		m = sec % 60; sec /= 60;
+		if (sec > 0) ptrinfo->time = C_strdup_printf ("%02d:%02d:%02d", sec, m, s);
+		else ptrinfo->time = C_strdup_printf ("00:%02d:%02d", m, s);
+
+		/*
+		printf("title - \"%s\"\n", ptrinfo->tags->Title );
+		printf("artist - \"%s\"\n", ptrinfo->tags->Artist );
+		printf("album - \"%s\"\n", ptrinfo->tags->Album );
+		printf("year - \"%s\"\n", ptrinfo->tags->Year );
+		printf("comment - \"%s\"\n", ptrinfo->tags->Comment );
+		printf("track - \"%i\"\n", taglib_tag_track(tag));
+		printf("genre - \"%s\"\n", ptrinfo->tags->Genre );
+		printf("-- AUDIO --\n");
+		printf("bitrate - %i\n", taglib_audioproperties_bitrate(properties));
+		printf("sample rate - %i\n", taglib_audioproperties_samplerate(properties));
+		printf("channels - %i\n", taglib_audioproperties_channels(properties));
+		printf("length - %i:%02i\n", minutes, seconds);
+		*/
+
+		taglib_tag_free_strings();
+		taglib_file_free (file);
+	}
+	else {
+		tags_complementation( ptrinfo->tags, p_info->path_name_file );
+	}
+	return ((INFO_FLAC *)ptrinfo);
+}
+
+

xcfa-5.0.2.tar.gz/src_cli/tags_m4a.c Added

@@ -0,0 +1,169 @@
+/*
+ * file : src/tags_m4a.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#include <sys/types.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "global.h"
+#include "get_info.h"
+#include "tags.h"
+#include <taglib/tag_c.h>
+
+
+/*
+*---------------------------------------------------------------------------
+* REMOVE
+*---------------------------------------------------------------------------
+*/
+INFO_M4A *tagsm4a_remove_info (INFO_M4A *info)
+{
+	if (info) {
+		if (NULL != info->time)		{ free (info->time); info->time = NULL;	}
+		if (NULL != info->hertz)	{ free (info->hertz);info->hertz = NULL;	}
+
+		info->tags = (TAGS *)tags_remove (info->tags);
+
+		free (info);
+		info = NULL;
+	}
+	return ((INFO_M4A *)NULL);
+}
+
+
+void tags_m4a_print( INFO_M4A *ptrinfo )
+{
+	printf( "time = %s\n", ptrinfo->time );
+	printf( "SecTime = %d\n", ptrinfo->SecTime );
+	printf( "hertz = %s\n", ptrinfo->hertz );
+}
+
+
+/*
+*---------------------------------------------------------------------------
+* GET INFO
+*---------------------------------------------------------------------------
+*/
+INFO_M4A *tagsm4a_get_info( INFO *p_info )
+{
+	char		**Larrbuf = NULL;
+	CString		*gstr = NULL;
+	int		cpt;
+	char		*ptr = NULL;
+	INFO_M4A	*ptrinfo = NULL;
+	int		m;
+	int		s;
+	int		sec;
+
+	gstr = GetInfo_faad ( p_info->path_name_file );
+	Larrbuf = C_strsplit( gstr->str, "\n" );
+
+	ptrinfo = (INFO_M4A *)malloc (sizeof (INFO_M4A));
+	if (ptrinfo == NULL) {
+		C_strfreev( Larrbuf );
+		C_string_free( gstr );
+		return (NULL);
+	}
+	ptrinfo->tags = (TAGS *)tags_alloc ();
+
+	for (cpt=0; Larrbuf[cpt]; cpt++) {
+
+		// LC AAC	181.287 secs, 2 ch, 44100 Hz
+		// LC AAC	7169.049 secs, 2 ch, 44100 Hz
+		if ((ptr = strstr (Larrbuf[cpt], "LC AAC"))) {
+
+			// --> 181.287 secs, 2 ch, 44100 Hz
+			// --> 7169.049 secs, 2 ch, 44100 Hz
+			ptr = strstr (ptr, " secs,");
+			ptr --;
+			while (*ptr != ' ' && *ptr != '\t') ptr --;
+			ptr ++;
+
+			sec = atoi (ptr);
+			s = sec % 60; sec /= 60;
+			m = sec % 60; sec /= 60;
+			if (sec > 0) ptrinfo->time = C_strdup_printf ("%02d:%02d:%02d", sec, m, s);
+			else ptrinfo->time = C_strdup_printf ("00:%02d:%02d", m, s);
+
+			ptrinfo->SecTime = sec;
+
+			/* --> 44100 Hz */
+			ptr = strstr (ptr, " Hz");
+			ptr --;
+			while (*ptr != ' ' && *ptr != '\t') ptr --;
+			ptr ++;
+			ptrinfo->hertz = C_strdup_printf ("%d", atoi(ptr));
+		}
+		else if ((ptr = strstr (Larrbuf[cpt], "artist:"))) {
+			if ((ptr = strchr (ptr, ' '))) {
+				ptr ++;
+				ptrinfo->tags->Artist = C_strdup (ptr);
+			}
+		}
+		else if ((ptr = strstr (Larrbuf[cpt], "title:"))) {
+			if ((ptr = strchr (ptr, ' '))) {
+				ptr ++;
+				ptrinfo->tags->Title = C_strdup (ptr);
+			}
+		}
+		else if ((ptr = strstr (Larrbuf[cpt], "album:"))) {
+			if ((ptr = strchr (ptr, ' '))) {
+				ptr ++;
+				ptrinfo->tags->Album = C_strdup (ptr);
+			}
+		}
+		else if ((ptr = strstr (Larrbuf[cpt], "date:"))) {
+			if ((ptr = strchr (ptr, ' '))) {
+				ptr ++;
+				ptrinfo->tags->Year = C_strdup (ptr);
+			}
+		}
+		else if ((ptr = strstr (Larrbuf[cpt], "genre:"))) {
+			if ((ptr = strchr (ptr, ' '))) {
+				ptr ++;
+				ptrinfo->tags->Genre = C_strdup (ptr);
+			}
+		}
+		else if ((ptr = strstr (Larrbuf[cpt], "comment:"))) {
+			if ((ptr = strchr (ptr, ' '))) {
+				ptr ++;
+				ptrinfo->tags->Comment = C_strdup (ptr);
+			}
+		}
+	}
+
+	C_strfreev( Larrbuf );
+	C_string_free( gstr );
+
+	tags_complementation( ptrinfo->tags, p_info->path_name_file );
+
+	return ((INFO_M4A *)ptrinfo);
+}
+

xcfa-5.0.2.tar.gz/src_cli/tags_mp3.c Added

@@ -0,0 +1,217 @@
+/*
+ * file : src/tags_mp3.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#include <sys/types.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <taglib/tag_c.h>
+
+#include "global.h"
+#include "tags.h"
+#include "get_info.h"
+
+
+/*
+*---------------------------------------------------------------------------
+* VARIABLES
+*---------------------------------------------------------------------------
+*/
+
+typedef struct {
+	char	magic[ 3 ];
+	char	songname[ 30 ];
+	char	artist[ 30 ];
+	char	album[ 30 ];
+	char	year[ 4 ];
+	char	note[ 28 ];
+	unsigned char	nnull;
+	unsigned char	track;
+	unsigned char	style;
+} ID3TAG;
+
+
+/*
+*---------------------------------------------------------------------------
+* GET HEADER
+*---------------------------------------------------------------------------
+*/
+INFO_MP3 *tagsmp3_remove_info (INFO_MP3 *info)
+{
+	if (NULL != info) {
+		if (NULL != info->bitrate)	{ free (info->bitrate);	info->bitrate = NULL;	}
+		if (NULL != info->time)		{ free (info->time);		info->time = NULL;	}
+		if (NULL != info->size)		{ free (info->size);		info->size = NULL;	}
+
+		info->tags = (TAGS *)tags_remove (info->tags);
+
+		free (info);
+		info = NULL;
+	}
+
+	return ((INFO_MP3 *)NULL);
+}
+/*
+MPEG-1 layer III sample frequencies (kHz): 32 48 44.1
+bitrates (kbit/s): 32 40 48 56 64 80 96 112 128 160 192 224 256 320
+
+MPEG-2 layer III sample frequencies (kHz): 16 24 22.05
+bitrates (kbit/s): 8 16 24 32 40 48 56 64 80 96 112 128 144 160
+
+MPEG-2.5 layer III sample frequencies (kHz): 8 12 11.025
+bitrates (kbit/s): 8 16 24 32 40 48 56 64 80 96 112 128 144 160
+-1
+0
+1
+2
+*/
+int tagsmp3_type_mpeg (char *namefile)
+{
+	char *Lout = NULL;
+	char *ptr = NULL;
+#define MAX_STR 256
+	static char str [ MAX_STR + 4 ];
+	int cpt = 0;
+	char *term[] = {"MPV_1", "MPV_2", "MPV_25"};
+	int i;
+	CString 	*gstr = NULL;
+	int Ret = NONE_MPEG;	// NONE_MPEG = -1
+
+	if (NULL == (gstr = GetInfo_checkmp3 (namefile))) {
+		return (-1);
+	}
+
+	Lout = gstr->str;
+	for (i = 0; i < 3; i ++) {
+		if ((ptr = strstr (Lout, term[ i ]))) {
+
+			/* Init la chaine de stockage */
+			for (cpt=0; cpt < MAX_STR; cpt++) str [ cpt ] = '\0';
+
+			/* Passe l'intro */
+			while (*ptr != ' ') ptr ++;
+			while (*ptr == ' ') ptr ++;
+
+			/* Copie */
+			cpt = 0;
+			while (*ptr != '\n') {
+				if (cpt > MAX_STR) break;
+				str [ cpt ++ ] = *ptr ++;
+			}
+			str [ cpt ] = '\0';
+
+			switch ( i ) {
+			case 0 :
+				// printf ("----------------------------MPV_1 str=%s\n", str);
+				if (str[0] == '1') Ret = MPEG_1;	// MPEG_1 = 0
+				break;
+			case 1 :
+				// printf ("----------------------------MPV_2 str=%s\n", str);
+				if (str[0] == '1') Ret = MPEG_2;	// MPEG_2 = 1
+				break;
+			case 2 :
+				// printf ("----------------------------MPV_25 str=%s\n", str);
+				if (str[0] == '1') Ret = MPEG_25;	// MPEG_25 = 2
+				break;
+			}
+			if (Ret > -1) break;
+		}
+	}
+	gstr = C_string_free( gstr );
+	Lout = NULL;
+
+	return (Ret);
+}
+
+
+void tags_mp3_print( INFO_MP3 *ptrinfo )
+{
+	printf( "\ttime = %s\n", ptrinfo->time );
+	printf( "\tbitrate = %s\n", ptrinfo->bitrate );
+	printf( "\tmpeg_is = %d\n", ptrinfo->mpeg_is );
+	printf( "\tsize = %s\n", ptrinfo->size );
+	printf( "\tLevelDbfs = %d\n", ptrinfo->LevelDbfs );
+}
+
+
+INFO_MP3 *tagsmp3_get_info( INFO *p_info )
+{
+	INFO_MP3 *ptrinfo = NULL;
+	TagLib_File *file;
+	TagLib_Tag *tag;
+	const TagLib_AudioProperties *properties;
+	int		m;
+	int		s;
+	int		sec;
+
+	ptrinfo = (INFO_MP3 *)malloc (sizeof (INFO_MP3));
+	if (ptrinfo == NULL) return (NULL);
+	ptrinfo->tags = (TAGS *)tags_alloc ();
+
+	if ((file = taglib_file_new (p_info->path_name_file))) {
+		taglib_set_strings_unicode(FALSE);
+		tag = taglib_file_tag(file);
+		properties = taglib_file_audioproperties(file);
+
+		ptrinfo->tags->Title = C_strdup (taglib_tag_title(tag));
+		ptrinfo->tags->Artist = C_strdup (taglib_tag_artist(tag));
+		ptrinfo->tags->Album = C_strdup (taglib_tag_album(tag));
+		ptrinfo->tags->IntYear = taglib_tag_year(tag);
+		ptrinfo->tags->Year = C_strdup_printf ("%d", ptrinfo->tags->IntYear);
+		ptrinfo->tags->Comment = C_strdup (taglib_tag_comment(tag));
+		ptrinfo->tags->IntNumber = taglib_tag_track(tag);
+		ptrinfo->tags->Number = C_strdup_printf ("%d", ptrinfo->tags->IntNumber);
+		ptrinfo->tags->Genre = C_strdup (taglib_tag_genre(tag));
+		ptrinfo->tags->IntGenre = tags_get_genre_by_value (ptrinfo->tags->Genre);
+		ptrinfo->SecTime = sec = taglib_audioproperties_length(properties);
+		s = sec % 60; sec /= 60;
+		m = sec % 60; sec /= 60;
+		 if (sec > 0) ptrinfo->time = C_strdup_printf ("%02d:%02d:%02d", sec, m, s);
+		 else ptrinfo->time = C_strdup_printf ("00:%02d:%02d", m, s);
+
+		ptrinfo->bitrate = C_strdup_printf ("%d", taglib_audioproperties_bitrate(properties));
+		ptrinfo->mpeg_is = tagsmp3_type_mpeg ( p_info->path_name_file );
+		ptrinfo->size = C_strdup_printf ("%d Ko", (int)utils_get_size_file ( p_info->path_name_file ) / 1024);
+
+		taglib_tag_free_strings();
+		taglib_file_free (file);
+	}
+	else {
+		tags_complementation( ptrinfo->tags, p_info->path_name_file );
+	}
+	// ptrinfo->LevelDbfs = GetInfo_level_get_from( FILE_IS_MP3, p_info->path_name_file );
+
+	return ((INFO_MP3 *)ptrinfo);
+}
+
+
+
+
+
+

xcfa-5.0.2.tar.gz/src_cli/tags_mpc.c Added

@@ -0,0 +1,236 @@
+/*
+ * file : src/tags_mpc.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#include <pthread.h>
+#include <sys/types.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <taglib/tag_c.h>
+
+#include "global.h"
+#include "tags.h"
+
+
+
+/*
+*---------------------------------------------------------------------------
+* VARIABLES
+*---------------------------------------------------------------------------
+*/
+
+typedef struct {
+	unsigned is_4d : 8;
+	unsigned is_50 : 8;
+	unsigned is_2b : 8;
+	unsigned is_StreamMajorVersion : 4;
+	unsigned is_StreamMinorVersion : 4;
+} MPC_BIT_0;
+
+typedef struct {
+	unsigned is_FrameCount : 32;
+} MPC_BIT_1;
+
+typedef struct {
+	unsigned is_MaxLevel : 16;
+	unsigned is_SampleFreq : 2;
+	unsigned is_Link : 2;
+	unsigned is_Profile : 4;
+	unsigned is_MaxBand : 6;
+	unsigned is_MidSideStereo : 1;
+	unsigned is_IntensityStereo : 1;
+} MPC_BIT_2;
+
+typedef struct {
+	unsigned is_TitlePeak : 16;
+	unsigned is_TitleGain : 16;
+} MPC_BIT_3;
+
+typedef struct {
+	unsigned is_AlbumPeak : 16;
+	unsigned is_AlbumGain : 16;
+} MPC_BIT_4;
+
+typedef struct {
+	unsigned is_unusued : 19;
+	unsigned is_Safely : 1;
+	unsigned is_LastFrameLength : 11;
+	unsigned is_TrueGapless : 1;
+} MPC_BIT_5;
+
+typedef struct {
+	unsigned is_unusued : 24;
+	unsigned is_EncoderVersion : 8;
+} MPC_BIT_6;
+
+typedef struct {
+	MPC_BIT_0 bit_0;
+	MPC_BIT_1 bit_1;
+	MPC_BIT_2 bit_2;
+	MPC_BIT_3 bit_3;
+	MPC_BIT_4 bit_4;
+	MPC_BIT_5 bit_5;
+	MPC_BIT_6 bit_6;
+} MPC_HEADER;
+
+
+/*
+*---------------------------------------------------------------------------
+* FILE IS MPC ?
+*---------------------------------------------------------------------------
+*/
+
+void tagsmpc_print_header( char *mpc_file )
+{
+	FILE	*fp = NULL;
+	MPC_HEADER	fm;
+
+	if( NULL == ( fp = fopen( mpc_file, "rb" ))) return;
+	fread( &fm, sizeof(MPC_HEADER), 1, fp );
+	fclose( fp );
+
+	// printf ("\n");
+	// printf ("%s\n", mpc_file);
+	// printf ("\n");
+	printf ("\t-- BIT 0 -----------------------------------------\n");
+	printf ("\tis_4d %4d - 0x%x\n", fm.bit_0.is_4d, fm.bit_0.is_4d);
+	printf ("\tis_50 %4d - 0x%x\n", fm.bit_0.is_50, fm.bit_0.is_50);
+	printf ("\tis_2b %4d - 0x%x\n", fm.bit_0.is_2b, fm.bit_0.is_2b);
+	printf ("\tis_StreamMajorVersion %4d - 0x%x\n", fm.bit_0.is_StreamMajorVersion, fm.bit_0.is_StreamMajorVersion);
+	printf ("\tis_StreamMinorVersion %4d - 0x%x\n", fm.bit_0.is_StreamMinorVersion, fm.bit_0.is_StreamMinorVersion);
+	printf ("\t-- BIT 1 -----------------------------------------\n");
+	printf ("\tis_FrameCount %4d - 0x%x\n", fm.bit_1.is_FrameCount, fm.bit_1.is_FrameCount);
+	printf ("\t-- BIT 2 -----------------------------------------\n");
+	printf ("\tis_MaxLevel %4d - 0x%x\n", fm.bit_2.is_MaxLevel, fm.bit_2.is_MaxLevel);
+	printf ("\tis_SampleFreq %4d - 0x%x\n", fm.bit_2.is_SampleFreq, fm.bit_2.is_SampleFreq);
+	switch(fm.bit_2.is_SampleFreq) {
+	case 0 : printf ("\t\t44100 Hz\n"); break;
+	case 1 : printf ("\t\t48000 Hz\n"); break;
+	case 2 : printf ("\t\t37800 Hz\n"); break;
+	case 3 : printf ("\t\t32000 Hz\n"); break;
+	}
+	printf ("\tis_Link %4d - 0x%x\n", fm.bit_2.is_Link, fm.bit_2.is_Link);
+	switch(fm.bit_2.is_Link) {
+	case 0 : printf ("\t\tTitle start or ends with a very low level\n"); break;
+	case 1 : printf ("\t\tTitle ends loudly\n"); break;
+	case 2 : printf ("\t\tTitle start loudly\n"); break;
+	case 3 : printf ("\t\tTitle start loudly and ends loudly\n"); break;
+	}
+	printf ("\tis_Profile %4d - 0x%x\n", fm.bit_2.is_Profile, fm.bit_2.is_Profile);
+	switch (fm.bit_2.is_Profile) {
+	case 0 : printf ("\t\tno profile\n"); break;
+	case 1 : printf ("\t\tUnstable/Experimental\n"); break;
+	case 2 : printf ("\t\tunused\n"); break;
+	case 3 : printf ("\t\tunused\n"); break;
+	case 4 : printf ("\t\tunused\n"); break;
+	case 5 : printf ("\t\tbelow telephone : q=0.0\n"); break;
+	case 6 : printf ("\t\tbelow telephone : q=1.0\n"); break;
+	case 7 : printf ("\t\ttelephone : q=2.0\n"); break;
+	case 8 : printf ("\t\tThumb : q=3.0\n"); break;
+	case 9 : printf ("\t\tRadio : q=4.0\n"); break;
+	case 10 : printf ("\t\tStandard : q=5.0\n"); break;
+	case 11 : printf ("\t\tXtreme : q=6.0\n"); break;
+	case 12 : printf ("\t\tInsane : q=7.0\n"); break;
+	case 13 : printf ("\t\tBrainDead : q=8.0\n"); break;
+	case 14 : printf ("\t\tabove BrainDead : q=9.0\n"); break;
+	case 15 : printf ("\t\tabove BrainDead : q=10.0\n"); break;
+	}
+	printf ("\tis_MaxBand %4d - 0x%x\n", fm.bit_2.is_MaxBand, fm.bit_2.is_MaxBand);
+	printf ("\tis_MidSideStereo %4d - 0x%x\n", fm.bit_2.is_MidSideStereo, fm.bit_2.is_MidSideStereo);
+	printf ("\tis_IntensityStereo %4d - 0x%x\n", fm.bit_2.is_IntensityStereo, fm.bit_2.is_IntensityStereo);
+	printf ("\t-- BIT 3 -----------------------------------------\n");
+	printf ("\tis_TitlePeak %4d - 0x%x\n", fm.bit_3.is_TitlePeak, fm.bit_3.is_TitlePeak);
+	printf ("\tis_TitleGain %4d - 0x%x\n", fm.bit_3.is_TitleGain, fm.bit_3.is_TitleGain);
+	printf ("\t-- BIT 4 -----------------------------------------\n");
+	printf ("\tis_AlbumPeak %4d - 0x%x\n", fm.bit_4.is_AlbumPeak, fm.bit_4.is_AlbumPeak);
+	printf ("\tis_AlbumGain %4d - 0x%x\n", fm.bit_4.is_AlbumGain, fm.bit_4.is_AlbumGain);
+	printf ("\t-- BIT 5 -----------------------------------------\n");
+	printf ("\tis_unusued %4d - 0x%x\n", fm.bit_5.is_unusued, fm.bit_5.is_unusued);
+	printf ("\tis_Safely %4d - 0x%x\n", fm.bit_5.is_Safely, fm.bit_5.is_Safely);
+	printf ("\tis_LastFrameLength %4d - 0x%x\n", fm.bit_5.is_LastFrameLength, fm.bit_5.is_LastFrameLength);
+	printf ("\tis_TrueGapless %4d - 0x%x\n", fm.bit_5.is_TrueGapless, fm.bit_5.is_TrueGapless);
+	printf ("\t-- BIT 6 -----------------------------------------\n");
+	printf ("\tis_EncoderVersion %4d - 0x%x\n", fm.bit_6.is_EncoderVersion, fm.bit_6.is_EncoderVersion);
+}
+
+
+/*
+*---------------------------------------------------------------------------
+* GET HEADER
+*---------------------------------------------------------------------------
+*/
+
+INFO_MPC *tagsmpc_remove_info (INFO_MPC *info)
+{
+	if (info) {
+
+		info->tags = (TAGS *)tags_remove (info->tags);
+
+		free (info);
+		info = NULL;
+	}
+	return ((INFO_MPC *)NULL);
+}
+
+INFO_MPC *tagsmpc_get_info( INFO *p_info )
+{
+	INFO_MPC *ptrinfo = NULL;
+	TagLib_File *file;
+	TagLib_Tag *tag;
+
+	ptrinfo = (INFO_MPC *)malloc (sizeof (INFO_MPC));
+	if (ptrinfo == NULL) return (NULL);
+	ptrinfo->tags = (TAGS *)tags_alloc ();
+
+	if ((file = taglib_file_new ( p_info->path_name_file ))) {
+
+		taglib_set_strings_unicode(FALSE);
+		tag = taglib_file_tag(file);
+
+		ptrinfo->tags->Title = C_strdup (taglib_tag_title(tag));
+		ptrinfo->tags->Artist = C_strdup (taglib_tag_artist(tag));
+		ptrinfo->tags->Album = C_strdup (taglib_tag_album(tag));
+		ptrinfo->tags->IntYear = taglib_tag_year(tag);
+		ptrinfo->tags->Year = C_strdup_printf ("%d", ptrinfo->tags->IntYear);
+		ptrinfo->tags->Comment = C_strdup (taglib_tag_comment(tag));
+		ptrinfo->tags->IntNumber = taglib_tag_track(tag);
+		ptrinfo->tags->Number = C_strdup_printf ("%d", ptrinfo->tags->IntNumber);
+		ptrinfo->tags->Genre = C_strdup (taglib_tag_genre(tag));
+		ptrinfo->tags->IntGenre = tags_get_genre_by_value (ptrinfo->tags->Genre);
+		taglib_tag_free_strings();
+		taglib_file_free (file);
+	}
+	else {
+		tags_complementation( ptrinfo->tags, p_info->path_name_file );
+	}
+
+	return ((INFO_MPC *)ptrinfo);
+}
+
+

xcfa-5.0.2.tar.gz/src_cli/tags_ogg.c Added

@@ -0,0 +1,138 @@
+/*
+ * file : src/tags_ogg.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#include <pthread.h>
+#include <sys/types.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <taglib/tag_c.h>
+
+#include "global.h"
+#include "tags.h"
+#include "get_info.h"
+
+
+/*
+*---------------------------------------------------------------------------
+* VARIABLES
+*---------------------------------------------------------------------------
+*/
+
+
+/*
+*---------------------------------------------------------------------------
+* GET HEADER
+*---------------------------------------------------------------------------
+*/
+INFO_OGG *tagsogg_remove_info (INFO_OGG *info)
+{
+	if (info) {
+		if (NULL != info->Channels)			{ free (info->Channels);		info->Channels = NULL;		}
+		if (NULL != info->Rate)				{ free (info->Rate);			info->Rate = NULL;		}
+		if (NULL != info->Nominal_bitrate)	{ free (info->Nominal_bitrate);	info->Nominal_bitrate = NULL;	}
+		if (NULL != info->time)				{ free (info->time);			info->time = NULL;		}
+		if (NULL != info->size)				{ free (info->size);			info->size = NULL;		}
+
+		info->tags = (TAGS *)tags_remove (info->tags);
+
+		free (info);
+		info = NULL;
+	}
+	return ((INFO_OGG *)NULL);
+}
+
+
+void tags_ogprintf( INFO_OGG *ptrinfo )
+{
+	printf( "\tChannels = %s\n", ptrinfo->Channels );
+	printf( "\tRate = %s\n", ptrinfo->Rate );
+	printf( "\tNominal_bitrate = %s\n", ptrinfo->Nominal_bitrate );
+	printf( "\ttime = %s\n", ptrinfo->time );
+	printf( "\tSecTime = %d\n", ptrinfo->SecTime );
+	printf( "\tsize = %s\n", ptrinfo->size );
+	printf( "\tLevelDbfs = %d\n", ptrinfo->LevelDbfs );
+}
+
+
+INFO_OGG *tagsogg_get_info( INFO *p_info )
+{
+	TagLib_File *file;
+	TagLib_Tag *tag;
+	INFO_OGG *ptrinfo = NULL;
+	const TagLib_AudioProperties *properties;
+	int		m;
+	int		s;
+	int		sec;
+
+	ptrinfo = (INFO_OGG *)malloc (sizeof (INFO_OGG));
+	if (ptrinfo == NULL) return (NULL);
+	ptrinfo->tags = (TAGS *)tags_alloc ();
+
+	if ((file = taglib_file_new ( p_info->path_name_file ))) {
+
+		taglib_set_strings_unicode(FALSE);
+		tag = taglib_file_tag(file);
+		properties = taglib_file_audioproperties(file);
+
+		ptrinfo->tags->Title = C_strdup (taglib_tag_title(tag));
+		ptrinfo->tags->Artist = C_strdup (taglib_tag_artist(tag));
+		ptrinfo->tags->Album = C_strdup (taglib_tag_album(tag));
+		ptrinfo->tags->IntYear = taglib_tag_year(tag);
+		ptrinfo->tags->Year = C_strdup_printf ("%d", ptrinfo->tags->IntYear);
+		ptrinfo->tags->Comment = C_strdup (taglib_tag_comment(tag));
+		ptrinfo->tags->IntNumber = taglib_tag_track(tag);
+		ptrinfo->tags->Number = C_strdup_printf ("%d", ptrinfo->tags->IntNumber);
+		ptrinfo->tags->Genre = C_strdup (taglib_tag_genre(tag));
+		ptrinfo->tags->IntGenre = tags_get_genre_by_value (ptrinfo->tags->Genre);
+
+		ptrinfo->Channels = C_strdup_printf ("%d", taglib_audioproperties_channels (properties));
+		ptrinfo->Rate = C_strdup_printf ("%d", taglib_audioproperties_samplerate (properties));
+		ptrinfo->Nominal_bitrate = C_strdup_printf ("%d", taglib_audioproperties_bitrate (properties));
+
+		ptrinfo->SecTime =
+		sec = taglib_audioproperties_length(properties);
+		s = sec % 60; sec /= 60;
+		m = sec % 60; sec /= 60;
+		if (sec > 0) ptrinfo->time = C_strdup_printf ("%02d:%02d:%02d", sec, m, s);
+		else ptrinfo->time = C_strdup_printf ("00:%02d:%02d", m, s);
+
+		ptrinfo->size = C_strdup_printf ("%d Ko", (int)utils_get_size_file ( p_info->path_name_file ) / 1024);
+
+		taglib_tag_free_strings();
+		taglib_file_free (file);
+	}
+	else {
+		tags_complementation( ptrinfo->tags, p_info->path_name_file );
+	}
+	ptrinfo->LevelDbfs = GetInfo_level_get_from( FILE_IS_OGG, p_info->path_name_file );
+
+	return ((INFO_OGG *)ptrinfo);
+}
+

xcfa-5.0.2.tar.gz/src_cli/tags_rm.c Added

@@ -0,0 +1,85 @@
+/*
+ * file : src/tags_rm.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#include <pthread.h>
+#include <sys/types.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "global.h"
+#include "tags.h"
+#include <taglib/tag_c.h>
+
+
+
+
+/*
+*---------------------------------------------------------------------------
+* REMOVE HEADER
+*---------------------------------------------------------------------------
+*/
+INFO_RM *tagsrm_remove_info (INFO_RM *info)
+{
+	if (info) {
+
+		info->tags = (TAGS *)tags_remove (info->tags);
+
+		free (info);
+		info = NULL;
+	}
+	return ((INFO_RM *)NULL);
+}
+
+/*
+*---------------------------------------------------------------------------
+* GET HEADER
+*---------------------------------------------------------------------------
+*/
+INFO_RM *tagsrm_get_info( INFO *p_info )
+{
+	INFO_RM *ptrinfo = NULL;
+
+	ptrinfo = (INFO_RM *)malloc (sizeof (INFO_RM));
+	if (ptrinfo == NULL) return (NULL);
+
+	ptrinfo->tags = (TAGS *)tags_alloc ();
+	tags_complementation( ptrinfo->tags, p_info->path_name_file );
+
+	return ((INFO_RM *)ptrinfo);
+}
+
+
+
+
+
+
+
+
+

xcfa-5.0.2.tar.gz/src_cli/tags_shn.c Added

@@ -0,0 +1,96 @@
+/*
+ * file : src/tags_shn.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#include <pthread.h>
+#include <sys/types.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "global.h"
+#include "tags.h"
+#include <taglib/tag_c.h>
+#include "get_info.h"
+
+
+
+
+
+/*
+*---------------------------------------------------------------------------
+* REMOVE HEADER
+*---------------------------------------------------------------------------
+*/
+INFO_SHN *tagsshn_remove_info (INFO_SHN *info)
+{
+	if (info) {
+		if (NULL != info->time)		{ free (info->time); info->time = NULL;	}
+		if (NULL != info->size)		{ free (info->size);info->size = NULL;	}
+
+		info->tags = (TAGS *)tags_remove (info->tags);
+
+		free (info);
+		info = NULL;
+	}
+	return ((INFO_SHN *)NULL);
+}
+
+
+void tags_shn_print( INFO_SHN *ptrinfo )
+{
+	printf( "time = %s\n", ptrinfo->time );
+	printf( "SecTime = %d\n", ptrinfo->SecTime );
+	printf( "size = %s\n", ptrinfo->size );
+}
+
+
+/*
+*---------------------------------------------------------------------------
+* GET HEADER
+*---------------------------------------------------------------------------
+*/
+INFO_SHN *tagsshn_get_info( INFO *p_info )
+{
+	INFO_SHN	*ptrinfo = NULL;
+	SHNTAG		*ShnTag = GetInfo_shntool ( p_info->path_name_file );
+
+	ptrinfo = (INFO_SHN *)malloc (sizeof (INFO_SHN));
+	if (ptrinfo == NULL) return (NULL);
+	ptrinfo->tags = (TAGS *)tags_alloc ();
+
+	ptrinfo->SecTime = ShnTag->SecTime;
+	ptrinfo->time = C_strdup (ShnTag->time);
+	ptrinfo->size = C_strdup (ShnTag->size);
+
+	tags_complementation( ptrinfo->tags, p_info->path_name_file );
+
+	ShnTag = GetInfo_free_shntool (ShnTag);
+
+	return ((INFO_SHN *)ptrinfo);
+}

xcfa-5.0.2.tar.gz/src_cli/tags_wav.c Added

@@ -0,0 +1,368 @@
+/*
+ * file : src/tags_wav.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#include <sys/types.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "global.h"
+#include "tags.h"
+#include "get_info.h"
+
+
+//
+//
+void tagswav_close_file( WAVE *WaveHeader )
+{
+	if (NULL != WaveHeader->file) {
+		fclose(WaveHeader->file);
+		WaveHeader->file = NULL;
+	}
+}
+//
+//
+void tagswav_init (WAVE *WaveHeader)
+{
+	WaveHeader->RIFF.ChunkID [ 0 ] = '\0';
+	WaveHeader->RIFF.ChunkSize = 0;
+	WaveHeader->RIFF.Format [ 0 ] = '\0';
+	WaveHeader->FMT.Subchunk1ID [ 0 ] = '\0';
+	WaveHeader->FMT.Subchunk1Size = 0;
+	WaveHeader->FMT.AudioFormat = 0;
+	WaveHeader->FMT.NumChannels = 0;
+	WaveHeader->FMT.SampleRate = 0;
+	WaveHeader->FMT.ByteRate = 0;
+	WaveHeader->FMT.Blockalign = 0;
+	WaveHeader->FMT.BitsPerSample = 0;
+	WaveHeader->DATA.Subchunk2ID [ 0 ] = '\0';
+	WaveHeader->DATA.Subchunk2Size = 0;
+	WaveHeader->DATA.data = NULL;
+	WaveHeader->file = NULL;
+	WaveHeader->TagWavIsFmtBext = TAG_WAVE_IS_NONE;
+}
+//
+//
+void tagswav_print_header( char *p_PathNameFile )
+{
+	WAVE	WaveHeader;
+	if (TRUE == tagswav_read_file( p_PathNameFile, &WaveHeader )) {
+		//printf ("\n" );
+		//printf ("\t%s\n", p_PathNameFile );
+		printf ("\tChunkID = %c%c%c%c\n", WaveHeader.RIFF.ChunkID [ 0 ], WaveHeader.RIFF.ChunkID [ 1 ], WaveHeader.RIFF.ChunkID [ 2 ], WaveHeader.RIFF.ChunkID [ 3 ] );
+		printf ("\tChunkSize = %d\n", WaveHeader.RIFF.ChunkSize);
+		printf ("\tFormat = %c%c%c%c\n", WaveHeader.RIFF.Format [ 0 ], WaveHeader.RIFF.Format [ 1 ], WaveHeader.RIFF.Format [ 2 ], WaveHeader.RIFF.Format [ 3 ] );
+		printf( "\t%s\n", (WaveHeader.TagWavIsFmtBext == TAG_WAVE_IS_FMT) ? "[ 'fmt ' ]" : "[ 'bext' | 'qlty' | 'levl' | 'link' | 'axml' ]" );
+		printf ("\tSubchunk1ID = %c%c%c%c\n", WaveHeader.FMT.Subchunk1ID [ 0 ], WaveHeader.FMT.Subchunk1ID [ 1 ], WaveHeader.FMT.Subchunk1ID [ 2 ], WaveHeader.FMT.Subchunk1ID [ 3 ] );
+		printf ("\tSubchunk1Size = %d\n", WaveHeader.FMT.Subchunk1Size);
+		printf ("\tAudioFormat = %d\n", WaveHeader.FMT.AudioFormat);
+		printf ("\tNumChannels = %d\n", WaveHeader.FMT.NumChannels);
+		printf ("\tSampleRate = %d\n", WaveHeader.FMT.SampleRate);
+		printf ("\tByteRate = %d\n", WaveHeader.FMT.ByteRate);
+		printf ("\tBlockalign = %d\n", WaveHeader.FMT.Blockalign);
+		printf ("\tBitsPerSample = %d\n", WaveHeader.FMT.BitsPerSample);
+		printf ("\tSubchunk2ID = %c%c%c%c\n", WaveHeader.DATA.Subchunk2ID [ 0 ], WaveHeader.DATA.Subchunk2ID [ 1 ], WaveHeader.DATA.Subchunk2ID [ 2 ], WaveHeader.DATA.Subchunk2ID [ 3 ] );
+		printf ("\tSubchunk2Size = %d\n", WaveHeader.DATA.Subchunk2Size);
+		tagswav_close_file( &WaveHeader );
+	}
+}
+//
+//
+#define BLOCK_SIZE	2352
+//
+//
+int tagswav_get_pos( char *p_PathNameFile, char p_1, char p_2, char p_3, char p_4 )
+{
+	FILE		*file = NULL;
+ 	unsigned char 	devbuf[ BLOCK_SIZE +10 ];
+ 	int		n_read;
+	int		tt_read = 0;
+	int		cpt;
+
+	if( NULL != (file = fopen( p_PathNameFile, "rb" ))) {
+
+		do {
+			// LECTURE D UN BLOCK
+			n_read = fread( devbuf, BLOCK_SIZE, 1, file );
+
+			// RECHERCHE DE: data
+			for( cpt = 0; cpt < BLOCK_SIZE; cpt ++ ) {
+				if( devbuf [ cpt +0 ] == p_1 && devbuf [ cpt +1 ] == p_2 && devbuf [ cpt +2 ] == p_3 && devbuf [ cpt +3 ] == p_4 ) {
+					return( tt_read + cpt );
+				}
+			}
+
+			// VARIABLE TOTAL OCTECTS LU MOINS 8 AU CAS OU data SOIS COUPE EN FIN DE BLOCK
+			tt_read += BLOCK_SIZE;
+			tt_read -= 8;
+
+			// POINTEUR AU DEBUT DU FICHIER
+			rewind( file );
+
+			// POINTEUR DE LECTURE SUR tt_read
+			fseek( file, tt_read, SEEK_CUR );
+
+		} while( n_read > 0 );
+
+		fclose( file );
+	}
+
+	return( -1 );
+}
+//
+// MODIF DU 02 MAI 2013 A LA DEMANDE DE CHRISTOPHE MARILLAT POUR TENIR COMPTE DE : Broadcast Wave Format
+// VERSION DE TEST:
+//	xcfa-4.3.4~beta0
+//	xcfa-4.3.4~beta1
+// xcfa_cli
+/*
+
+broadcast_audio_extension typedef struct {
+ DWORD ckID; 		 // (broadcastextension)ckID=bext.
+ DWORD ckSize; 		 // size of extension chunk
+ BYTE ckData[ckSize]; 		 // data of the chunk
+}
+
+
+Quality_chunk typedef struct {
+ DWORD ckID; 		// (quality_chunk) ckID='qlty'
+ DWORD ckSize; 		// size of quality chunk
+ BYTE ckData[ckSize]; 		// data of the chunk
+}
+
+
+typedef struct peak_envelope
+{
+ CHAR ckID[4];				// {'l','e','v','l'}
+ DWORD ckSize;				// size of chunk
+ DWORD dwVersion;			// version information
+ DWORD dwFormat;				// format of a peak point
+										// 1 = unsigned char
+										// 2 = unsigned short
+ DWORD dwPointsPerValue;		// 1 = only positive peak point
+										// 2 = positive AND negative peak point
+ DWORD dwBlockSize;			// frames per value
+ DWORD dwPeakChannels;		// number of channels
+ DWORD dwNumPeakFrames;		// number of peak frames
+ DWORD dwPosPeakOfPeaks;		// audio sample frame index
+										// or 0xFFFFFFFF if unknown
+ DWORD dwOffsetToPeaks;		// should usually be equal to the size of this header, but could also be higher
+ CHAR strTimestamp[28];		// ASCII: time stamp of the peak data
+ CHAR reserved[60];			// reserved set to 0x00
+ CHAR peak_envelope_data[]	// the peak point data
+}
+levl_chunk;
+
+
+typedef struct link
+{
+ CHAR CkID[4];				// 'link'
+ DWORD CkSize;				// size of chunk
+ CHAR XmlData[ ];			// text data in XML
+}
+link_chunk;
+
+
+typedef struct axml
+{
+ CHAR ckID[4];				// {'a','x','m','l'}
+ DWORD ckSize;					// size of chunk
+ CHAR xmlData[ ];				// text data in XML
+}
+axml_chunk;
+
+*/
+C_BOOL tagswav_read_file (char *wave_file, WAVE *WaveHeader)
+{
+	int	seek_fmt = -1;
+	int	seek_data = -1;
+ 	int	n_read;
+
+	seek_fmt = tagswav_get_pos( wave_file, 'f', 'm', 't', ' ' );
+	seek_data = tagswav_get_pos( wave_file, 'd', 'a', 't', 'a' );
+	if( -1 == seek_fmt || -1 == seek_data ) return( FALSE );
+
+	if( NULL == ( WaveHeader->file = fopen( wave_file, "rb" ))) return (FALSE);
+
+	// LECTURE ENTETE
+	n_read = fread( &WaveHeader->RIFF.ChunkID, 4, 1, WaveHeader->file );		// RIFF
+	n_read = fread( &WaveHeader->RIFF.ChunkSize, 4, 1, WaveHeader->file );		// taille du fichier entier en octets (sans compter les 8 octets de ce champ et le champ précédent
+	n_read = fread( &WaveHeader->RIFF.Format, 4, 1, WaveHeader->file );			// WAVE
+	n_read = fread( &WaveHeader->FMT.Subchunk1ID, 4, 1, WaveHeader->file );		// 'fmt ' | 'bext'
+
+	if( 0 == strncmp( WaveHeader->FMT.Subchunk1ID, "fmt ", 4 )) {
+		WaveHeader->TagWavIsFmtBext = TAG_WAVE_IS_FMT;
+	}
+	else {
+		WaveHeader->TagWavIsFmtBext = TAG_WAVE_IS_BEXT;
+		n_read = fseek( WaveHeader->file, seek_fmt + 4, SEEK_SET );
+	}
+
+	// FMT
+	n_read = fread( &WaveHeader->FMT.Subchunk1Size, 4, 1, WaveHeader->file );	// taille en octet des données à suivre
+	n_read = fread( &WaveHeader->FMT.AudioFormat, 2, 1, WaveHeader->file );		// format de compression (une valeur autre que 1 indique une compression)
+	n_read = fread( &WaveHeader->FMT.NumChannels, 2, 1, WaveHeader->file );		// nombre de canaux
+	n_read = fread( &WaveHeader->FMT.SampleRate, 4, 1, WaveHeader->file );		// fréquence d'échantillonage (nombre d'échantillons par secondes)
+	n_read = fread( &WaveHeader->FMT.ByteRate, 4, 1, WaveHeader->file );		// nombre d'octects par secondes
+	n_read = fread( &WaveHeader->FMT.Blockalign, 2, 1, WaveHeader->file );		// nombre d'octects pour coder un échantillon
+	n_read = fread( &WaveHeader->FMT.BitsPerSample, 2, 1, WaveHeader->file );	// nombre de bits pour coder un échantillon
+
+	// DATA
+	n_read = fseek( WaveHeader->file, seek_data, SEEK_SET );
+	n_read = fread( &WaveHeader->DATA.Subchunk2ID, 4, 1, WaveHeader->file );
+	n_read = fread( &WaveHeader->DATA.Subchunk2Size, 4, 1, WaveHeader->file );
+
+	if( n_read );
+	// 	tagswav_print_header( wave_file, WaveHeader );
+
+	return( TRUE );
+
+}
+//
+//
+INFO_WAV *tagswav_remove_info (INFO_WAV *info)
+{
+	if (info) {
+		if (NULL != info->time)		{ free (info->time);		info->time = NULL;	}
+		if (NULL != info->hertz)	{ free (info->hertz);		info->hertz = NULL;	}
+		if (NULL != info->voie)		{ free (info->voie);		info->voie = NULL;	}
+		if (NULL != info->bits)		{ free (info->bits);		info->bits = NULL;	}
+
+		info->tags = (TAGS *)tags_remove (info->tags);
+
+		free (info);
+		info = NULL;
+	}
+	return ((INFO_WAV *)NULL);
+}
+//
+//
+C_BOOL tagswav_file_GetBitrate (char *namefile, int *Channels, int *Hertz, int *Bits)
+{
+	WAVE	WaveHeader;
+
+	if (TRUE == tagswav_read_file (namefile, &WaveHeader)) {
+		tagswav_close_file( &WaveHeader );
+		if( NULL != Channels )	*Channels = WaveHeader.FMT.NumChannels;
+		if( NULL != Hertz )		*Hertz = WaveHeader.FMT.SampleRate;
+		if( NULL != Bits )		*Bits = WaveHeader.FMT.BitsPerSample;
+
+		return ((WaveHeader.FMT.NumChannels != 2 || WaveHeader.FMT.SampleRate != 44100 || WaveHeader.FMT.BitsPerSample != 16) ? TRUE : FALSE);
+	}
+	return (FALSE);
+}
+
+
+void tags_wav_print( INFO_WAV *ptrinfo )
+{
+	printf( "\ttime = %s\n", ptrinfo->time );
+	printf( "\tSecTime = %d\n", ptrinfo->SecTime );
+	printf( "\thertz = %s\n", ptrinfo->hertz );
+	printf( "\tvoie = %s\n", ptrinfo->voie );
+	printf( "\tbits = %s\n", ptrinfo->bits );
+	printf( "\tLevelDbfs = %d\n", ptrinfo->LevelDbfs );
+}
+
+
+//
+//
+INFO_WAV *tagswav_get_info (INFO *p_info)
+{
+	WAVE		WaveHeader;
+	INFO_WAV	*ptrinfo = NULL;
+	int		m;
+	int		s;
+	int		sec;
+	C_BOOL	BoolReadWavFile;
+
+	// PRINT_FUNC_LF();
+
+	ptrinfo = (INFO_WAV *)malloc (sizeof (INFO_WAV));
+	if (NULL == ptrinfo) {
+		printf ("!---------------------------------------\n");
+		PRINT_FUNC_LF();
+		printf ("!---------------------------------------\n");
+		printf ("! PTRINFO EST NULL :(\n");
+		printf ("!---------------------------------------\n");
+		return (NULL);
+	}
+
+	BoolReadWavFile = tagswav_read_file (p_info->path_name_file, &WaveHeader);
+	tagswav_close_file( &WaveHeader );
+
+	if (FALSE == BoolReadWavFile) {
+		free (ptrinfo);
+		PRINT("EXIT");
+		ptrinfo = NULL;
+		return (NULL);
+	}
+	if (WaveHeader.DATA.Subchunk2Size == 0 || WaveHeader.FMT.ByteRate == 0) {
+		free (ptrinfo);
+		ptrinfo = NULL;
+		printf ("! ---\n");
+		printf ("! MAUVAIS ENTETE DU FICHIER: %s\n", p_info->path_name_file);
+		printf ("! ---\n\n");
+		return (NULL);
+	}
+
+	// calcul de la duree
+	sec = WaveHeader.DATA.Subchunk2Size / WaveHeader.FMT.ByteRate;
+	ptrinfo->SecTime = sec;
+
+	s = sec % 60; sec /= 60;
+	m = sec % 60; sec /= 60;
+	if (sec > 0) ptrinfo->time = C_strdup_printf ("%02d:%02d:%02d", sec, m, s);
+	else ptrinfo->time = C_strdup_printf ("00:%02d:%02d", m, s);
+
+	// 'fmt ', 'bext', 'qlty', 'levl', 'link','axml'
+	ptrinfo->BoolBwf = (WaveHeader.TagWavIsFmtBext == TAG_WAVE_IS_FMT) ? FALSE : TRUE;
+
+	// mode
+	ptrinfo->voie = C_strdup_printf ("%d", WaveHeader.FMT.NumChannels);
+
+	// freq
+	ptrinfo->hertz = C_strdup_printf ("%d", WaveHeader.FMT.SampleRate);
+
+	// format
+	ptrinfo->bits = C_strdup_printf ("%d", WaveHeader.FMT.BitsPerSample);
+
+	ptrinfo->tags = (TAGS *)tags_alloc ();
+	tags_complementation( ptrinfo->tags, p_info->path_name_file );
+
+	ptrinfo->LevelDbfs = GetInfo_level_get_from( FILE_IS_WAV, p_info->path_name_file );
+
+	return( (INFO_WAV *)ptrinfo );
+}
+
+
+
+
+
+
+

xcfa-5.0.2.tar.gz/src_cli/tags_wavpack.c Added

@@ -0,0 +1,134 @@
+/*
+ * file : src/tags_wavpack.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#include <sys/types.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "global.h"
+#include "tags.h"
+#include <taglib/tag_c.h>
+#include "get_info.h"
+
+
+/*
+*---------------------------------------------------------------------------
+* VARIABLES
+*---------------------------------------------------------------------------
+*/
+
+/*
+typedef struct {
+ char ckID [4]; "wvpk"
+ uint32_t ckSize; size of entire block (minus 8, of course)
+ uint16_t version; 0x402 to 0x410 are currently valid for decode
+ uchar track_no; track number (0 if not used, like now)
+ uchar index_no; track sub-index (0 if not used, like now)
+ uint32_t total_samples; total samples for entire file, but this is
+ only valid if block_index == 0 and a value of
+ -1 indicates unknown length
+ uint32_t block_index; index of first sample in block relative to
+ beginning of file (normally this would start
+ at 0 for the first block)
+ uint32_t block_samples; number of samples in this block (0 = no audio)
+ uint32_t flags; various flags for id and decoding
+ uint32_t crc; crc for actual decoded data
+} WavpackHeader;
+*/
+
+/*
+typedef struct {
+	char id [ 3 ];
+	char title [ 30 ];
+	char interprete [ 30 ];
+	char album [ 30 ];
+	char annee [ 4 ];
+	char comment [ 30 ];
+	char genre [ 1 ];
+} TAGS_WAVPACK;
+*/
+
+
+/*
+*---------------------------------------------------------------------------
+* GET HEADER
+*---------------------------------------------------------------------------
+*/
+
+
+INFO_WAVPACK *tagswavpack_remove_info (INFO_WAVPACK *info)
+{
+	if (info) {
+		if (NULL != info->time)		{ free (info->time);		info->time = NULL;	}
+		if (NULL != info->size)		{ free (info->size);		info->size = NULL;	}
+
+		info->tags = (TAGS *)tags_remove (info->tags);
+
+		free (info);
+		info = NULL;
+	}
+	return ((INFO_WAVPACK *)NULL);
+}
+
+
+void tags_wavpack_print( INFO_WAVPACK *ptrinfo )
+{
+	printf( "time = %s\n", ptrinfo->time );
+	printf( "SecTime = %d\n", ptrinfo->SecTime );
+	printf( "size = %s\n", ptrinfo->size );
+}
+
+
+INFO_WAVPACK *tagswavpack_get_info( INFO *p_info )
+{
+	INFO_WAVPACK	*ptrinfo = NULL;
+	SHNTAG		*ShnTag = GetInfo_shntool ( p_info->path_name_file );
+	int		m;
+	int		s;
+	int		sec;
+
+	ptrinfo = (INFO_WAVPACK *)malloc (sizeof (INFO_WAVPACK));
+	if (ptrinfo == NULL) return (NULL);
+	ptrinfo->tags = (TAGS *)tags_alloc ();
+
+	ptrinfo->size = C_strdup (ShnTag->size);
+
+	ptrinfo->SecTime =
+	sec = ShnTag->SecTime;
+	s = sec % 60; sec /= 60;
+	m = sec % 60; sec /= 60;
+	if (sec > 0) ptrinfo->time = C_strdup_printf ("%02d:%02d:%02d", sec, m, s);
+	else ptrinfo->time = C_strdup_printf ("00:%02d:%02d", m, s);
+
+	tags_complementation( ptrinfo->tags, p_info->path_name_file );
+	ShnTag = GetInfo_free_shntool (ShnTag);
+
+	return( (INFO_WAVPACK *)ptrinfo );
+}

xcfa-5.0.2.tar.gz/src_cli/tags_wma.c Added

@@ -0,0 +1,90 @@
+/*
+ * file : src/tags_wma.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#include <sys/types.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "global.h"
+#include "tags.h"
+#include <taglib/tag_c.h>
+
+
+/*
+*---------------------------------------------------------------------------
+* VARIABLES
+*---------------------------------------------------------------------------
+*/
+
+
+
+/*
+*---------------------------------------------------------------------------
+* FILE IS WMA ?
+*---------------------------------------------------------------------------
+*/
+
+
+/*
+*---------------------------------------------------------------------------
+* REMOVE HEADER
+*---------------------------------------------------------------------------
+*/
+INFO_WMA *tagswma_remove_info (INFO_WMA *info)
+{
+	if (info) {
+
+		info->tags = (TAGS *)tags_remove (info->tags);
+
+		free (info);
+		info = NULL;
+	}
+	return ((INFO_WMA *)NULL);
+}
+
+
+/*
+*---------------------------------------------------------------------------
+* GET HEADER
+*---------------------------------------------------------------------------
+*/
+INFO_WMA *tagswma_get_info( INFO *p_info )
+{
+	INFO_WMA *ptrinfo = NULL;
+
+	ptrinfo = (INFO_WMA *)malloc (sizeof (INFO_WMA));
+	if (ptrinfo == NULL) return (NULL);
+
+	ptrinfo->tags = (TAGS *)tags_alloc ();
+	tags_complementation( ptrinfo->tags, p_info->path_name_file );
+
+	return ((INFO_WMA *)ptrinfo);
+}
+

xcfa-5.0.2.tar.gz/src_cli/utils.c Added

@@ -0,0 +1,110 @@
+/*
+ * file : src/utils.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+#include "global.h"
+
+
+// Renvoie la taille d'un fichier en octets
+// Returns the size of a file in bytes
+size_t utils_get_size_file( char *PathName )
+{
+	FILE *fp;
+	size_t size = 0;
+
+	if ((fp = fopen( PathName, "r" ))) {
+		fseek( fp, 0, SEEK_END );
+		size = ftell( fp );
+		fclose( fp );
+	}
+	return( size );
+}
+// Création d'un dossier temporaire
+// Create a temporary folder
+// FIXED
+// Mon, 20 Jan 2014 16:33:36 +0100
+// Plusieurs instances de XCFA peuvent être activées sans collision
+// Multiple instances of XCFA can be activated without collision
+char *utils_create_rep( char *path_name_rep )
+{
+	char	*PathTest = NULL;
+	char	*Path = NULL;
+	char	*Ptr = NULL;
+	int		NumPath = 0;
+
+	Path = C_strdup( path_name_rep );
+	if( NULL != (Ptr = strrchr( Path, '/' )))
+		if( *(Ptr + 1) == '\0' )
+			*Ptr = '\0';
+	PathTest = C_strdup( Path );
+
+	while( TRUE ) {
+		if( TRUE == C_dir_test( PathTest ) ) {
+			free( PathTest );
+			PathTest = NULL;
+			PathTest = C_strdup_printf( "%s_%d/", Path, NumPath );
+			NumPath ++;
+		}
+		else {
+			C_mkdir_with_parents( PathTest );
+			free( Path );
+			Path = NULL;
+			break;
+		}
+	}
+	return( (char *)PathTest );
+}
+// Suppression d'un dossier temporaire
+// Delete a temporary folder
+char *utils_remove_temporary_rep( char *path_tmprep )
+{
+	if( NULL != path_tmprep ) {
+		C_rmdir( path_tmprep );
+		free( path_tmprep );
+		path_tmprep = NULL;
+	}
+	return ((char *)NULL);
+}
+// Renvoie le chemin de destination
+// Returns the destination path
+char *utils_get_dir_dest( INFO *p_Info )
+{
+	char	*OutputDir = NULL;
+
+	if( TRUE == Detail.BoolExtract2Src ) {
+		OutputDir = C_strdup( p_Info->path );
+	}
+	else {
+		if( *Detail.OutputDir == '/' ) {
+			OutputDir = C_strdup( Detail.OutputDir );
+		}
+		else {
+			OutputDir = C_strdup_printf( "%s%s", p_Info->path, Detail.OutputDir );
+		}
+	}
+	return( OutputDir );
+}
\ No newline at end of file

xcfa-5.0.2.tar.gz/src_cli/wav.c Added

@@ -0,0 +1,120 @@
+/*
+ * file : src/wav.c
+ * project : xcfa_cli
+ * copyright : (C) 2014 by BULIN Claude
+ *
+ * This file is part of xcfa_cli project
+ *
+ * xcfa_cli is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 3.
+ *
+ * xcfa_cli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+
+
+#ifdef HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "global.h"
+#include "conv.h"
+#include "tags.h"
+
+
+
+//
+// Changing the settings of a WAV file
+// --frequency -f Changing the frequency: 8000, 22000, 32000, 44056, 44100, 48000, 88200, 96000 or other
+// --track -t Changing the number of tracks: 1, 2, 4, 6
+// --quantification -q Changing the quantification: 8, 16, 24, 32, 64
+//
+void wav_change_setting( char *p_pathnamefile, int p_frequency, int p_track, int p_quantification )
+{
+	char	**PtrTabArgs = NULL;
+	int		pos;
+	int		Channels;
+	int		Hertz;
+	int		Bits;
+	char	*NewName = C_strdup_printf( "%s.setting.wav", p_pathnamefile );
+
+	printf("\n!--- S E T T I N G P A R A M E T E R S W A V ---------!\n");
+	if( p_frequency <= 0 && p_frequency > 96000 ) p_frequency = 44100;
+	if( p_track != 1 && p_track != 2 && p_track != 4 && p_track != 6 ) p_track = 2;
+	if( p_quantification != 8 && p_quantification != 16 && p_quantification != 24 && p_quantification != 32 && p_quantification != 64 ) p_quantification = 16;
+
+	PtrTabArgs = conv_AllocTabArgs( &pos );
+
+	PtrTabArgs [ pos++ ] = C_strdup( "mplayer" );
+	PtrTabArgs [ pos++ ] = C_strdup( "-nojoystick" );
+	PtrTabArgs [ pos++ ] = C_strdup( "-nolirc" );
+	PtrTabArgs [ pos++ ] = C_strdup( p_pathnamefile );
+	PtrTabArgs [ pos++ ] = C_strdup( "-ao" );
+	PtrTabArgs [ pos++ ] = C_strdup( "pcm" );
+	PtrTabArgs [ pos++ ] = C_strdup( "-ao" );
+	PtrTabArgs [ pos++ ] = C_strdup_printf( "pcm:file=%s", NewName );
+	PtrTabArgs [ pos++ ] = C_strdup( "-af" );
+	PtrTabArgs [ pos++ ] = C_strdup_printf( "channels=%d", p_track );
+	PtrTabArgs [ pos++ ] = C_strdup( "-srate" );
+	PtrTabArgs [ pos++ ] = C_strdup_printf( "%d", p_frequency );
+	PtrTabArgs [ pos++ ] = NULL;
+	conv_to_convert( PtrTabArgs, MPLAYER_WAV_TO_WAV, "MPLAYER_WAV_TO_WAV" );
+	PtrTabArgs = conv_RemoveTab( PtrTabArgs );
+
+	conv_copy_src_to_dest( NewName, p_pathnamefile );
+	remove( NewName );
+
+	tagswav_file_GetBitrate( p_pathnamefile, &Channels, &Hertz, &Bits );
+
+	if( Bits != p_quantification ) {
+		fileconv_change_quantification_with_sox( TRUE, p_pathnamefile, NewName, p_frequency, p_track, p_quantification );
+		remove( NewName );
+	}
+
+	free( NewName );
+	NewName = NULL;
+
+}
+
+void loop_wav_change_setting( int p_frequency, int p_track, int p_quantification )
+{
+	CList	*list = NULL;
+	INFO	*Info = NULL;
+
+	if( NULL != ( list = C_list_first( Detail.ListFile ))) {
+		while( list ) {
+			if( NULL != (Info = (INFO *)list->data) ) {
+				if( Info->type_infosong_file_is == FILE_IS_WAV ) {
+
+					wav_change_setting( Info->path_name_file, p_frequency, p_track, p_quantification );
+				}
+			}
+			list = C_list_next( list );
+		}
+	}
+}
+
+
+
+
+
+
+
+
+
+
+
+

Build Results
RPM Lint

Refresh

Comments for request 4230 0

Request History

Aloysius created request over 6 years ago

olh accepted request over 6 years ago