Merge lp:~logan/ubuntu/raring/soundconverter/new-upstream into lp:ubuntu/raring/soundconverter

[Logan Rosen]

[Charlie_Smotherman (cjsmo)]

Although not mandatory it would be nice if you opened a bug in the debian BTS about the missing watch file and missing manpage. Uploaded

=== modified file 'ChangeLog'
--- ChangeLog	2012-02-22 21:58:39 +0000
+++ ChangeLog	2012-11-21 17:48:22 +0000
@@ -1,3 +1,154 @@
[phone]  kassoulet <[e-mail]>
+
+	* NEWS, po/fr.po: version 2.0.4
+
[phone]  kassoulet <[e-mail]>
+
+	* po/ar.po, po/ast.po, po/bg.po, po/br.po, po/ca.po, po/cs.po,
+	po/da.po, po/de.po, po/el.po, po/en_AU.po, po/en_GB.po, po/eo.po,
+	po/es.po, po/et.po, po/eu.po, po/fa.po, po/fi.po, po/fr.po,
+	po/fr_CA.po, po/gl.po, po/he.po, po/hi.po, po/hu.po, po/it.po,
+	po/ja.po, po/ko.po, po/lv.po, po/ml.po, po/ms.po, po/nl.po,
+	po/pl.po, po/pt.po, po/pt_BR.po, po/ru.po, po/sk.po, po/sl.po,
+	po/soundconverter.pot, po/sr.po, po/[e-mail], po/[e-mail],
+	po/sv.po, po/te.po, po/tr.po, po/uk.po, po/vi.po, po/zh_CN.po,
+	po/zh_TW.po: Update translations.
+
[phone]  kassoulet <[e-mail]>
+
+	* bin/soundconverter.py: Finally fix the setlocale problem.
+
[phone]  kassoulet <[e-mail]>
+
+	* soundconverter/ui.py: Fix typo with opus-bitrate setting.
+
[phone]  kassoulet <[e-mail]>
+
+	* configure.in: upgrade configure.in
+
[phone]  kassoulet <[e-mail]>
+
+	* soundconverter/ui.py: Add Opus quality settings
+
[phone]  kassoulet <[e-mail]>
+
+	* soundconverter/gstreamer.py: Support for Opus codec.
+
[phone]  kassoulet <[e-mail]>
+
+	* data/soundconverter.glade, soundconverter/gstreamer.py,
+	soundconverter/ui.py: UI additions for opus support.
+
[phone]  kassoulet <[e-mail]>
+
+	* soundconverter/gstreamer.py: Remove profile setting from faac
+	encoding, since it seems that some gstreamer instalations don't
+	support this.  Closes lp:954555, thanks Patrick and zebul666.
+
[phone]  kassoulet <[e-mail]>
+
+	* soundconverter/ui.py: Fix crash with folderchooser.  Closes
+	fedora:836338, thanks Michael.
+
[phone]  kassoulet <[e-mail]>
+
+	* bin/soundconverter.py: Handle exceptions with setlocale.  Closes
+	lp:1001347, thanks Edward.
+
[phone]  kassoulet <[e-mail]>
+
+	* soundconverter/ui.py: Use parent folder as base path when only one
+	folder is passed to add_uris.  Closes lp:998371, thank Bastian.
+
[phone]  kassoulet <[e-mail]>
+
+	* bin/soundconverter.py, doc/soundconverter.1,
+	soundconverter/gstreamer.py, soundconverter/ui.py: Fix arguments
+	 parsing so -m and -s work.  Closes lp:988262, thanks Michael.  Add missing default encoding parameters so batch mode stops
+	 crashing.  Closes lp:995862, thanks Michael.
+
[phone]  kassoulet <[e-mail]>
+
+	* bin/soundconverter.py, soundconverter/gstreamer.py,
+	soundconverter/ui.py: Finalize batch mode.  No more message dialogs
+	in gtreamer.py + notification failback.
+
[phone]  kassoulet <[e-mail]>
+
+	* bin/soundconverter.py: Fix batch mode failback.
+
[phone]  kassoulet <[e-mail]>
+
+	* bin/soundconverter.py, soundconverter/Makefile.am,
+	soundconverter/batch.py, soundconverter/gstreamer.py: WIP batch mode
+	fix.
+
[phone]  kassoulet <[e-mail]>
+
+	* bin/soundconverter.py: change error message when importing a not
+	supported version version of pygtk.
+
[phone]  kassoulet <[e-mail]>
+
+	* NEWS: Version 2.0.3
+
[phone]  kassoulet <[e-mail]>
+
+	* soundconverter/gstreamer.py: Increase lowpass frequency to 20KHz
+	when encoding to high quality mp3.  Fix lp:881413, thanks Michael.
+
[phone]  kassoulet <[e-mail]>
+
+	* po/Makefile.in.in, po/ar.po, po/ast.po, po/bg.po, po/br.po,
+	po/ca.po, po/cs.po, po/da.po, po/de.po, po/el.po, po/en_AU.po,
+	po/en_GB.po, po/eo.po, po/es.po, po/et.po, po/eu.po, po/fa.po,
+	po/fi.po, po/fr.po, po/fr_CA.po, po/gl.po, po/he.po, po/hi.po,
+	po/hu.po, po/it.po, po/ja.po, po/ko.po, po/lv.po, po/ml.po,
+	po/ms.po, po/nl.po, po/pl.po, po/pt.po, po/pt_BR.po, po/ru.po,
+	po/sk.po, po/sl.po, po/soundconverter.pot, po/sr.po, po/[e-mail],
+	po/[e-mail], po/sv.po, po/te.po, po/tr.po, po/uk.po, po/vi.po,
+	po/zh_CN.po, po/zh_TW.po: Update translations.
+
[phone]  kassoulet <[e-mail]>
+
+	* soundconverter/namegenerator.py: Use the original filename as a
+	title by default, so filename generation works even if there are no
+	tags.  fix lp:984790
+
[phone]  kassoulet <[e-mail]>
+
+	* soundconverter/ui.py: pulse_progress can be at 0, disabling
+	progress while it was in fact used.
+
[phone]  kassoulet <[e-mail]>
+
+	* soundconverter/namegenerator.py: Disable common root handling when
+	we are creating folder using tags.  (thanks Eric, closes #972158)
+
[phone]  kassoulet <[e-mail]>
+
+	* configure.in, soundconverter/gstreamer.py, soundconverter/ui.py: 
+	Fix row progress.
+
[phone]  kassoulet <[e-mail]>
+
+	* soundconverter/ui.py: Fix progress-related blocking by speeding up
+	the progress update.  Closes #940648, thanks Ben.
+
[phone]  kassoulet <[e-mail]>
+
+	* INSTALL: Remove INSTALL file as it's generated.
+
[phone]  kassoulet <[e-mail]>
+
+	* configure.in, po/fr_CA.po: Add canadian french.
+
[phone]  kassoulet <[e-mail]>
+
+	* bin/soundconverter.py, data/soundconverter.desktop.in.in,
+	data/soundconverter.glade, soundconverter/gstreamer.py: Fix many
+	English spelling errors.  (Thanks Alain-Olivier)
+
 2012-01-30  kassoulet <[e-mail]>
 
 	* NEWS, configure.in: readying 2.0.1

=== modified file 'INSTALL'
--- INSTALL	2011-11-26 12:14:13 +0000
+++ INSTALL	2012-11-21 17:48:22 +0000
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -226,6 +226,11 @@
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended

=== modified file 'Makefile.in'
--- Makefile.in	2012-02-22 21:58:39 +0000
+++ Makefile.in	2012-11-21 17:48:22 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 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.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -15,6 +15,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -54,6 +71,11 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -66,9 +88,11 @@
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -97,10 +121,13 @@
 GZIP_ENV = --best
 DIST_ARCHIVES = $(distdir).tar.xz
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -136,6 +163,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -193,6 +224,8 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -224,7 +257,7 @@
 all: all-recursive
 
 .SUFFIXES:
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -428,13 +461,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -466,14 +496,18 @@
 	$(am__remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
 	$(am__remove_distdir)
 
 dist-lzma: distdir
 	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
 	$(am__remove_distdir)
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__remove_distdir)
 
 dist-tarZ: distdir
@@ -490,7 +524,7 @@
 	$(am__remove_distdir)
 
 dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
@@ -504,6 +538,8 @@
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
 	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -513,7 +549,7 @@
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	chmod -R a-w $(distdir); chmod u+w $(distdir)
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
@@ -523,6 +559,7 @@
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -551,8 +588,16 @@
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -583,10 +628,15 @@
 
 installcheck: installcheck-recursive
 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:
@@ -675,15 +725,15 @@
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-am clean clean-generic \
 	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-	dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \
-	distclean distclean-generic distclean-tags distcleancheck \
-	distdir distuninstallcheck 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-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
+	dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
+	distcheck distclean distclean-generic distclean-tags \
+	distcleancheck distdir distuninstallcheck 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-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
 

=== modified file 'NEWS'
--- NEWS	2012-02-22 21:58:39 +0000
+++ NEWS	2012-11-21 17:48:22 +0000
@@ -1,4 +1,52 @@
 
+Version 2.0.4
+=============
+
+Add support for Opus codec (http://www.opus-codec.org/)
+
+Fix command line arguments parsing.
+(Closes lp:995862, thanks Michael)
+
+Fix problem with AAC settings.
+(closes lp:954555, thanks Patrick and zebul666)
+
+Fix crash in FolderChooser.
+(Closes fedora:836338, thanks Michael)
+
+Fix yet another problem with URIs handling.
+(Closes lp:998371, thanks Bastian)
+
+
+Version 2.0.3
+=============
+
+Fix stability and progress related problems.
+
+Disable common path when creating folders using tags.
+(Closes lp:972158, thanks Eric)
+
+Increase Low pass filter frequency when converting to MP3.
+(Closes lp:881413, thanks Michael)
+
+Use original filename as title when tags are not present.
+(Closes lp:984790)
+
+Update Translations.
+
+
+Version 2.0.2
+=============
+
+Fix progress-related blocking by speeding up the progress update.
+(Closes lp:940648, thanks Ben)
+
+Add canadian french.
+(Thanks Alain-Olivier)
+
+Fix many English spelling errors.
+(Thanks Alain-Olivier)
+
+
 Version 2.0.1
 =============
 

=== modified file 'aclocal.m4'
--- aclocal.m4	2012-02-22 21:58:39 +0000
+++ aclocal.m4	2012-11-21 17:48:22 +0000
@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -260,6 +261,10 @@
 	      [CATOBJEXT=.mo
                DATADIRNAME=lib])
 	    ;;
+	    *-*-openbsd*)
+	    CATOBJEXT=.mo
+            DATADIRNAME=share
+	    ;;
 	    *)
 	    CATOBJEXT=.mo
             DATADIRNAME=lib
@@ -454,7 +459,7 @@
 
 
 dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 40 IT_PROG_INTLTOOL
+# serial 42 IT_PROG_INTLTOOL
 AC_DEFUN([IT_PROG_INTLTOOL], [
 AC_PREREQ([2.50])dnl
 AC_REQUIRE([AM_NLS])dnl
@@ -467,13 +472,11 @@
     ;;
 esac
 
+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
 if test -n "$1"; then
     AC_MSG_CHECKING([for intltool >= $1])
-
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-    [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    ]
     AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
     test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
 	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
@@ -486,25 +489,48 @@
     AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
 fi
 
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+if test -z "$AM_DEFAULT_VERBOSITY"; then
+  AM_DEFAULT_VERBOSITY=1
+fi
+AC_SUBST([AM_DEFAULT_VERBOSITY])
+
+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
+INTLTOOL__v_MERGE_0='@echo "  ITMRG " [$]@;'
+AC_SUBST(INTLTOOL_V_MERGE)
+AC_SUBST(INTLTOOL__v_MERGE_)
+AC_SUBST(INTLTOOL__v_MERGE_0)
+
+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
+intltool__v_merge_options_0='-q'
+AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
+AC_SUBST(intltool__v_merge_options_)
+AC_SUBST(intltool__v_merge_options_0)
+
+  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@'
+     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@'
+else
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir'
+fi
+      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
 
 _IT_SUBST(INTLTOOL_DESKTOP_RULE)
 _IT_SUBST(INTLTOOL_DIRECTORY_RULE)
@@ -550,7 +576,7 @@
 if test $? -ne 0; then
    AC_MSG_ERROR([perl 5.8.1 is required for intltool])
 else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
    AC_MSG_RESULT([$IT_PERL_VERSION])
 fi
 if test "x$2" != "xno-xml"; then
@@ -679,12 +705,15 @@
   AC_SUBST([USE_NLS])
 ])
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 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_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -694,7 +723,7 @@
 [am__api_version='1.11'
 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.11.6], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -710,19 +739,21 @@
 # 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.11.6])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, 2003, 2005, 2011 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
+
 # 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/../..'.
@@ -804,14 +835,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, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010, 2011 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
+# serial 12
 
 # 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,
@@ -851,6 +882,7 @@
   # 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'.
+  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.
@@ -915,7 +947,7 @@
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    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.
@@ -980,10 +1012,13 @@
 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 -*-
@@ -1205,12 +1240,15 @@
 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, 2003, 2005, 2008, 2011 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_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -1342,12 +1380,15 @@
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 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_PROG_MKDIR_P
 # ---------------
 # Check for `mkdir -p'.
@@ -1370,13 +1411,14 @@
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 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
+# serial 5
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -1384,13 +1426,13 @@
 [[_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)])
 
 # _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)])])
@@ -1401,13 +1443,15 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009,
+# 2011 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_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
 # ---------------------------------------------------------------------------
 # Adds support for distributing Python modules and packages.  To
@@ -1435,8 +1479,10 @@
   dnl Find a Python interpreter.  Python versions prior to 2.0 are not
   dnl supported. (2.0 was released on October 16, 2000).
   m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
-                    [python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl
-python2.1 python2.0])
+[python python2 python3 python3.2 python3.1 python3.0 python2.7 dnl
+ python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0])
+
+  AC_ARG_VAR([PYTHON], [the Python interpreter])
 
   m4_if([$1],[],[
     dnl No version check is needed.
@@ -1508,9 +1554,7 @@
   dnl   site-packages directory, not the python standard library
   dnl   directory like in previous automake betas.  This behavior
   dnl   is more consistent with lispdir.m4 for example.
-  dnl Query distutils for this directory.  distutils does not exist in
-  dnl Python 1.5, so we fall back to the hardcoded directory if it
-  dnl doesn't work.
+  dnl Query distutils for this directory.
   AC_CACHE_CHECK([for $am_display_PYTHON script directory],
     [am_cv_python_pythondir],
     [if test "x$prefix" = xNONE
@@ -1519,8 +1563,7 @@
      else
        am_py_prefix=$prefix
      fi
-     am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
-     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+     am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null`
      case $am_cv_python_pythondir in
      $am_py_prefix*)
        am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
@@ -1546,9 +1589,7 @@
 
   dnl pyexecdir -- directory for installing python extension modules
   dnl   (shared libraries)
-  dnl Query distutils for this directory.  distutils does not exist in
-  dnl Python 1.5, so we fall back to the hardcoded directory if it
-  dnl doesn't work.
+  dnl Query distutils for this directory.
   AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
     [am_cv_python_pyexecdir],
     [if test "x$exec_prefix" = xNONE
@@ -1557,8 +1598,7 @@
      else
        am_py_exec_prefix=$exec_prefix
      fi
-     am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
-     echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+     am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null`
      case $am_cv_python_pyexecdir in
      $am_py_exec_prefix*)
        am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
@@ -1606,12 +1646,14 @@
 sys.exit(sys.hexversion < minverhex)"
   AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 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_RUN_LOG(COMMAND)
 # -------------------
 # Run COMMAND, save the exit status in ac_status, and log it.
@@ -1688,12 +1730,14 @@
 fi
 AC_MSG_RESULT(yes)])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 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_PROG_INSTALL_STRIP
 # ---------------------
 # One issue with vendor `install' (even GNU) is that you can't
@@ -1716,13 +1760,13 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2010 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
+# serial 3
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
@@ -1731,13 +1775,13 @@
 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, 2005, 2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1759,10 +1803,11 @@
 # 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])
+[# 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}'])
 m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
      [m4_case([$1], [ustar],, [pax],,
               [m4_fatal([Unknown tar format])])
 AC_MSG_CHECKING([how to create a $1 tar archive])

=== modified file 'bin/Makefile.in'
--- bin/Makefile.in	2012-02-22 21:58:39 +0000
+++ bin/Makefile.in	2012-11-21 17:48:22 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 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.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -62,14 +79,26 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(bindir)"
 SCRIPTS = $(bin_SCRIPTS)
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -105,6 +134,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -162,6 +195,8 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -225,8 +260,11 @@
 $(am__aclocal_m4_deps):
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_SCRIPTS)'; 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 \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -254,9 +292,7 @@
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -311,10 +347,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:

=== modified file 'bin/soundconverter.py'
--- bin/soundconverter.py	2012-02-22 21:58:39 +0000
+++ bin/soundconverter.py	2012-11-21 17:48:22 +0000
@@ -40,12 +40,17 @@
 GLADEFILE = '@datadir@/soundconverter/soundconverter.glade'
 
 PACKAGE = NAME.lower()
-gettext.bindtextdomain(PACKAGE,'@datadir@/locale')
-locale.setlocale(locale.LC_ALL,'')
-gettext.textdomain(PACKAGE)
-gettext.install(PACKAGE,localedir='@datadir@/locale',unicode=1)
-
-from gettext import gettext as _
+try: 
+    gettext.bindtextdomain(PACKAGE,'@datadir@/locale')
+    locale.setlocale(locale.LC_ALL,'')
+    gettext.textdomain(PACKAGE)
+    gettext.install(PACKAGE,localedir='@datadir@/locale',unicode=1)
+    #from gettext import gettext as _
+except locale.Error:
+    print '  cannot use system locale.'
+    locale.setlocale(locale.LC_ALL,'C')
+    gettext.textdomain(PACKAGE)
+    gettext.install(PACKAGE,localedir='@datadir@/locale',unicode=1)
 
 def _add_soundconverter_path():
     global localedir
@@ -68,8 +73,10 @@
         gobject.threads_init()
         import gnomevfs
     except ImportError:
-        print '%s needs pygtk and gnome-python >= 2.12!' % NAME
+        print '%s needs pygtk and gnome-python >= 2.24!' % NAME
         sys.exit(1)
+    except:
+        pass
 
     try:
         import pygst
@@ -83,7 +90,18 @@
             '.'.join([str(s) for s in gst.gst_version]))
 
 
-
+def check_mime_type(mime):
+    types = {'vorbis': 'audio/x-vorbis', 'flac': 'audio/x-flac', 'wav' : 'audio/x-wav',
+        'mp3': 'audio/mpeg', 'aac': 'audio/x-m4a'}
+    mime = types.get(mime, mime)
+    if mime not in types.values():
+        print 'Cannot use "%s" mime type.' % mime
+        print 'Supported shortcuts and mime types:',
+        for k,v in sorted(types.iteritems()):
+            print '%s %s' % (k,v),
+        print
+        raise SystemExit
+    return mime
 
 
 def mode_callback(option, opt, value, parser, **kwargs):
@@ -99,31 +117,29 @@
             'can use this from, say, shell scripts.'))
     parser.add_option('-t', '--tags', dest="mode", action='callback',
         callback=mode_callback,  callback_kwargs={'mode':'tags'},
-        help=_('Show tags for input files instead of converting'
-            'them. This indicates \n command line batch mode'
+        help=_('Show tags for input files instead of converting '
+            'them. This indicates \n command line batch mode '
             'and disables the graphical user interface.'))
-    parser.add_option('-m', '--mime-type', action="store_true",
-        dest="batch_mime",
-        help=_('Set the output MIME type for batch mode. The default'
-            'is %s. Note that you probably want to set the output'
+    parser.add_option('-m', '--mime-type', dest="cli-output-type",
+        help=_('Set the output MIME type for batch mode. The default '
+            'is %s. Note that you probably want to set the output '
             'suffix as well.') % settings['cli-output-type'])
     parser.add_option('-q', '--quiet', action="store_true", dest="quiet",
         help=_("Be quiet. Don't write normal output, only errors."))
     parser.add_option('-d', '--debug', action="store_true", dest="debug",
-        help=_('Print additional debug information'))
-    parser.add_option('-s', '--suffix', dest="new_suffix",
+        help=_('Displays additional debug information'))
+    parser.add_option('-s', '--suffix', dest="cli-output-suffix",
         help=_('Set the output filename suffix for batch mode.'
-            'The default is %s . Note that the suffix does not'
+            'The default is %s . Note that the suffix does not '
             'affect\n the output MIME type.') % settings['cli-output-suffix'])
     parser.add_option('-j', '--jobs', action='store', type='int', dest='jobs',
         metavar='NUM', help=_('Force number of concurrent conversions.'))
     parser.add_option('--help-gst', action="store_true", dest="_unused",
-        help=_('Show GStreamer Options'))
+        help=_('Shows GStreamer Options'))
     return parser
 
 
 _add_soundconverter_path()
-_check_libs()
 
 import soundconverter
 soundconverter.NAME = NAME
@@ -145,14 +161,31 @@
         continue
     settings[k] = getattr(options, k)
 
+settings['cli-output-type'] = check_mime_type(settings['cli-output-type'])
+
+_check_libs()
+
 print '  using %d thread(s)' % settings['jobs']
 
-from soundconverter.ui import gui_main
+from soundconverter.batch import cli_convert_main
+from soundconverter.batch import cli_tags_main
 from soundconverter.fileoperations import filename_to_uri
-
 files = map(filename_to_uri, files)
-gui_main(NAME, VERSION, GLADEFILE, files)
 
+try:
+    from soundconverter.ui import gui_main
+except:
+    if settings['mode'] == 'gui':
+        settings['mode'] = 'batch'
+    
+if settings['mode'] == 'gui':
+    gui_main(NAME, VERSION, GLADEFILE, files)
+elif settings['mode'] == 'tags':
+    if not files: print 'nothing to do...'
+    cli_tags_main(files)
+else:
+    if not files: print 'nothing to do...'
+    cli_convert_main(files)
 
 
 

=== modified file 'configure'
--- configure	2012-02-22 21:58:39 +0000
+++ configure	2012-11-21 17:48:22 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68.
+# Generated by GNU Autoconf 2.68 for soundconverter 2.0.4.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -555,12 +555,12 @@
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
+PACKAGE_NAME='soundconverter'
+PACKAGE_TARNAME='soundconverter'
+PACKAGE_VERSION='2.0.4'
+PACKAGE_STRING='soundconverter 2.0.4'
+PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
 
 ac_unique_file="bin/soundconverter.py"
 # Factoring default headers for most tests.
@@ -634,6 +634,13 @@
 INTLTOOL_KEYS_RULE
 INTLTOOL_DIRECTORY_RULE
 INTLTOOL_DESKTOP_RULE
+intltool__v_merge_options_0
+intltool__v_merge_options_
+INTLTOOL_V_MERGE_OPTIONS
+INTLTOOL__v_MERGE_0
+INTLTOOL__v_MERGE_
+INTLTOOL_V_MERGE
+AM_DEFAULT_VERBOSITY
 INTLTOOL_EXTRACT
 INTLTOOL_MERGE
 INTLTOOL_UPDATE
@@ -659,6 +666,7 @@
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -748,7 +756,8 @@
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP'
+CPP
+PYTHON'
 
 
 # Initialize some variables set by options.
@@ -789,7 +798,7 @@
 localstatedir='${prefix}/var'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 infodir='${datarootdir}/info'
 htmldir='${docdir}'
 dvidir='${docdir}'
@@ -1291,7 +1300,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 this package to adapt to many kinds of systems.
+\`configure' configures soundconverter 2.0.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1339,7 +1348,7 @@
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/soundconverter]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -1356,7 +1365,9 @@
 fi
 
 if test -n "$ac_init_help"; then
-
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of soundconverter 2.0.4:";;
+   esac
   cat <<\_ACEOF
 
 Optional Features:
@@ -1376,6 +1387,7 @@
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
+  PYTHON      the Python interpreter
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1443,7 +1455,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-configure
+soundconverter configure 2.0.4
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1808,7 +1820,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by $as_me, which was
+It was created by soundconverter $as_me 2.0.4, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2623,8 +2635,8 @@
 
 
 # Define the identity of the package.
- PACKAGE=soundconverter
- VERSION=2.0.1
+ PACKAGE='soundconverter'
+ VERSION='2.0.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2654,11 +2666,11 @@
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+# 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}'
+
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
@@ -2672,7 +2684,7 @@
 
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 
-ALL_LINGUAS="ar bg br ca cs da de el en_AU en_GB eo es et eu fa fi fr gl he hi hu it ja ml ms nl pl pt_BR pt ru sk sl sr@latin sr@Latn sr sv te tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="ar bg br ca cs da de el en_AU en_GB eo es et eu fa fi fr fr_CA gl he hi hu it ja ml ms nl pl pt_BR pt ru sk sl sr@latin sr@Latn sr sv te tr uk vi zh_CN zh_TW"
 
 GETTEXT_PACKAGE="soundconverter"
 
@@ -2733,6 +2745,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=
@@ -3546,6 +3559,7 @@
   # 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'.
+  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.
@@ -3605,7 +3619,7 @@
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    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.
@@ -4643,6 +4657,10 @@
 fi
 
 	    ;;
+	    *-*-openbsd*)
+	    CATOBJEXT=.mo
+            DATADIRNAME=share
+	    ;;
 	    *)
 	    CATOBJEXT=.mo
             DATADIRNAME=lib
@@ -4786,14 +4804,12 @@
     ;;
 esac
 
+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo  | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
 if test -n ""; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= " >&5
 $as_echo_n "checking for intltool >= ... " >&6; }
-
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo  | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-    INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
     test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
@@ -4924,25 +4940,48 @@
     as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
 fi
 
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+if test -z "$AM_DEFAULT_VERBOSITY"; then
+  AM_DEFAULT_VERBOSITY=1
+fi
+
+
+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
+INTLTOOL__v_MERGE_0='@echo "  ITMRG " $@;'
+
+
+
+
+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
+intltool__v_merge_options_0='-q'
+
+
+
+
+  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@'
+     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@'
+else
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir'
+fi
+      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
 
 
 
@@ -5261,7 +5300,7 @@
 if test $? -ne 0; then
    as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
 else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
 $as_echo "$IT_PERL_VERSION" >&6; }
 fi
@@ -5325,6 +5364,8 @@
 
 
 
+
+
         if test -n "$PYTHON"; then
       # If the user set $PYTHON, use it and don't search something else.
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.5" >&5
@@ -5358,7 +5399,7 @@
   $as_echo_n "(cached) " >&6
 else
 
-	for am_cv_pathless_PYTHON in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+	for am_cv_pathless_PYTHON in python python2 python3 python3.2 python3.1 python3.0 python2.7  python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
 	  test "$am_cv_pathless_PYTHON" = none && break
 	  prog="import sys
 # split strings by '.' and convert to numeric.  Append some zeros
@@ -5467,7 +5508,7 @@
 
 
 
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
 $as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
 if ${am_cv_python_pythondir+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -5478,8 +5519,7 @@
      else
        am_py_prefix=$prefix
      fi
-     am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
-     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+     am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null`
      case $am_cv_python_pythondir in
      $am_py_prefix*)
        am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
@@ -5505,7 +5545,7 @@
   pkgpythondir=\${pythondir}/$PACKAGE
 
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
 $as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
 if ${am_cv_python_pyexecdir+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -5516,8 +5556,7 @@
      else
        am_py_exec_prefix=$exec_prefix
      fi
-     am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
-     echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+     am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null`
      case $am_cv_python_pyexecdir in
      $am_py_exec_prefix*)
        am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
@@ -6157,7 +6196,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by $as_me, which was
+This file was extended by soundconverter $as_me 2.0.4, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6214,7 +6253,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-config.status
+soundconverter config.status 2.0.4
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.in'
--- configure.in	2012-02-22 21:58:39 +0000
+++ configure.in	2012-11-21 17:48:22 +0000
@@ -1,9 +1,9 @@
 dnl -*- Mode: autoconf -*-
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.68])
-AC_INIT
+AC_INIT([soundconverter], [2.0.4])
 AC_CONFIG_SRCDIR([bin/soundconverter.py])
-AM_INIT_AUTOMAKE([soundconverter], [2.0.1])
+AM_INIT_AUTOMAKE
 
 m4_define(required_python_abi, [2.5])
 m4_define(required_python_version, [2.5])
@@ -13,7 +13,7 @@
 dnl put the ACLOCAL flags in the makefile
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 
-ALL_LINGUAS="ar bg br ca cs da de el en_AU en_GB eo es et eu fa fi fr gl he hi hu it ja ml ms nl pl pt_BR pt ru sk sl sr@latin sr@Latn sr sv te tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="ar bg br ca cs da de el en_AU en_GB eo es et eu fa fi fr fr_CA gl he hi hu it ja ml ms nl pl pt_BR pt ru sk sl sr@latin sr@Latn sr sv te tr uk vi zh_CN zh_TW"
 
 GETTEXT_PACKAGE="soundconverter"
 AC_SUBST([GETTEXT_PACKAGE])

=== modified file 'data/Makefile.in'
--- data/Makefile.in	2012-02-22 21:58:39 +0000
+++ data/Makefile.in	2012-11-21 17:48:22 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 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.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -45,6 +62,11 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -66,6 +88,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(Applicationsdir)" \
 	"$(DESTDIR)$(gladedir)" "$(DESTDIR)$(icondir)" \
 	"$(DESTDIR)$(svgicondir)"
@@ -75,6 +103,7 @@
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -110,6 +139,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -167,6 +200,8 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -240,8 +275,11 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-ApplicationsDATA: $(Applications_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(Applicationsdir)" || $(MKDIR_P) "$(DESTDIR)$(Applicationsdir)"
 	@list='$(Applications_DATA)'; test -n "$(Applicationsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(Applicationsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(Applicationsdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -255,13 +293,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(Applications_DATA)'; test -n "$(Applicationsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(Applicationsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(Applicationsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(Applicationsdir)'; $(am__uninstall_files_from_dir)
 install-dist_gladeDATA: $(dist_glade_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
 	@list='$(dist_glade_DATA)'; test -n "$(gladedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(gladedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(gladedir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -275,13 +314,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_glade_DATA)'; test -n "$(gladedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(gladedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(gladedir)" && rm -f $$files
+	dir='$(DESTDIR)$(gladedir)'; $(am__uninstall_files_from_dir)
 install-dist_iconDATA: $(dist_icon_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
 	@list='$(dist_icon_DATA)'; test -n "$(icondir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(icondir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -295,13 +335,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_icon_DATA)'; test -n "$(icondir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(icondir)" && rm -f $$files
+	dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir)
 install-dist_svgiconDATA: $(dist_svgicon_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(svgicondir)" || $(MKDIR_P) "$(DESTDIR)$(svgicondir)"
 	@list='$(dist_svgicon_DATA)'; test -n "$(svgicondir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(svgicondir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(svgicondir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -315,9 +356,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_svgicon_DATA)'; test -n "$(svgicondir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(svgicondir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(svgicondir)" && rm -f $$files
+	dir='$(DESTDIR)$(svgicondir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -372,10 +411,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:

=== modified file 'data/soundconverter.desktop'
--- data/soundconverter.desktop	2012-02-22 21:58:39 +0000
+++ data/soundconverter.desktop	2012-11-21 17:48:22 +0000
@@ -17,7 +17,8 @@
 Name[et]=Heli teisendaja
 Name[eu]=Soinu-bihurtzailea
 Name[fi]=Äänitiedostojen muunnin
-Name[fr]=Convertisseur Audio SoundConverter
+Name[fr]=Convertisseur audio
+Name[fr_CA]=Convertisseur audio
 Name[gl]=Sound Converter
 Name[he]=ממיר סאונד
 Name[hi]=दवानी बदलनेवला
@@ -25,19 +26,19 @@
 Name[it]=Sound Converter
 Name[ja]=サウンド変換
 Name[lv]=Skaņas pārveidotājs
-Name[ms]=Penukar Audio
+Name[ms]=Penukar Bunyi
 Name[nl]=Geluidsconverteerder
 Name[pl]=Konwerter dźwięku
 Name[pt]=Conversor de Som
 Name[pt_BR]=Conversor de Som
-Name[ru]=Аудиоконвертор
+Name[ru]=Аудиоконвертер
 Name[sk]=Zvukový konvertor
 Name[sl]=Pretvornik zvoka
 Name[sr]=Претварач звука
 Name[sr@Latn]=Prekoder zvuka
 Name[sr@latin]=Prekoder zvuka
 Name[sv]=Ljudkonverterare
-Name[te]=దవనిని మార్చేది
+Name[te]=శబ్ద పరివర్తకం
 Name[tr]=Ses Dönüştürücüsü
 Name[uk]=Конвертер аудіо
 Name[vi]=Bộ chuyển đổi âm thanh
@@ -51,7 +52,7 @@
 GenericName[ca]=Convertidor formats d'àudio
 GenericName[cs]=Převaděč zvukových formátů
 GenericName[da]=Lydformat-konvertering
-GenericName[de]=Audioformat Konverter
+GenericName[de]=Audio-Formatumwandlung
 GenericName[el]=Μετατροπέας  Αρχείων Ηχου
 GenericName[en_AU]=Audio Format Converter
 GenericName[en_GB]=Audio Format Converter
@@ -60,7 +61,8 @@
 GenericName[et]=Heli vormingu teisendaja
 GenericName[eu]=Audio Formatu Bihurtzailea
 GenericName[fi]=Äänitiedostojen muunnin
-GenericName[fr]=Conversion entre formats audio
+GenericName[fr]=Convertisseur de fichiers audio
+GenericName[fr_CA]=Convertisseur de fichiers audio
 GenericName[gl]=Convertedor de formatos de son
 GenericName[he]=ממיר פורמטים של אודיו
 GenericName[hu]=Audió Formátum Konvertáló
@@ -69,64 +71,42 @@
 GenericName[lv]=Audio formātu pārveidotājs
 GenericName[ms]=Penukar Format Audio
 GenericName[nl]=Geluidsformaat-converteerder
-GenericName[pl]=Konwerter Formatów Audio
+GenericName[pl]=Konwerter formatów dźwięku
 GenericName[pt]=Conversor de Formatos de Áudio
 GenericName[pt_BR]=Conversor de Formato de Áudio
-GenericName[ru]=Аудиоконвертор
+GenericName[ru]=Конвертер форматов аудио
 GenericName[sk]=Prevod formátov zvuku
 GenericName[sl]=Pretvornik zapisov zvoka
 GenericName[sr]=Претварач формата звука
 GenericName[sr@Latn]=Prekodiranje zvučnih formata
 GenericName[sr@latin]=Prekodiranje zvučnih formata
 GenericName[sv]=Ljudformatskonverterare
-GenericName[te]=ధ్వని రకము  మార్చేది
+GenericName[te]=ఆడియో ఆకృతి పరివర్తకం
 GenericName[tr]=Ses Biçimi Dönüştürücüsü
 GenericName[uk]=Конвертер аудіоформатів
 GenericName[vi]=Bộ chuyển định dạng Audio
 GenericName[zh_CN]=音频格式转换程序
 GenericName[zh_TW]=音訊格式轉換工具
-Comment=Convert audio files into other formats
-Comment[ar]=تحويل الملفات الصوتيه الى صيغ اخرى
-Comment[ast]=Camudar archivos de soniu a otros formatos
-Comment[bg]=Обръщане на аудио файлове в други формати
-Comment[br]=Amdreiñ restroù klevet ouzh furmadoù all
-Comment[ca]=Convertiu fitxers d'àudio a diferents formats
-Comment[cs]=Převeďte zvukové soubory do jiných formátů
-Comment[da]=Konvertér lydfiler til andre formater
-Comment[de]=Konvertierung von Audiodateien in andere Formate
-Comment[el]=Μετατρέψτε αρχεία ήχου σε αρχεία διαφορετικής ψηφιακής κωδικοποίησης
-Comment[en_AU]=Convert audio files into other formats
-Comment[en_GB]=Convert audio files into other formats
-Comment[eo]=Konverti sondosierojn al aliaj formoj
-Comment[es]=Convertir archivos de audio a otros formatos
-Comment[et]=Teisenda audiofaile ümber
-Comment[eu]=Bihurtu audio fitxategiak beste formatuetara
-Comment[fi]=Muunna äänitiedostoja toisiin muotoihin
-Comment[fr]=Convertit les fichiers audios vers d'autres formats
-Comment[gl]=Converter os ficheiros de son a outros formatos
-Comment[he]=ממיר קבצי אודיו לפורמטים שונים
-Comment[hu]=Audió fájlokat konvertál más formátumúra
-Comment[it]=Converte file audio in altri formati
-Comment[ja]=オーディオファイルを別のフォーマットに変換
+Comment=Converts audio files into other formats
+Comment[cs]=Převádí audio soubory do různých formátů
+Comment[de]=Konvertiert Audio-Dateien in andere Formate
+Comment[en_GB]=Converts audio files into other formats
+Comment[es]=Convierte archivos de audio a otros formatos
+Comment[eu]=Audio fitxategiak beste formatuetara bihurtzen ditu
+Comment[fr]=Convertit des fichiers audio en d'autres formats
+Comment[fr_CA]=Convertit des fichiers audio en d'autres formats
+Comment[gl]=Converte os ficheiros de son a outros formatos
+Comment[it]=Converti file audio in altri formati
 Comment[lv]=Pārveido audio datnes citos formātos
-Comment[ms]=Tukar file audio ke format yang lain
-Comment[nl]=Geluidsbestanden naar andere formaten converteren
-Comment[pl]=Konwertuj pliki audio do innych formatów
-Comment[pt]=Converter ficheiros de áudio para outros formatos
-Comment[pt_BR]=Converter arquivos de áudio em outros formatos
-Comment[ru]=Конвертировать аудиофайлы в другие форматы
-Comment[sk]=Prevedie zvukové súbory do iných formátov
-Comment[sl]=Pretvorite zvočne datoteke v druge zapise
-Comment[sr]=Претворите датотеке звука у друге формате
-Comment[sr@Latn]=Prevedi jedan zvučni format u druge
-Comment[sr@latin]=Prevodi jedan zvučni format u druge
-Comment[sv]=Konvertera ljudfiler till andra format
-Comment[te]=ఒక ధ్వని రకము నుంచి మొరొక రకమునకు మార్చేది
-Comment[tr]=Ses dosyalarını diğer formatlara dönüştürün
-Comment[uk]=Конвертує аудіофайли в інші формати
-Comment[vi]=Chuyển đổi file audio sang các định dạng khác
-Comment[zh_CN]=将音频文件转换为其它格式
-Comment[zh_TW]=將音訊檔案轉換為其他格式
+Comment[ms]=Tukar fail audio kepada format lain
+Comment[nl]=Converteert geluidsbestanden naar andere formaten
+Comment[pl]=Konwertuje pliki dźwiękowe do innych formatów
+Comment[pt_BR]=Converter para outros formatos os arquivos de áudio
+Comment[ru]=Конвертирует аудиофайлы в другие форматы
+Comment[sr]=Претварајте звучне датотеке у друге формате
+Comment[sr@latin]=Konvertuje audio fajlove u druge formate
+Comment[sv]=Konverterar ljudfiler till andra format
+Comment[zh_TW]=將音效檔轉換至不同格式
 Icon=soundconverter
 MimeType=application/x-ogg;application/ogg;audio/x-mp3;audio/x-scpls;audio/x-mpeg;audio/mpeg;audio/x-mpegurl;application/x-flac;audio/x-wav;audio/flac;
 Exec=soundconverter %U

=== modified file 'data/soundconverter.desktop.in'
--- data/soundconverter.desktop.in	2012-02-22 21:58:39 +0000
+++ data/soundconverter.desktop.in	2012-11-21 17:48:22 +0000
@@ -2,7 +2,7 @@
 Version=1.0
 _Name=Sound Converter
 _GenericName=Audio Format Converter
-_Comment=Convert audio files into other formats
+_Comment=Converts audio files into other formats
 Icon=soundconverter
 MimeType=application/x-ogg;application/ogg;audio/x-mp3;audio/x-scpls;audio/x-mpeg;audio/mpeg;audio/x-mpegurl;application/x-flac;audio/x-wav;audio/flac;
 Exec=soundconverter %U

=== modified file 'data/soundconverter.desktop.in.in'
--- data/soundconverter.desktop.in.in	2012-02-22 21:58:39 +0000
+++ data/soundconverter.desktop.in.in	2012-11-21 17:48:22 +0000
@@ -2,7 +2,7 @@
 Version=1.0
 _Name=Sound Converter
 _GenericName=Audio Format Converter
-_Comment=Convert audio files into other formats
+_Comment=Converts audio files into other formats
 Icon=soundconverter
 MimeType=application/x-ogg;application/ogg;audio/x-mp3;audio/x-scpls;audio/x-mpeg;audio/mpeg;audio/x-mpegurl;application/x-flac;audio/x-wav;audio/flac;
 Exec=soundconverter %U

=== modified file 'data/soundconverter.glade'
--- data/soundconverter.glade	2012-02-22 21:58:39 +0000
+++ data/soundconverter.glade	2012-11-21 17:48:22 +0000
@@ -667,6 +667,9 @@
         <col id="0" translatable="yes">AAC (.m4a)</col>
       </row>
       <row>
+        <col id="0" translatable="yes">Opus (.opus)</col>
+      </row>
+      <row>
         <col id="0" translatable="yes">GNOME Audio Profile</col>
       </row>
     </data>
@@ -1044,7 +1047,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="tooltip_text" translatable="yes">Remove all chars except letters, digits and ./_-</property>
+                            <property name="tooltip_text" translatable="yes">Remove all characters except letters, digits and ./_-</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
@@ -1626,6 +1629,68 @@
                               </packing>
                             </child>
                             <child>
+                              <object class="GtkTable" id="table5b">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="n_rows">2</property>
+                                <property name="n_columns">2</property>
+                                <property name="column_spacing">6</property>
+                                <property name="row_spacing">6</property>
+                                <child>
+                                  <object class="GtkLabel" id="label38b">
+                                    <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">Quality:</property>
+                                  </object>
+                                  <packing>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkComboBox" id="opus_quality">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="model">liststore2</property>
+                                    <signal name="changed" handler="on_opus_quality_changed" swapped="no"/>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="cellrenderertext2b"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="y_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="position">5</property>
+                              </packing>
+                            </child>
+                            <child type="tab">
+                              <object class="GtkLabel" id="label111b">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Opus</property>
+                              </object>
+                              <packing>
+                                <property name="position">5</property>
+                                <property name="tab_fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
                               <object class="GtkTable" id="table7">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
@@ -1667,7 +1732,7 @@
                                 </child>
                               </object>
                               <packing>
-                                <property name="position">5</property>
+                                <property name="position">6</property>
                               </packing>
                             </child>
                             <child type="tab">
@@ -1677,7 +1742,7 @@
                                 <property name="label" translatable="yes">gst-profile</property>
                               </object>
                               <packing>
-                                <property name="position">5</property>
+                                <property name="position">6</property>
                                 <property name="tab_fill">False</property>
                               </packing>
                             </child>

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-22 21:58:39 +0000
+++ debian/changelog	2012-11-21 17:48:22 +0000
@@ -1,3 +1,15 @@
+soundconverter (2.0.4-0ubuntu1) raring; urgency=low
+
+  * New upstream release (LP: #1077508).
+    - Disable common path when creating folders using tags (LP: #972158).
+    - Increase Low pass filter frequency when converting to MP3 (LP: #881413).
+    - Use original filename as title when tags are not present (LP: #984790).
+    - Fix command line arguments parsing (LP: #995862).
+    - Fix problem with AAC settings (LP: #954555).
+    - Fix yet another problem with URIs handling (LP: #998371).
+
+ -- Logan Rosen <[e-mail]>  Wed, 21 Nov 2012 12:38:13 -0500
+
 soundconverter (2.0.1-1) unstable; urgency=low
 
   * New upstream version.

=== modified file 'debian/control'
--- debian/control	2012-02-22 21:58:39 +0000
+++ debian/control	2012-11-21 17:48:22 +0000
@@ -1,5 +1,6 @@
 Source: soundconverter
-Maintainer: Lars Wirzenius <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Lars Wirzenius <[e-mail]>
 Section: gnome
 Priority: optional
 Build-Depends: debhelper (>= 9.20120115), python (>= 2.6.3-3)

=== modified file 'doc/Makefile.in'
--- doc/Makefile.in	2011-11-26 12:14:13 +0000
+++ doc/Makefile.in	2012-11-21 17:48:22 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 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.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -15,6 +15,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -42,6 +59,11 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -63,6 +85,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 man1dir = $(mandir)/man1
 am__installdirs = "$(DESTDIR)$(man1dir)"
 NROFF = nroff
@@ -71,6 +99,7 @@
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -106,6 +135,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -163,6 +196,8 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -223,11 +258,18 @@
 $(am__aclocal_m4_deps):
 install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -256,9 +298,7 @@
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -326,10 +366,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:

=== modified file 'doc/soundconverter.1'
--- doc/soundconverter.1	2011-11-26 12:14:13 +0000
+++ doc/soundconverter.1	2012-11-21 17:48:22 +0000
@@ -21,6 +21,7 @@
 Set the output MIME type for batch mode.
 The default is audio/x-vorbis.
 Note that you probably want to set the output suffix as well.
+You can also use shortcuts: aac, flac, mp3, vorbis, wav.
 .TP
 .BR \-q ", "\-\-quiet
 Be quiet.

=== modified file 'install-sh'
--- install-sh	2011-11-26 12:14:13 +0000
+++ install-sh	2012-11-21 17:48:22 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-01-19.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -156,6 +156,10 @@
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+	# Protect names problematic for `test' and other utilities.
+	case $dst_arg in
+	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
+	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for `test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -200,7 +208,11 @@
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for `test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | [=\(\)!]) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -385,7 +392,7 @@
 
       case $dstdir in
 	/*) prefix='/';;
-	-*) prefix='./';;
+	[-=\(\)!]*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@
 
       for d
       do
-	test -z "$d" && continue
+	test X"$d" = X && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then

=== modified file 'missing'
--- missing	2011-11-26 12:14:13 +0000
+++ missing	2012-11-21 17:48:22 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.13; # UTC
 
 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <[e-mail]>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -84,7 +84,6 @@
   help2man     touch the output file
   lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
 Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
@@ -122,15 +121,6 @@
     # Not GNU programs, they don't have --version.
     ;;
 
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
   *)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
@@ -226,7 +216,7 @@
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -256,7 +246,7 @@
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -318,41 +308,6 @@
     touch $file
     ;;
 
-  tar*)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
   *)
     echo 1>&2 "\
 WARNING: \`$1' is needed, and is $msg.

=== modified file 'po/Makefile.in.in'
--- po/Makefile.in.in	2011-11-26 12:14:13 +0000
+++ po/Makefile.in.in	2012-11-21 17:48:22 +0000
@@ -49,8 +49,8 @@
 XGETTEXT = @XGETTEXT@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT   = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
 
 ALL_LINGUAS = @ALL_LINGUAS@
 
@@ -73,15 +73,20 @@
 .SUFFIXES:
 .SUFFIXES: .po .pox .gmo .mo .msg .cat
 
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V))
+INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY))
+INTLTOOL__v_MSGFMT_0 = @echo "  MSGFMT" $@;
+
 .po.pox:
 	$(MAKE) $(GETTEXT_PACKAGE).pot
 	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
 
 .po.mo:
-	$(MSGFMT) -o $@ $<
+	$(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
 
 .po.gmo:
-	file=`echo $* | sed 's,.*/,,'`.gmo \
+	$(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \
 	  && rm -f $$file && $(GMSGFMT) -o $$file $<
 
 .po.cat:

=== modified file 'po/ar.po'
--- po/ar.po	2012-02-22 21:58:39 +0000
+++ po/ar.po	2012-11-21 17:48:22 +0000
@@ -7,322 +7,322 @@
 msgstr ""
 "Project-Id-Version: soundconverter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-12 22:56+0100\n"
-"PO-Revision-Date: 2012-01-13 04:02+0000\n"
-"Last-Translator: GautierPortet <[e-mail]>\n"
+"POT-Creation-Date: 2012-07-30 15:28+0000\n"
+"PO-Revision-Date: 2012-07-07 13:53+0000\n"
+"Last-Translator: uwe <[e-mail]>\n"
 "Language-Team: Arabic <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-01-18 21:12+0000\n"
-"X-Generator: Launchpad (build 14681)\n"
+"X-Launchpad-Export-Date: 2012-10-06 15:24+0000\n"
+"X-Generator: Launchpad (build 16061)\n"
 "Language: ar\n"
 
 #: ../data/soundconverter.desktop.in.in.h:1
+msgid "Sound Converter"
+msgstr "محول صيغ صوتية"
+
+#: ../data/soundconverter.desktop.in.in.h:2
 msgid "Audio Format Converter"
 msgstr "محول صيغ الملفات الصوتية"
 
-#: ../data/soundconverter.desktop.in.in.h:2
-msgid "Convert audio files into other formats"
-msgstr "تحويل الملفات الصوتيه الى صيغ اخرى"
-
 #: ../data/soundconverter.desktop.in.in.h:3
-msgid "Sound Converter"
-msgstr "محول صيغ صوتية"
+msgid "Converts audio files into other formats"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:1
-msgid "16 bits (default)"
-msgstr "16 بت(الافتراضي)"
+msgid "GNOME-powered Sound Conversion"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:2
-msgid "32 bits"
-msgstr "32 بت"
+msgid "Website"
+msgstr "موقع الويب"
 
 #: ../data/soundconverter.glade.h:3
-msgid "8 bits (very low quality)"
-msgstr "8 بت (جودة منخفصة جدا )"
+msgid "dialog1"
+msgstr "حوار1"
 
 #: ../data/soundconverter.glade.h:4
-msgid "<b>How to name files?</b>"
-msgstr "<b >كيفية تسمية الملفات ؟ </b>"
+msgid "Filter "
+msgstr "المرشّح "
 
 #: ../data/soundconverter.glade.h:5
-msgid "<b>Type of result?</b>"
-msgstr "<b>نوع النتائج ؟</b>"
+msgid "Error"
+msgstr "خطأ"
 
 #: ../data/soundconverter.glade.h:6
-msgid "<b>Where to place results?</b>"
-msgstr "<b >اين تحفظ النتائج ؟ </b>"
+msgid "File exists already"
+msgstr "الملف موجود بالفعل"
 
 #: ../data/soundconverter.glade.h:7
+msgid "_Overwrite"
+msgstr "ا_كتب فوقه"
+
+#: ../data/soundconverter.glade.h:8
+msgid "_Skip"
+msgstr "_تخطّي"
+
+#: ../data/soundconverter.glade.h:9
 msgid "<big><b>File exists already</b></big>\n"
 msgstr "<big><b>الملف موجود مسبقا</b></big>\n"
 
-#: ../data/soundconverter.glade.h:9
-msgid "<i>Example filename:</i>"
-msgstr "<i>مثال لإسم الملف:</i>"
-
-#: ../data/soundconverter.glade.h:10
-msgid "AAC"
-msgstr "أي أي سي (AAC)"
-
 #: ../data/soundconverter.glade.h:11
-msgid "AAC (.m4a)"
-msgstr ""
-
-#: ../data/soundconverter.glade.h:12
-msgid "Add _Folder"
-msgstr "إضافة _مجلد"
-
-#: ../data/soundconverter.glade.h:13
-msgid "Average (ABR)"
-msgstr "معدل (َABR)"
+msgid "_Apply to entire queue"
+msgstr "_طبق على كل القائمة"
+
+#: ../data/soundconverter.glade.h:12 ../soundconverter/ui.py:387
+msgid "artist/album"
+msgstr "فنان/ألبوم"
+
+#: ../data/soundconverter.glade.h:13 ../soundconverter/ui.py:389
+msgid "artist - album"
+msgstr "الفنان - الألبوم"
 
 #: ../data/soundconverter.glade.h:14
-msgid "Better (Slower)"
-msgstr "أفضل (أبطأ)"
+msgid "Very Low"
+msgstr "منخفض جداً"
 
 #: ../data/soundconverter.glade.h:15
-msgid "Bitrate mode:"
-msgstr "نمط معدل البت"
+msgid "Low"
+msgstr "منخفض"
 
 #: ../data/soundconverter.glade.h:16
-msgid "Choose..."
-msgstr "إختر..."
+msgid "Normal"
+msgstr "عادي"
 
 #: ../data/soundconverter.glade.h:17
-msgid "Compression:"
-msgstr "الظغط"
+msgid "High"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:18
-msgid "Constant (CBR)"
-msgstr ""
+msgid "Very High"
+msgstr "عالي جدا"
 
 #: ../data/soundconverter.glade.h:19
-msgid "Create subfolders: "
-msgstr "إنشاء مجلدات فرعية: "
+msgid "Insanely High"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:20
-msgid "Default"
-msgstr "إفتراضي"
+msgid "8 bits (very low quality)"
+msgstr "8 بت (جودة منخفصة جدا )"
 
 #: ../data/soundconverter.glade.h:21
-msgid "Delete original file"
-msgstr "حذف الملف الأصلي"
+msgid "16 bits (default)"
+msgstr "16 بت(الافتراضي)"
 
 #: ../data/soundconverter.glade.h:22
-msgid "Error"
-msgstr "خطأ"
+msgid "32 bits"
+msgstr "32 بت"
 
 #: ../data/soundconverter.glade.h:23
-msgid "FLAC"
-msgstr "FLAC"
+msgid "Less (Faster)"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:24
-msgid "FLAC Lossless (.flac)"
-msgstr ""
+msgid "Default"
+msgstr "إفتراضي"
 
 #: ../data/soundconverter.glade.h:25
-msgid "File exists already"
-msgstr "الملف موجود بالفعل"
+msgid "Better (Slower)"
+msgstr "أفضل (أبطأ)"
 
 #: ../data/soundconverter.glade.h:26
-msgid "Filename pattern: "
-msgstr "نمط إسم الملف: "
+msgid "Constant (CBR)"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:27
-msgid "Filter "
-msgstr "المرشّح "
+msgid "Average (ABR)"
+msgstr "معدل (َABR)"
 
 #: ../data/soundconverter.glade.h:28
-msgid "Force mono output"
-msgstr ""
+msgid "Variable (VBR) - Best quality"
+msgstr "متغير (VBR) - جودة أفضل"
 
 #: ../data/soundconverter.glade.h:29
-msgid "Format: "
-msgstr "الصيغة: "
+msgid "Ogg Vorbis (.ogg)"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:30
-msgid "GNOME Audio Profile"
+msgid "MP3 (.mp3)"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:31
-msgid "GNOME-powered Sound Conversion"
+msgid "FLAC Lossless (.flac)"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:32
-msgid "High"
+msgid "MS Wave (.wav)"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:33
-msgid "Insanely High"
+msgid "AAC (.m4a)"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:34
-msgid "Into a specified folder"
-msgstr "داخل المجلد المحدد"
+msgid "GNOME Audio Profile"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:35
-msgid "Less (Faster)"
-msgstr ""
+msgid "track_number - track_title"
+msgstr "رقم_المسار-عنوان_المسار"
 
 #: ../data/soundconverter.glade.h:36
-msgid "Limit number of parallel jobs"
-msgstr ""
+msgid "track_title"
+msgstr "عنوان_المسار"
 
 #: ../data/soundconverter.glade.h:37
-msgid "Low"
-msgstr "منخفض"
+msgid "Preferences"
+msgstr "خصائص"
 
 #: ../data/soundconverter.glade.h:38
-msgid "MP3"
-msgstr "MP3"
+msgid "Same folder as the input file"
+msgstr "نفس مجلد الملف المدخل"
 
 #: ../data/soundconverter.glade.h:39
-msgid "MP3 (.mp3)"
-msgstr ""
+msgid "Choose..."
+msgstr "إختر..."
 
 #: ../data/soundconverter.glade.h:40
-msgid "MP3 Encoder is not present."
-msgstr "مشفر MP3 غير موجود"
+msgid "Into a specified folder"
+msgstr "داخل المجلد المحدد"
 
 #: ../data/soundconverter.glade.h:41
-msgid "MS Wave (.wav)"
-msgstr ""
+msgid "Create subfolders: "
+msgstr "إنشاء مجلدات فرعية: "
 
 #: ../data/soundconverter.glade.h:42
-msgid "Normal"
-msgstr "عادي"
+msgid "Delete original file"
+msgstr "حذف الملف الأصلي"
 
 #: ../data/soundconverter.glade.h:43
-msgid "Ogg"
-msgstr ""
+msgid "<b>Where to place results?</b>"
+msgstr "<b >اين تحفظ النتائج ؟ </b>"
 
 #: ../data/soundconverter.glade.h:44
-msgid "Ogg Vorbis (.ogg)"
-msgstr ""
+msgid "Filename pattern: "
+msgstr "نمط إسم الملف: "
 
 #: ../data/soundconverter.glade.h:45
-msgid "Preferences"
-msgstr "خصائص"
+msgid "Replace all messy characters"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:46
-msgid "Profile:"
+msgid "Remove all characters except letters, digits and ./_-"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:47
-msgid "Quality:"
-msgstr "الجودة:"
+msgid "<i>Example filename:</i>"
+msgstr "<i>مثال لإسم الملف:</i>"
 
 #: ../data/soundconverter.glade.h:48
-msgid "Read how to install"
-msgstr "إقرأ كيفية التثبيت"
+msgid "<b>How to name files?</b>"
+msgstr "<b >كيفية تسمية الملفات ؟ </b>"
 
 #: ../data/soundconverter.glade.h:49
-msgid "Remove all chars except letters, digits and ./_-"
-msgstr "حذف كل المحارف عدا الأحرف,الأرقام  و ./_-"
+msgid "Format: "
+msgstr "الصيغة: "
 
 #: ../data/soundconverter.glade.h:50
-msgid "Replace all messy characters"
-msgstr ""
+msgid "Quality:"
+msgstr "الجودة:"
 
 #: ../data/soundconverter.glade.h:51
-msgid "Resample"
-msgstr "إعاده التشكيل"
+msgid "Use .oga extension"
+msgstr "استعمل صيغة .oga"
 
 #: ../data/soundconverter.glade.h:52
-msgid "Same folder as the input file"
-msgstr "نفس مجلد الملف المدخل"
+msgid "Ogg"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:53
-msgid "Sample width:"
-msgstr ""
+msgid "Bitrate mode:"
+msgstr "نمط معدل البت"
 
 #: ../data/soundconverter.glade.h:54
-msgid "SoundConverter"
-msgstr "محول الصوتيات"
+msgid "MP3"
+msgstr "MP3"
 
 #: ../data/soundconverter.glade.h:55
-msgid "Use .oga extension"
-msgstr "استعمل صيغة .oga"
+msgid "Compression:"
+msgstr "الظغط"
 
 #: ../data/soundconverter.glade.h:56
-msgid "Variable (VBR) - Best quality"
-msgstr "متغير (VBR) - جودة أفضل"
+msgid "FLAC"
+msgstr "FLAC"
 
 #: ../data/soundconverter.glade.h:57
-msgid "Very High"
-msgstr "عالي جدا"
+msgid "Sample width:"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:58
-msgid "Very Low"
-msgstr "منخفض جداً"
-
-#: ../data/soundconverter.glade.h:59
 msgid "WAV"
 msgstr "WAV"
 
+#: ../data/soundconverter.glade.h:59
+msgid "AAC"
+msgstr "أي أي سي (AAC)"
+
 #: ../data/soundconverter.glade.h:60
-msgid "Website"
-msgstr "موقع الويب"
+msgid "Profile:"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:61
-msgid "Where to place results?"
-msgstr "أين توضع النتائج؟"
+msgid "gst-profile"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:62
-msgid "_Add File"
-msgstr "_إضافة ملف"
+msgid "<b>Type of result?</b>"
+msgstr "<b>نوع النتائج ؟</b>"
 
 #: ../data/soundconverter.glade.h:63
-msgid "_Apply to entire queue"
-msgstr "_طبق على كل القائمة"
+msgid "Resample"
+msgstr "إعاده التشكيل"
 
 #: ../data/soundconverter.glade.h:64
-msgid "_Edit"
-msgstr "_تحرير"
+msgid "Force mono output"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:65
-msgid "_File"
-msgstr "_ملف"
+msgid "Limit number of parallel jobs"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:66
-msgid "_Help"
-msgstr "_مساعدة"
+msgid "MP3 Encoder is not present."
+msgstr "مشفر MP3 غير موجود"
 
 #: ../data/soundconverter.glade.h:67
-msgid "_Overwrite"
-msgstr "ا_كتب فوقه"
+msgid "Read how to install"
+msgstr "إقرأ كيفية التثبيت"
 
 #: ../data/soundconverter.glade.h:68
-msgid "_Skip"
-msgstr "_تخطّي"
-
-#: ../data/soundconverter.glade.h:69 ../soundconverter/ui.py:408
-msgid "artist - album"
-msgstr "الفنان - الألبوم"
-
-#: ../data/soundconverter.glade.h:70 ../soundconverter/ui.py:406
-msgid "artist/album"
-msgstr "فنان/ألبوم"
+msgid "Where to place results?"
+msgstr "أين توضع النتائج؟"
+
+#: ../data/soundconverter.glade.h:69
+msgid "SoundConverter"
+msgstr "محول الصوتيات"
+
+#: ../data/soundconverter.glade.h:70
+msgid "_File"
+msgstr "_ملف"
 
 #: ../data/soundconverter.glade.h:71
-msgid "dialog1"
-msgstr "حوار1"
+msgid "_Edit"
+msgstr "_تحرير"
 
 #: ../data/soundconverter.glade.h:72
-msgid "gst-profile"
-msgstr ""
+msgid "_Help"
+msgstr "_مساعدة"
 
 #: ../data/soundconverter.glade.h:73
-msgid "track_number - track_title"
-msgstr "رقم_المسار-عنوان_المسار"
+msgid "_Add File"
+msgstr "_إضافة ملف"
 
 #: ../data/soundconverter.glade.h:74
-msgid "track_title"
-msgstr "عنوان_المسار"
+msgid "Add _Folder"
+msgstr "إضافة _مجلد"
 
-#: ../bin/soundconverter.py:97
+#: ../bin/soundconverter.py:113
 msgid ""
 "Convert in batch mode, from command line, without a graphical user\n"
 " interface. You can use this from, say, shell scripts."
@@ -330,42 +330,42 @@
 "تحويل في طور الصدفة, من سطر الأوامر, بدون واجهة رسومية للمستخدم\n"
 " واجهة. يمكن إستخدام هذا, قول, البرامج النصية للصدفة."
 
-#: ../bin/soundconverter.py:102
+#: ../bin/soundconverter.py:118
 msgid ""
-"Show tags for input files instead of convertingthem. This indicates \n"
-" command line batch modeand disables the graphical user interface."
+"Show tags for input files instead of converting them. This indicates \n"
+" command line batch mode and disables the graphical user interface."
 msgstr ""
 
-#: ../bin/soundconverter.py:107
+#: ../bin/soundconverter.py:122
 #, python-format
 msgid ""
-"Set the output MIME type for batch mode. The defaultis %s. Note that you "
-"probably want to set the outputsuffix as well."
+"Set the output MIME type for batch mode. The default is %s. Note that you "
+"probably want to set the output suffix as well."
 msgstr ""
 
-#: ../bin/soundconverter.py:111
+#: ../bin/soundconverter.py:126
 msgid "Be quiet. Don't write normal output, only errors."
 msgstr "كون هادئ. لا تكتب المخرج العادي, فقط الأخطاء."
 
-#: ../bin/soundconverter.py:113
-msgid "Print additional debug information"
-msgstr "أظهر بيانات التنقيح الأضافية"
+#: ../bin/soundconverter.py:128
+msgid "Displays additional debug information"
+msgstr ""
 
-#: ../bin/soundconverter.py:115
+#: ../bin/soundconverter.py:130
 #, python-format
 msgid ""
 "Set the output filename suffix for batch mode.The default is %s . Note that "
-"the suffix does notaffect\n"
+"the suffix does not affect\n"
 " the output MIME type."
 msgstr ""
 
-#: ../bin/soundconverter.py:119
+#: ../bin/soundconverter.py:134
 msgid "Force number of concurrent conversions."
 msgstr ""
 
-#: ../bin/soundconverter.py:121
-msgid "Show GStreamer Options"
-msgstr "أظهر خيارات GStreamer"
+#: ../bin/soundconverter.py:136
+msgid "Shows GStreamer Options"
+msgstr ""
 
 #: ../soundconverter/error.py:37
 msgid "Target exists."
@@ -419,50 +419,56 @@
 "خطأ : %s\n"
 "%s\n"
 
-#: ../soundconverter/gstreamer.py:482
+#: ../soundconverter/gstreamer.py:189
+msgid "Plugin installation aborted."
+msgstr ""
+
+#. TODO: is this used ?
+#. TODO: add proper error management when an encoder cannot be created
+#: ../soundconverter/gstreamer.py:519
 #, python-format
 msgid "Cannot create a decoder for '%s' format."
 msgstr ""
 
-#: ../soundconverter/gstreamer.py:499
+#: ../soundconverter/gstreamer.py:530
 #, python-format
 msgid "Cannot create '%s' folder."
 msgstr "لا يمكن إنشاء مجلد '%s'"
 
 #. pass
-#: ../soundconverter/gstreamer.py:543
+#: ../soundconverter/gstreamer.py:571
 msgid "GStreamer Error:"
 msgstr ""
 
-#: ../soundconverter/gstreamer.py:627
+#: ../soundconverter/gstreamer.py:656
 msgid "Conversion Canceled"
 msgstr "تم ألغاء التحويل"
 
-#: ../soundconverter/gstreamer.py:634
+#: ../soundconverter/gstreamer.py:663
 msgid "Conversion Error"
 msgstr "خطأ في التحويل"
 
-#: ../soundconverter/gstreamer.py:667
+#: ../soundconverter/gstreamer.py:696
 #, python-format
 msgid "Access denied: '%s'"
 msgstr ""
 
-#: ../soundconverter/gstreamer.py:683
+#: ../soundconverter/gstreamer.py:712
 msgid "Cannot overwrite source file(s)!"
 msgstr "لا يمكن استبدال الملفات الأصلية"
 
-#: ../soundconverter/gstreamer.py:696
+#: ../soundconverter/gstreamer.py:725
 #, python-format
 msgid ""
 "The output file <i>%s</i>\n"
-" exists already.\n"
+" already exists.\n"
 " Do you want to skip the file, overwrite it or cancel the conversion?\n"
 msgstr ""
 
-#: ../soundconverter/gstreamer.py:800
+#: ../soundconverter/gstreamer.py:830
 #, python-format
-msgid "Conversion done, in %s"
-msgstr "التحويل تم، في '%s'"
+msgid "Conversion done in %s"
+msgstr ""
 
 #: ../soundconverter/namegenerator.py:76
 msgid "Unknown Album"
@@ -472,22 +478,18 @@
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../soundconverter/namegenerator.py:78
-msgid "Unknown Title"
-msgstr ""
-
 #. traductors: These are the custom filename patterns. Only if it makes sense.
-#: ../soundconverter/settings.py:43
+#: ../soundconverter/settings.py:47
 msgid ""
 "Artist Album Title Track Total Genre Date Year Timestamp DiscNumber "
 "DiscTotal Ext"
 msgstr ""
 
-#: ../soundconverter/settings.py:80
+#: ../soundconverter/settings.py:84
 msgid "All files"
 msgstr ""
 
-#: ../soundconverter/ui.py:123 ../soundconverter/ui.py:139
+#: ../soundconverter/ui.py:96 ../soundconverter/ui.py:112
 #, python-format
 msgid ""
 "\n"
@@ -495,93 +497,97 @@
 "%s\n"
 msgstr ""
 
-#: ../soundconverter/ui.py:229
+#: ../soundconverter/ui.py:202
 msgid "Scanning files..."
 msgstr ""
 
-#: ../soundconverter/ui.py:328
+#: ../soundconverter/ui.py:309
 msgid "Adding files..."
 msgstr ""
 
-#: ../soundconverter/ui.py:396
+#: ../soundconverter/ui.py:377
 msgid "Same as input, but replacing the suffix"
 msgstr ""
 
-#: ../soundconverter/ui.py:398
+#: ../soundconverter/ui.py:379
 msgid "Same as input, but with an additional suffix"
 msgstr ""
 
-#: ../soundconverter/ui.py:399
+#: ../soundconverter/ui.py:380
 msgid "Track number - title"
 msgstr ""
 
-#: ../soundconverter/ui.py:400
+#: ../soundconverter/ui.py:381
 msgid "Track title"
 msgstr ""
 
-#: ../soundconverter/ui.py:401
+#: ../soundconverter/ui.py:382
 msgid "Artist - title"
 msgstr "الفنان - العنوان"
 
-#: ../soundconverter/ui.py:402
+#: ../soundconverter/ui.py:383
 msgid "Custom filename pattern"
 msgstr "صيغة اسم ملف مخصصة"
 
-#: ../soundconverter/ui.py:407
+#: ../soundconverter/ui.py:388
 msgid "artist-album"
 msgstr "فنان-ألبوم"
 
-#: ../soundconverter/ui.py:464
+#: ../soundconverter/ui.py:445
 msgid "Available patterns:"
 msgstr ""
 
-#: ../soundconverter/ui.py:650
+#: ../soundconverter/ui.py:631
 #, python-format
 msgid "Into folder %s"
 msgstr "في المجلد %s"
 
-#: ../soundconverter/ui.py:727
+#: ../soundconverter/ui.py:708
 #, python-format
 msgid "Target bitrate: %s"
 msgstr "معدال البت المطلوب: '%s'"
 
-#: ../soundconverter/ui.py:1069
+#: ../soundconverter/ui.py:1050
 msgid "Open a file"
-msgstr ""
+msgstr "افتح ملفا"
 
-#: ../soundconverter/ui.py:1163
+#: ../soundconverter/ui.py:1144
 msgid "Add Folder..."
 msgstr "إضافة مجلد..."
 
-#: ../soundconverter/ui.py:1336
+#: ../soundconverter/ui.py:1322
 msgid "Reading tags..."
+msgstr "تتم قراءة الوسوم..."
+
+#: ../soundconverter/ui.py:1324
+msgid "Preparing conversion..."
 msgstr ""
 
-#: ../soundconverter/ui.py:1347
+#: ../soundconverter/ui.py:1339
 msgid "Conversion cancelled"
 msgstr ""
 
-#: ../soundconverter/ui.py:1350
+#: ../soundconverter/ui.py:1342
 msgid "Error when converting"
 msgstr ""
 
-#: ../soundconverter/ui.py:1364
+#: ../soundconverter/ui.py:1357
 msgid "Converting"
 msgstr "تحويل"
 
-#: ../soundconverter/ui.py:1384
+#: ../soundconverter/ui.py:1377
 msgid "Canceled"
 msgstr "تم إلغاء الأمر"
 
-#: ../soundconverter/ui.py:1457
+#: ../soundconverter/ui.py:1450
 msgid "Paused"
 msgstr "متوقّف مؤقتا"
 
+#: ../soundconverter/ui.py:1468
+#, python-format
+msgid "%d:%02d left"
+msgstr ""
+
 #: ../soundconverter/ui.py:1474
-#, python-format
-msgid "%d:%02d left"
-msgstr ""
-
-#: ../soundconverter/ui.py:1480
 msgid "Ready"
 msgstr "جاهز"

=== modified file 'po/bg.po'
--- po/bg.po	2012-02-22 21:58:39 +0000
+++ po/bg.po	2012-11-21 17:48:22 +0000
@@ -8,322 +8,322 @@
 msgstr ""
 "Project-Id-Version: soundconverter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-12 22:56+0100\n"
+"POT-Creation-Date: 2012-07-30 15:28+0000\n"
 "PO-Revision-Date: 2012-01-13 03:56+0000\n"
 "Last-Translator: Nikola Yanev <[e-mail]>\n"
 "Language-Team: English (United Kingdom) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-01-18 21:12+0000\n"
-"X-Generator: Launchpad (build 14681)\n"
+"X-Launchpad-Export-Date: 2012-10-06 15:24+0000\n"
+"X-Generator: Launchpad (build 16061)\n"
 "Language: \n"
 
 #: ../data/soundconverter.desktop.in.in.h:1
+msgid "Sound Converter"
+msgstr "Sound Converter"
+
+#: ../data/soundconverter.desktop.in.in.h:2
 msgid "Audio Format Converter"
 msgstr "Конвертор на аудио формати"
 
-#: ../data/soundconverter.desktop.in.in.h:2
-msgid "Convert audio files into other formats"
-msgstr "Обръщане на аудио файлове в други формати"
-
 #: ../data/soundconverter.desktop.in.in.h:3
-msgid "Sound Converter"
-msgstr "Sound Converter"
+msgid "Converts audio files into other formats"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:1
-msgid "16 bits (default)"
+msgid "GNOME-powered Sound Conversion"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:2
-msgid "32 bits"
+msgid "Website"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:3
-msgid "8 bits (very low quality)"
-msgstr ""
+msgid "dialog1"
+msgstr "dialog1"
 
 #: ../data/soundconverter.glade.h:4
-msgid "<b>How to name files?</b>"
-msgstr "<b>Как ще се казва файла?</b>"
+msgid "Filter "
+msgstr "Филтър "
 
 #: ../data/soundconverter.glade.h:5
-msgid "<b>Type of result?</b>"
-msgstr "<b>Формат на изходният файл?</b>"
+msgid "Error"
+msgstr "Грешка"
 
 #: ../data/soundconverter.glade.h:6
-msgid "<b>Where to place results?</b>"
-msgstr "<b>Къде да поставим резултата?</b>"
+msgid "File exists already"
+msgstr "Файла вече съществува"
 
 #: ../data/soundconverter.glade.h:7
+msgid "_Overwrite"
+msgstr "_Презапиши"
+
+#: ../data/soundconverter.glade.h:8
+msgid "_Skip"
+msgstr "_Прескочи"
+
+#: ../data/soundconverter.glade.h:9
 msgid "<big><b>File exists already</b></big>\n"
 msgstr "<big><b>Файла вече съществува</b></big>\n"
 
-#: ../data/soundconverter.glade.h:9
-msgid "<i>Example filename:</i>"
-msgstr "<i>Примерно наименование:</i>"
-
-#: ../data/soundconverter.glade.h:10
-msgid "AAC"
-msgstr ""
-
 #: ../data/soundconverter.glade.h:11
-msgid "AAC (.m4a)"
-msgstr ""
-
-#: ../data/soundconverter.glade.h:12
-msgid "Add _Folder"
-msgstr "_Добави папка"
-
-#: ../data/soundconverter.glade.h:13
-msgid "Average (ABR)"
-msgstr ""
+msgid "_Apply to entire queue"
+msgstr "_Приложи към цялата опашка"
+
+#: ../data/soundconverter.glade.h:12 ../soundconverter/ui.py:387
+msgid "artist/album"
+msgstr "изпълнител/албум"
+
+#: ../data/soundconverter.glade.h:13 ../soundconverter/ui.py:389
+msgid "artist - album"
+msgstr "изпълнител - албум"
 
 #: ../data/soundconverter.glade.h:14
-msgid "Better (Slower)"
+msgid "Very Low"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:15
-msgid "Bitrate mode:"
-msgstr "Тип на плътността kb/s"
+msgid "Low"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:16
-msgid "Choose..."
-msgstr "Изберете..."
+msgid "Normal"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:17
-msgid "Compression:"
-msgstr "Компресия:"
+msgid "High"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:18
-msgid "Constant (CBR)"
+msgid "Very High"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:19
-msgid "Create subfolders: "
-msgstr "Създаване на подпапки "
+msgid "Insanely High"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:20
-msgid "Default"
+msgid "8 bits (very low quality)"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:21
-msgid "Delete original file"
-msgstr "Изтриване на оригиналният файл"
+msgid "16 bits (default)"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:22
-msgid "Error"
-msgstr "Грешка"
+msgid "32 bits"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:23
-msgid "FLAC"
-msgstr "FLAC"
+msgid "Less (Faster)"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:24
-msgid "FLAC Lossless (.flac)"
+msgid "Default"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:25
-msgid "File exists already"
-msgstr "Файла вече съществува"
+msgid "Better (Slower)"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:26
-msgid "Filename pattern: "
-msgstr "Шаблон за наименоване "
+msgid "Constant (CBR)"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:27
-msgid "Filter "
-msgstr "Филтър "
+msgid "Average (ABR)"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:28
-msgid "Force mono output"
+msgid "Variable (VBR) - Best quality"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:29
-msgid "Format: "
-msgstr "Формат: "
+msgid "Ogg Vorbis (.ogg)"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:30
-msgid "GNOME Audio Profile"
+msgid "MP3 (.mp3)"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:31
-msgid "GNOME-powered Sound Conversion"
+msgid "FLAC Lossless (.flac)"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:32
-msgid "High"
+msgid "MS Wave (.wav)"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:33
-msgid "Insanely High"
+msgid "AAC (.m4a)"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:34
-msgid "Into a specified folder"
-msgstr "В изрично упомената папка"
+msgid "GNOME Audio Profile"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:35
-msgid "Less (Faster)"
+msgid "track_number - track_title"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:36
-msgid "Limit number of parallel jobs"
+msgid "track_title"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:37
-msgid "Low"
-msgstr ""
+msgid "Preferences"
+msgstr "Настройки"
 
 #: ../data/soundconverter.glade.h:38
-msgid "MP3"
-msgstr "MP3"
+msgid "Same folder as the input file"
+msgstr "В същата папка, в която се намира входящия файл"
 
 #: ../data/soundconverter.glade.h:39
-msgid "MP3 (.mp3)"
-msgstr ""
+msgid "Choose..."
+msgstr "Изберете..."
 
 #: ../data/soundconverter.glade.h:40
-msgid "MP3 Encoder is not present."
-msgstr "Не е намерен кодек за MP3"
+msgid "Into a specified folder"
+msgstr "В изрично упомената папка"
 
 #: ../data/soundconverter.glade.h:41
-msgid "MS Wave (.wav)"
-msgstr ""
+msgid "Create subfolders: "
+msgstr "Създаване на подпапки "
 
 #: ../data/soundconverter.glade.h:42
-msgid "Normal"
-msgstr ""
+msgid "Delete original file"
+msgstr "Изтриване на оригиналният файл"
 
 #: ../data/soundconverter.glade.h:43
-msgid "Ogg"
-msgstr ""
+msgid "<b>Where to place results?</b>"
+msgstr "<b>Къде да поставим резултата?</b>"
 
 #: ../data/soundconverter.glade.h:44
-msgid "Ogg Vorbis (.ogg)"
-msgstr ""
+msgid "Filename pattern: "
+msgstr "Шаблон за наименоване "
 
 #: ../data/soundconverter.glade.h:45
-msgid "Preferences"
-msgstr "Настройки"
+msgid "Replace all messy characters"
+msgstr "Заместване на всички неправилни символи"
 
 #: ../data/soundconverter.glade.h:46
-msgid "Profile:"
+msgid "Remove all characters except letters, digits and ./_-"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:47
-msgid "Quality:"
-msgstr "Качество:"
+msgid "<i>Example filename:</i>"
+msgstr "<i>Примерно наименование:</i>"
 
 #: ../data/soundconverter.glade.h:48
-msgid "Read how to install"
-msgstr "Прочетете как се инсталира"
+msgid "<b>How to name files?</b>"
+msgstr "<b>Как ще се казва файла?</b>"
 
 #: ../data/soundconverter.glade.h:49
-msgid "Remove all chars except letters, digits and ./_-"
-msgstr "Премахване на всички  символи, с изключение на букви, цифри и ./_-"
+msgid "Format: "
+msgstr "Формат: "
 
 #: ../data/soundconverter.glade.h:50
-msgid "Replace all messy characters"
-msgstr "Заместване на всички неправилни символи"
+msgid "Quality:"
+msgstr "Качество:"
 
 #: ../data/soundconverter.glade.h:51
-msgid "Resample"
-msgstr ""
+msgid "Use .oga extension"
+msgstr "Използвай .oga разширение"
 
 #: ../data/soundconverter.glade.h:52
-msgid "Same folder as the input file"
-msgstr "В същата папка, в която се намира входящия файл"
+msgid "Ogg"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:53
-msgid "Sample width:"
-msgstr ""
+msgid "Bitrate mode:"
+msgstr "Тип на плътността kb/s"
 
 #: ../data/soundconverter.glade.h:54
-msgid "SoundConverter"
-msgstr "SoundConverter"
+msgid "MP3"
+msgstr "MP3"
 
 #: ../data/soundconverter.glade.h:55
-msgid "Use .oga extension"
-msgstr "Използвай .oga разширение"
+msgid "Compression:"
+msgstr "Компресия:"
 
 #: ../data/soundconverter.glade.h:56
-msgid "Variable (VBR) - Best quality"
-msgstr ""
+msgid "FLAC"
+msgstr "FLAC"
 
 #: ../data/soundconverter.glade.h:57
-msgid "Very High"
+msgid "Sample width:"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:58
-msgid "Very Low"
-msgstr ""
-
-#: ../data/soundconverter.glade.h:59
 msgid "WAV"
 msgstr "WAV"
 
+#: ../data/soundconverter.glade.h:59
+msgid "AAC"
+msgstr ""
+
 #: ../data/soundconverter.glade.h:60
-msgid "Website"
+msgid "Profile:"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:61
-msgid "Where to place results?"
-msgstr "Къде да поставим резултата?"
+msgid "gst-profile"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:62
-msgid "_Add File"
-msgstr "_Добави файл"
+msgid "<b>Type of result?</b>"
+msgstr "<b>Формат на изходният файл?</b>"
 
 #: ../data/soundconverter.glade.h:63
-msgid "_Apply to entire queue"
-msgstr "_Приложи към цялата опашка"
+msgid "Resample"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:64
-msgid "_Edit"
-msgstr "_Редактиране"
+msgid "Force mono output"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:65
-msgid "_File"
+msgid "Limit number of parallel jobs"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:66
-msgid "_Help"
-msgstr ""
+msgid "MP3 Encoder is not present."
+msgstr "Не е намерен кодек за MP3"
 
 #: ../data/soundconverter.glade.h:67
-msgid "_Overwrite"
-msgstr "_Презапиши"
+msgid "Read how to install"
+msgstr "Прочетете как се инсталира"
 
 #: ../data/soundconverter.glade.h:68
-msgid "_Skip"
-msgstr "_Прескочи"
-
-#: ../data/soundconverter.glade.h:69 ../soundconverter/ui.py:408
-msgid "artist - album"
-msgstr "изпълнител - албум"
-
-#: ../data/soundconverter.glade.h:70 ../soundconverter/ui.py:406
-msgid "artist/album"
-msgstr "изпълнител/албум"
+msgid "Where to place results?"
+msgstr "Къде да поставим резултата?"
+
+#: ../data/soundconverter.glade.h:69
+msgid "SoundConverter"
+msgstr "SoundConverter"
+
+#: ../data/soundconverter.glade.h:70
+msgid "_File"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:71
-msgid "dialog1"
-msgstr "dialog1"
+msgid "_Edit"
+msgstr "_Редактиране"
 
 #: ../data/soundconverter.glade.h:72
-msgid "gst-profile"
+msgid "_Help"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:73
-msgid "track_number - track_title"
-msgstr ""
+msgid "_Add File"
+msgstr "_Добави файл"
 
 #: ../data/soundconverter.glade.h:74
-msgid "track_title"
-msgstr ""
+msgid "Add _Folder"
+msgstr "_Добави папка"
 
-#: ../bin/soundconverter.py:97
+#: ../bin/soundconverter.py:113
 msgid ""
 "Convert in batch mode, from command line, without a graphical user\n"
 " interface. You can use this from, say, shell scripts."
@@ -331,41 +331,41 @@
 "Конвертирай в пакетен режим, от командния ред, без графичен\n"
 " интерфейс. Това е използваемо, да кажем, чрез скриптове"
 
-#: ../bin/soundconverter.py:102
+#: ../bin/soundconverter.py:118
 msgid ""
-"Show tags for input files instead of convertingthem. This indicates \n"
-" command line batch modeand disables the graphical user interface."
+"Show tags for input files instead of converting them. This indicates \n"
+" command line batch mode and disables the graphical user interface."
 msgstr ""
 
-#: ../bin/soundconverter.py:107
+#: ../bin/soundconverter.py:122
 #, python-format
 msgid ""
-"Set the output MIME type for batch mode. The defaultis %s. Note that you "
-"probably want to set the outputsuffix as well."
+"Set the output MIME type for batch mode. The default is %s. Note that you "
+"probably want to set the output suffix as well."
 msgstr ""
 
-#: ../bin/soundconverter.py:111
+#: ../bin/soundconverter.py:126
 msgid "Be quiet. Don't write normal output, only errors."
 msgstr "Съобщавай само грешките."
 
-#: ../bin/soundconverter.py:113
-msgid "Print additional debug information"
+#: ../bin/soundconverter.py:128
+msgid "Displays additional debug information"
 msgstr ""
 
-#: ../bin/soundconverter.py:115
+#: ../bin/soundconverter.py:130
 #, python-format
 msgid ""
 "Set the output filename suffix for batch mode.The default is %s . Note that "
-"the suffix does notaffect\n"
+"the suffix does not affect\n"
 " the output MIME type."
 msgstr ""
 
-#: ../bin/soundconverter.py:119
+#: ../bin/soundconverter.py:134
 msgid "Force number of concurrent conversions."
 msgstr ""
 
-#: ../bin/soundconverter.py:121
-msgid "Show GStreamer Options"
+#: ../bin/soundconverter.py:136
+msgid "Shows GStreamer Options"
 msgstr ""
 
 #: ../soundconverter/error.py:37
@@ -420,53 +420,56 @@
 "Грешка: %s\n"
 "%s\n"
 
-#: ../soundconverter/gstreamer.py:482
+#: ../soundconverter/gstreamer.py:189
+msgid "Plugin installation aborted."
+msgstr ""
+
+#. TODO: is this used ?
+#. TODO: add proper error management when an encoder cannot be created
+#: ../soundconverter/gstreamer.py:519
 #, python-format
 msgid "Cannot create a decoder for '%s' format."
 msgstr "Невъзможно създаването на декодер за формата '%s'"
 
-#: ../soundconverter/gstreamer.py:499
+#: ../soundconverter/gstreamer.py:530
 #, python-format
 msgid "Cannot create '%s' folder."
 msgstr "Невъзможно създаването на папка '%s'"
 
 #. pass
-#: ../soundconverter/gstreamer.py:543
+#: ../soundconverter/gstreamer.py:571
 msgid "GStreamer Error:"
 msgstr ""
 
-#: ../soundconverter/gstreamer.py:627
+#: ../soundconverter/gstreamer.py:656
 msgid "Conversion Canceled"
 msgstr ""
 
-#: ../soundconverter/gstreamer.py:634
+#: ../soundconverter/gstreamer.py:663
 msgid "Conversion Error"
 msgstr ""
 
-#: ../soundconverter/gstreamer.py:667
+#: ../soundconverter/gstreamer.py:696
 #, python-format
 msgid "Access denied: '%s'"
 msgstr ""
 
-#: ../soundconverter/gstreamer.py:683
+#: ../soundconverter/gstreamer.py:712
 msgid "Cannot overwrite source file(s)!"
 msgstr ""
 
-#: ../soundconverter/gstreamer.py:696
+#: ../soundconverter/gstreamer.py:725
 #, python-format
 msgid ""
 "The output file <i>%s</i>\n"
-" exists already.\n"
+" already exists.\n"
 " Do you want to skip the file, overwrite it or cancel the conversion?\n"
 msgstr ""
-"Изходният файл <i>%s</i>\n"
-" вече съществува.\n"
-" Искате ли да го прескочим, да го презапишем или да отменим конвертирането?\n"
 
-#: ../soundconverter/gstreamer.py:800
+#: ../soundconverter/gstreamer.py:830
 #, python-format
-msgid "Conversion done, in %s"
-msgstr "Конвертирането е готово за %s"
+msgid "Conversion done in %s"
+msgstr ""
 
 #: ../soundconverter/namegenerator.py:76
 msgid "Unknown Album"
@@ -476,22 +479,18 @@
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../soundconverter/namegenerator.py:78
-msgid "Unknown Title"
-msgstr ""
-
 #. traductors: These are the custom filename patterns. Only if it makes sense.
-#: ../soundconverter/settings.py:43
+#: ../soundconverter/settings.py:47
 msgid ""
 "Artist Album Title Track Total Genre Date Year Timestamp DiscNumber "
 "DiscTotal Ext"
 msgstr ""
 
-#: ../soundconverter/settings.py:80
+#: ../soundconverter/settings.py:84
 msgid "All files"
 msgstr ""
 
-#: ../soundconverter/ui.py:123 ../soundconverter/ui.py:139
+#: ../soundconverter/ui.py:96 ../soundconverter/ui.py:112
 #, python-format
 msgid ""
 "\n"
@@ -499,93 +498,97 @@
 "%s\n"
 msgstr ""
 
-#: ../soundconverter/ui.py:229
+#: ../soundconverter/ui.py:202
 msgid "Scanning files..."
 msgstr ""
 
-#: ../soundconverter/ui.py:328
+#: ../soundconverter/ui.py:309
 msgid "Adding files..."
 msgstr ""
 
-#: ../soundconverter/ui.py:396
+#: ../soundconverter/ui.py:377
 msgid "Same as input, but replacing the suffix"
 msgstr "Като оригиналния файл, но замествайки разширението"
 
-#: ../soundconverter/ui.py:398
+#: ../soundconverter/ui.py:379
 msgid "Same as input, but with an additional suffix"
 msgstr "Като оригиналния файл, но добавяйки разширение"
 
-#: ../soundconverter/ui.py:399
+#: ../soundconverter/ui.py:380
 msgid "Track number - title"
 msgstr "Номер на песен - Заглавие"
 
-#: ../soundconverter/ui.py:400
+#: ../soundconverter/ui.py:381
 msgid "Track title"
 msgstr ""
 
-#: ../soundconverter/ui.py:401
+#: ../soundconverter/ui.py:382
 msgid "Artist - title"
 msgstr "Изпълнител - Заглавие"
 
-#: ../soundconverter/ui.py:402
+#: ../soundconverter/ui.py:383
 msgid "Custom filename pattern"
 msgstr "Собствен шаблон за наименование на файла"
 
-#: ../soundconverter/ui.py:407
+#: ../soundconverter/ui.py:388
 msgid "artist-album"
 msgstr "изпълнител-албум"
 
-#: ../soundconverter/ui.py:464
+#: ../soundconverter/ui.py:445
 msgid "Available patterns:"
 msgstr ""
 
-#: ../soundconverter/ui.py:650
+#: ../soundconverter/ui.py:631
 #, python-format
 msgid "Into folder %s"
 msgstr "В папка %s"
 
-#: ../soundconverter/ui.py:727
+#: ../soundconverter/ui.py:708
 #, python-format
 msgid "Target bitrate: %s"
 msgstr "Изходна плътност kb/s: %s"
 
-#: ../soundconverter/ui.py:1069
+#: ../soundconverter/ui.py:1050
 msgid "Open a file"
 msgstr ""
 
-#: ../soundconverter/ui.py:1163
+#: ../soundconverter/ui.py:1144
 msgid "Add Folder..."
 msgstr "Добави папка..."
 
-#: ../soundconverter/ui.py:1336
+#: ../soundconverter/ui.py:1322
 msgid "Reading tags..."
 msgstr ""
 
-#: ../soundconverter/ui.py:1347
+#: ../soundconverter/ui.py:1324
+msgid "Preparing conversion..."
+msgstr ""
+
+#: ../soundconverter/ui.py:1339
 msgid "Conversion cancelled"
 msgstr ""
 
-#: ../soundconverter/ui.py:1350
+#: ../soundconverter/ui.py:1342
 msgid "Error when converting"
 msgstr ""
 
-#: ../soundconverter/ui.py:1364
+#: ../soundconverter/ui.py:1357
 msgid "Converting"
 msgstr "Конвертиране"
 
-#: ../soundconverter/ui.py:1384
+#: ../soundconverter/ui.py:1377
 msgid "Canceled"
 msgstr "Отменено"
 
-#: ../soundconverter/ui.py:1457
+#: ../soundconverter/ui.py:1450
 msgid "Paused"
 msgstr "Прекъснато"
 
-#: ../soundconverter/ui.py:1474
+#: ../soundconverter/ui.py:1468
 #, python-format
 msgid "%d:%02d left"
 msgstr "Остават %d:%02d"
 
-#: ../soundconverter/ui.py:1480
+#: ../soundconverter/ui.py:1474
 msgid "Ready"
 msgstr "Готово"

=== modified file 'po/br.po'
--- po/br.po	2012-02-22 21:58:39 +0000
+++ po/br.po	2012-11-21 17:48:22 +0000
@@ -9,322 +9,322 @@
 msgstr ""
 "Project-Id-Version: soundconverter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-12 22:56+0100\n"
+"POT-Creation-Date: 2012-07-30 15:28+0000\n"
 "PO-Revision-Date: 2012-01-13 03:53+0000\n"
 "Last-Translator: GautierPortet <[e-mail]>\n"
 "Language-Team: Breton <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-01-18 21:12+0000\n"
-"X-Generator: Launchpad (build 14681)\n"
+"X-Launchpad-Export-Date: 2012-10-06 15:24+0000\n"
+"X-Generator: Launchpad (build 16061)\n"
 "Language: br\n"
 
 #: ../data/soundconverter.desktop.in.in.h:1
+msgid "Sound Converter"
+msgstr "Amdroer Sound Converter"
+
+#: ../data/soundconverter.desktop.in.in.h:2
 msgid "Audio Format Converter"
 msgstr "Amdroadur etre furmadoù klevet"
 
-#: ../data/soundconverter.desktop.in.in.h:2
-msgid "Convert audio files into other formats"
-msgstr "Amdreiñ restroù klevet ouzh furmadoù all"
-
 #: ../data/soundconverter.desktop.in.in.h:3
-msgid "Sound Converter"
-msgstr "Amdroer Sound Converter"
+msgid "Converts audio files into other formats"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:1
-msgid "16 bits (default)"
+msgid "GNOME-powered Sound Conversion"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:2
-msgid "32 bits"
+msgid "Website"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:3
-msgid "8 bits (very low quality)"
-msgstr ""
+msgid "dialog1"
+msgstr "dialog1"
 
 #: ../data/soundconverter.glade.h:4
-msgid "<b>How to name files?</b>"
-msgstr "<b>Penaos adanviñ ar restroù?</b>"
+msgid "Filter "
+msgstr "Sil "
 
 #: ../data/soundconverter.glade.h:5
-msgid "<b>Type of result?</b>"
-msgstr "<b>Furmad ar restr er maez?</b>"
+msgid "Error"
+msgstr "Fazi"
 
 #: ../data/soundconverter.glade.h:6
-msgid "<b>Where to place results?</b>"
-msgstr "<b>Pelec'h lechiañ ar restroù amdreet?</b>"
+msgid "File exists already"
+msgstr "Bez eus c'hoazh ar restr"
 
 #: ../data/soundconverter.glade.h:7
+msgid "_Overwrite"
+msgstr "_Flastrañ"
+
+#: ../data/soundconverter.glade.h:8
+msgid "_Skip"
+msgstr "_Mont e biou"
+
+#: ../data/soundconverter.glade.h:9
 msgid "<big><b>File exists already</b></big>\n"
 msgstr "<big><b>Bez eus c'hoazh ar restr</b></big>\n"
 
-#: ../data/soundconverter.glade.h:9
-msgid "<i>Example filename:</i>"
-msgstr "<i>Skouer anv restr:</i>"
-
-#: ../data/soundconverter.glade.h:10
-msgid "AAC"
-msgstr ""
-
 #: ../data/soundconverter.glade.h:11
-msgid "AAC (.m4a)"
-msgstr ""
-
-#: ../data/soundconverter.glade.h:12
-msgid "Add _Folder"
-msgstr "Ouzhpennañ un _teuliad"
-
-#: ../data/soundconverter.glade.h:13
-msgid "Average (ABR)"
-msgstr ""
+msgid "_Apply to entire queue"
+msgstr "_Arloañ evit tout ar steudad c'hortoz"
+
+#: ../data/soundconverter.glade.h:12 ../soundconverter/ui.py:387
+msgid "artist/album"
+msgstr "arzour/albom"
+
+#: ../data/soundconverter.glade.h:13 ../soundconverter/ui.py:389
+msgid "artist - album"
+msgstr "arzour - albom"
 
 #: ../data/soundconverter.glade.h:14
-msgid "Better (Slower)"
+msgid "Very Low"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:15
-msgid "Bitrate mode:"
-msgstr "Kas binarel:"
+msgid "Low"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:16
-msgid "Choose..."
-msgstr "Furchal..."
+msgid "Normal"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:17
-msgid "Compression:"
+msgid "High"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:18
-msgid "Constant (CBR)"
+msgid "Very High"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:19
-msgid "Create subfolders: "
-msgstr "Krouiñ is-teuliadoù : "
+msgid "Insanely High"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:20
-msgid "Default"
+msgid "8 bits (very low quality)"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:21
-msgid "Delete original file"
-msgstr "Skarzhañ ar restr orin"
+msgid "16 bits (default)"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:22
-msgid "Error"
-msgstr "Fazi"
+msgid "32 bits"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:23
-msgid "FLAC"
-msgstr "FLAC"
+msgid "Less (Faster)"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:24
-msgid "FLAC Lossless (.flac)"
+msgid "Default"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:25
-msgid "File exists already"
-msgstr "Bez eus c'hoazh ar restr"
+msgid "Better (Slower)"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:26
-msgid "Filename pattern: "
-msgstr "Goustur an anv restr : "
+msgid "Constant (CBR)"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:27
-msgid "Filter "
-msgstr "Sil "
+msgid "Average (ABR)"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:28
-msgid "Force mono output"
+msgid "Variable (VBR) - Best quality"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:29
-msgid "Format: "
-msgstr "Mentrezh : "
+msgid "Ogg Vorbis (.ogg)"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:30
-msgid "GNOME Audio Profile"
+msgid "MP3 (.mp3)"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:31
-msgid "GNOME-powered Sound Conversion"
+msgid "FLAC Lossless (.flac)"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:32
-msgid "High"
+msgid "MS Wave (.wav)"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:33
-msgid "Insanely High"
+msgid "AAC (.m4a)"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:34
-msgid "Into a specified folder"
-msgstr "Er renkell arbennik"
+msgid "GNOME Audio Profile"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:35
-msgid "Less (Faster)"
+msgid "track_number - track_title"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:36
-msgid "Limit number of parallel jobs"
+msgid "track_title"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:37
-msgid "Low"
-msgstr ""
+msgid "Preferences"
+msgstr "Gwellvezioù"
 
 #: ../data/soundconverter.glade.h:38
-msgid "MP3"
-msgstr "MP3"
+msgid "Same folder as the input file"
+msgstr "Er memes renkell eget an tarzh"
 
 #: ../data/soundconverter.glade.h:39
-msgid "MP3 (.mp3)"
-msgstr ""
+msgid "Choose..."
+msgstr "Furchal..."
 
 #: ../data/soundconverter.glade.h:40
-msgid "MP3 Encoder is not present."
-msgstr "N'eus ket enkoder MP3."
+msgid "Into a specified folder"
+msgstr "Er renkell arbennik"
 
 #: ../data/soundconverter.glade.h:41
-msgid "MS Wave (.wav)"
-msgstr ""
+msgid "Create subfolders: "
+msgstr "Krouiñ is-teuliadoù : "
 
 #: ../data/soundconverter.glade.h:42
-msgid "Normal"
-msgstr ""
+msgid "Delete original file"
+msgstr "Skarzhañ ar restr orin"
 
 #: ../data/soundconverter.glade.h:43
-msgid "Ogg"
-msgstr ""
+msgid "<b>Where to place results?</b>"
+msgstr "<b>Pelec'h lechiañ ar restroù amdreet?</b>"
 
 #: ../data/soundconverter.glade.h:44
-msgid "Ogg Vorbis (.ogg)"
-msgstr ""
+msgid "Filename pattern: "
+msgstr "Goustur an anv restr : "
 
 #: ../data/soundconverter.glade.h:45
-msgid "Preferences"
-msgstr "Gwellvezioù"
+msgid "Replace all messy characters"
+msgstr "Erlec'hiañ an holl arouezennoù iskis"
 
 #: ../data/soundconverter.glade.h:46
-msgid "Profile:"
+msgid "Remove all characters except letters, digits and ./_-"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:47
-msgid "Quality:"
-msgstr "Perzhded :"
+msgid "<i>Example filename:</i>"
+msgstr "<i>Skouer anv restr:</i>"
 
 #: ../data/soundconverter.glade.h:48
-msgid "Read how to install"
-msgstr "Lenn penaos staliañ"
+msgid "<b>How to name files?</b>"
+msgstr "<b>Penaos adanviñ ar restroù?</b>"
 
 #: ../data/soundconverter.glade.h:49
-msgid "Remove all chars except letters, digits and ./_-"
-msgstr "Dilemel an holl arouezennoù nemet al lizherennoù, sifroù ha ./_-"
+msgid "Format: "
+msgstr "Mentrezh : "
 
 #: ../data/soundconverter.glade.h:50
-msgid "Replace all messy characters"
-msgstr "Erlec'hiañ an holl arouezennoù iskis"
+msgid "Quality:"
+msgstr "Perzhded :"
 
 #: ../data/soundconverter.glade.h:51
-msgid "Resample"
+msgid "Use .oga extension"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:52
-msgid "Same folder as the input file"
-msgstr "Er memes renkell eget an tarzh"
+msgid "Ogg"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:53
-msgid "Sample width:"
-msgstr ""
+msgid "Bitrate mode:"
+msgstr "Kas binarel:"
 
 #: ../data/soundconverter.glade.h:54
-msgid "SoundConverter"
-msgstr "SoundConverter"
+msgid "MP3"
+msgstr "MP3"
 
 #: ../data/soundconverter.glade.h:55
-msgid "Use .oga extension"
+msgid "Compression:"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:56
-msgid "Variable (VBR) - Best quality"
-msgstr ""
+msgid "FLAC"
+msgstr "FLAC"
 
 #: ../data/soundconverter.glade.h:57
-msgid "Very High"
+msgid "Sample width:"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:58
-msgid "Very Low"
-msgstr ""
-
-#: ../data/soundconverter.glade.h:59
 msgid "WAV"
 msgstr "WAV"
 
+#: ../data/soundconverter.glade.h:59
+msgid "AAC"
+msgstr ""
+
 #: ../data/soundconverter.glade.h:60
-msgid "Website"
+msgid "Profile:"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:61
-msgid "Where to place results?"
-msgstr "E pelec'h lechiañ ar restroù amdreet?"
+msgid "gst-profile"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:62
-msgid "_Add File"
-msgstr "Ouzhpenn_añ ur restr"
+msgid "<b>Type of result?</b>"
+msgstr "<b>Furmad ar restr er maez?</b>"
 
 #: ../data/soundconverter.glade.h:63
-msgid "_Apply to entire queue"
-msgstr "_Arloañ evit tout ar steudad c'hortoz"
+msgid "Resample"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:64
-msgid "_Edit"
+msgid "Force mono output"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:65
-msgid "_File"
+msgid "Limit number of parallel jobs"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:66
-msgid "_Help"
-msgstr ""
+msgid "MP3 Encoder is not present."
+msgstr "N'eus ket enkoder MP3."
 
 #: ../data/soundconverter.glade.h:67
-msgid "_Overwrite"
-msgstr "_Flastrañ"
+msgid "Read how to install"
+msgstr "Lenn penaos staliañ"
 
 #: ../data/soundconverter.glade.h:68
-msgid "_Skip"
-msgstr "_Mont e biou"
-
-#: ../data/soundconverter.glade.h:69 ../soundconverter/ui.py:408
-msgid "artist - album"
-msgstr "arzour - albom"
-
-#: ../data/soundconverter.glade.h:70 ../soundconverter/ui.py:406
-msgid "artist/album"
-msgstr "arzour/albom"
+msgid "Where to place results?"
+msgstr "E pelec'h lechiañ ar restroù amdreet?"
+
+#: ../data/soundconverter.glade.h:69
+msgid "SoundConverter"
+msgstr "SoundConverter"
+
+#: ../data/soundconverter.glade.h:70
+msgid "_File"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:71
-msgid "dialog1"
-msgstr "dialog1"
+msgid "_Edit"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:72
-msgid "gst-profile"
+msgid "_Help"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:73
-msgid "track_number - track_title"
-msgstr ""
+msgid "_Add File"
+msgstr "Ouzhpenn_añ ur restr"
 
 #: ../data/soundconverter.glade.h:74
-msgid "track_title"
-msgstr ""
+msgid "Add _Folder"
+msgstr "Ouzhpennañ un _teuliad"
 
-#: ../bin/soundconverter.py:97
+#: ../bin/soundconverter.py:113
 msgid ""
 "Convert in batch mode, from command line, without a graphical user\n"
 " interface. You can use this from, say, shell scripts."
@@ -332,41 +332,41 @@
 "Amdreiñ er mod  batch, diouzh al linenn urzhiañ, hep etrefas\n"
 " grafek. Da implij er skriptoù shell."
 
-#: ../bin/soundconverter.py:102
+#: ../bin/soundconverter.py:118
 msgid ""
-"Show tags for input files instead of convertingthem. This indicates \n"
-" command line batch modeand disables the graphical user interface."
+"Show tags for input files instead of converting them. This indicates \n"
+" command line batch mode and disables the graphical user interface."
 msgstr ""
 
-#: ../bin/soundconverter.py:107
+#: ../bin/soundconverter.py:122
 #, python-format
 msgid ""
-"Set the output MIME type for batch mode. The defaultis %s. Note that you "
-"probably want to set the outputsuffix as well."
+"Set the output MIME type for batch mode. The default is %s. Note that you "
+"probably want to set the output suffix as well."
 msgstr ""
 
-#: ../bin/soundconverter.py:111
+#: ../bin/soundconverter.py:126
 msgid "Be quiet. Don't write normal output, only errors."
 msgstr "Didrouzer. Diskouez fazioù nemetken."
 
-#: ../bin/soundconverter.py:113
-msgid "Print additional debug information"
+#: ../bin/soundconverter.py:128
+msgid "Displays additional debug information"
 msgstr ""
 
-#: ../bin/soundconverter.py:115
+#: ../bin/soundconverter.py:130
 #, python-format
 msgid ""
 "Set the output filename suffix for batch mode.The default is %s . Note that "
-"the suffix does notaffect\n"
+"the suffix does not affect\n"
 " the output MIME type."
 msgstr ""
 
-#: ../bin/soundconverter.py:119
+#: ../bin/soundconverter.py:134
 msgid "Force number of concurrent conversions."
 msgstr ""
 
-#: ../bin/soundconverter.py:121
-msgid "Show GStreamer Options"
+#: ../bin/soundconverter.py:136
+msgid "Shows GStreamer Options"
 msgstr ""
 
 #: ../soundconverter/error.py:37
@@ -421,54 +421,56 @@
 "Fazi : %s\n"
 "%s\n"
 
-#: ../soundconverter/gstreamer.py:482
+#: ../soundconverter/gstreamer.py:189
+msgid "Plugin installation aborted."
+msgstr ""
+
+#. TODO: is this used ?
+#. TODO: add proper error management when an encoder cannot be created
+#: ../soundconverter/gstreamer.py:519
 #, python-format
 msgid "Cannot create a decoder for '%s' format."
 msgstr "N'eus ket tu da grouiñ un diskoder evit ar furmad '%s'."
 
-#: ../soundconverter/gstreamer.py:499
+#: ../soundconverter/gstreamer.py:530
 #, python-format
 msgid "Cannot create '%s' folder."
 msgstr "N'eus ket tu da grouiñ an teuliad :·'%s'."
 
 #. pass
-#: ../soundconverter/gstreamer.py:543
+#: ../soundconverter/gstreamer.py:571
 msgid "GStreamer Error:"
 msgstr ""
 
-#: ../soundconverter/gstreamer.py:627
+#: ../soundconverter/gstreamer.py:656
 msgid "Conversion Canceled"
 msgstr ""
 
-#: ../soundconverter/gstreamer.py:634
+#: ../soundconverter/gstreamer.py:663
 msgid "Conversion Error"
 msgstr ""
 
-#: ../soundconverter/gstreamer.py:667
+#: ../soundconverter/gstreamer.py:696
 #, python-format
 msgid "Access denied: '%s'"
 msgstr ""
 
-#: ../soundconverter/gstreamer.py:683
+#: ../soundconverter/gstreamer.py:712
 msgid "Cannot overwrite source file(s)!"
 msgstr ""
 
-#: ../soundconverter/gstreamer.py:696
+#: ../soundconverter/gstreamer.py:725
 #, python-format
 msgid ""
 "The output file <i>%s</i>\n"
-" exists already.\n"
+" already exists.\n"
 " Do you want to skip the file, overwrite it or cancel the conversion?\n"
 msgstr ""
-"Bez eus c'hoazh ar restr lec'h kas :\n"
-"<i>%s</i> .\n"
-"C'hoant hoc'h eus mont e biou ar restr, skrivañ warnezhañ pe\n"
-"nullañ an amdreiñ ?\n"
 
-#: ../soundconverter/gstreamer.py:800
+#: ../soundconverter/gstreamer.py:830
 #, python-format
-msgid "Conversion done, in %s"
-msgstr "Amdroadur echuet, en %s"
+msgid "Conversion done in %s"
+msgstr ""
 
 #: ../soundconverter/namegenerator.py:76
 msgid "Unknown Album"
@@ -478,22 +480,18 @@
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../soundconverter/namegenerator.py:78
-msgid "Unknown Title"
-msgstr ""
-
 #. traductors: These are the custom filename patterns. Only if it makes sense.
-#: ../soundconverter/settings.py:43
+#: ../soundconverter/settings.py:47
 msgid ""
 "Artist Album Title Track Total Genre Date Year Timestamp DiscNumber "
 "DiscTotal Ext"
 msgstr ""
 
-#: ../soundconverter/settings.py:80
+#: ../soundconverter/settings.py:84
 msgid "All files"
 msgstr ""
 
-#: ../soundconverter/ui.py:123 ../soundconverter/ui.py:139
+#: ../soundconverter/ui.py:96 ../soundconverter/ui.py:112
 #, python-format
 msgid ""
 "\n"
@@ -501,93 +499,97 @@
 "%s\n"
 msgstr ""
 
-#: ../soundconverter/ui.py:229
+#: ../soundconverter/ui.py:202
 msgid "Scanning files..."
 msgstr ""
 
-#: ../soundconverter/ui.py:328
+#: ../soundconverter/ui.py:309
 msgid "Adding files..."
 msgstr ""
 
-#: ../soundconverter/ui.py:396
+#: ../soundconverter/ui.py:377
 msgid "Same as input, but replacing the suffix"
 msgstr "E-giz a ntarzh, oc'h erlec'hiañ al lostger"
 
-#: ../soundconverter/ui.py:398
+#: ../soundconverter/ui.py:379
 msgid "Same as input, but with an additional suffix"
 msgstr "E-giz an tarzh, oc'h ouzhpennañ ul lostger"
 
-#: ../soundconverter/ui.py:399
+#: ../soundconverter/ui.py:380
 msgid "Track number - title"
 msgstr "Niverenn - titl"
 
-#: ../soundconverter/ui.py:400
+#: ../soundconverter/ui.py:381
 msgid "Track title"
 msgstr ""
 
-#: ../soundconverter/ui.py:401
+#: ../soundconverter/ui.py:382
 msgid "Artist - title"
 msgstr "Arzour - titl"
 
-#: ../soundconverter/ui.py:402
+#: ../soundconverter/ui.py:383
 msgid "Custom filename pattern"
 msgstr "Patrom personelaet evit an anvioù restroù"
 
-#: ../soundconverter/ui.py:407
+#: ../soundconverter/ui.py:388
 msgid "artist-album"
 msgstr "arzour-albom"
 
-#: ../soundconverter/ui.py:464
+#: ../soundconverter/ui.py:445
 msgid "Available patterns:"
 msgstr ""
 
-#: ../soundconverter/ui.py:650
+#: ../soundconverter/ui.py:631
 #, python-format
 msgid "Into folder %s"
 msgstr "En teuliad %s"
 
-#: ../soundconverter/ui.py:727
+#: ../soundconverter/ui.py:708
 #, python-format
 msgid "Target bitrate: %s"
 msgstr "Kas binarel al lec'h kas : %s"
 
-#: ../soundconverter/ui.py:1069
+#: ../soundconverter/ui.py:1050
 msgid "Open a file"
 msgstr ""
 
-#: ../soundconverter/ui.py:1163
+#: ../soundconverter/ui.py:1144
 msgid "Add Folder..."
 msgstr "Ouzhpennañ un teuliad..."
 
-#: ../soundconverter/ui.py:1336
+#: ../soundconverter/ui.py:1322
 msgid "Reading tags..."
 msgstr ""
 
-#: ../soundconverter/ui.py:1347
+#: ../soundconverter/ui.py:1324
+msgid "Preparing conversion..."
+msgstr ""
+
+#: ../soundconverter/ui.py:1339
 msgid "Conversion cancelled"
 msgstr ""
 
-#: ../soundconverter/ui.py:1350
+#: ../soundconverter/ui.py:1342
 msgid "Error when converting"
 msgstr ""
 
-#: ../soundconverter/ui.py:1364
+#: ../soundconverter/ui.py:1357
 msgid "Converting"
 msgstr "Oc'h amdreiñ"
 
-#: ../soundconverter/ui.py:1384
+#: ../soundconverter/ui.py:1377
 msgid "Canceled"
 msgstr "Nullet"
 
-#: ../soundconverter/ui.py:1457
+#: ../soundconverter/ui.py:1450
 msgid "Paused"
 msgstr "Ehanet"
 
-#: ../soundconverter/ui.py:1474
+#: ../soundconverter/ui.py:1468
 #, python-format
 msgid "%d:%02d left"
 msgstr "O chom %d:%02d"
 
-#: ../soundconverter/ui.py:1480
+#: ../soundconverter/ui.py:1474
 msgid "Ready"
 msgstr "Prest"

=== modified file 'po/ca.po'
--- po/ca.po	2012-02-22 21:58:39 +0000
+++ po/ca.po	2012-11-21 17:48:22 +0000
@@ -7,365 +7,363 @@
 msgstr ""
 "Project-Id-Version: soundconverter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-12 22:56+0100\n"
-"PO-Revision-Date: 2012-01-13 03:58+0000\n"
-"Last-Translator: GautierPortet <[e-mail]>\n"
+"POT-Creation-Date: 2012-07-30 15:28+0000\n"
+"PO-Revision-Date: 2012-02-21 00:17+0000\n"
+"Last-Translator: Albert Sanchez Lafuente <Unknown>\n"
 "Language-Team: Catalan <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-01-18 21:12+0000\n"
-"X-Generator: Launchpad (build 14681)\n"
+"X-Launchpad-Export-Date: 2012-10-06 15:24+0000\n"
+"X-Generator: Launchpad (build 16061)\n"
 "Language: ca\n"
 
 #: ../data/soundconverter.desktop.in.in.h:1
+msgid "Sound Converter"
+msgstr "Convertidor de so"
+
+#: ../data/soundconverter.desktop.in.in.h:2
 msgid "Audio Format Converter"
 msgstr "Convertidor formats d'àudio"
 
-#: ../data/soundconverter.desktop.in.in.h:2
-msgid "Convert audio files into other formats"
-msgstr "Convertiu fitxers d'àudio a diferents formats"
-
 #: ../data/soundconverter.desktop.in.in.h:3
-msgid "Sound Converter"
-msgstr "Convertidor de so"
+msgid "Converts audio files into other formats"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:1
-msgid "16 bits (default)"
+msgid "GNOME-powered Sound Conversion"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:2
-msgid "32 bits"
+msgid "Website"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:3
-msgid "8 bits (very low quality)"
-msgstr ""
+msgid "dialog1"
+msgstr "diàleg1"
 
 #: ../data/soundconverter.glade.h:4
-msgid "<b>How to name files?</b>"
-msgstr "<b>Com anomenar els fitxers?</b>"
+msgid "Filter "
+msgstr "Filtre "
 
 #: ../data/soundconverter.glade.h:5
-msgid "<b>Type of result?</b>"
-msgstr "<b>Tipus de resultat?</b>"
+msgid "Error"
+msgstr "S'ha produït un error"
 
 #: ../data/soundconverter.glade.h:6
-msgid "<b>Where to place results?</b>"
-msgstr "<b>On situar els resultats?</b>"
+msgid "File exists already"
+msgstr "El fitxer ja existeix"
 
 #: ../data/soundconverter.glade.h:7
+msgid "_Overwrite"
+msgstr "_Sobreescriu"
+
+#: ../data/soundconverter.glade.h:8
+msgid "_Skip"
+msgstr "_Omet"
+
+#: ../data/soundconverter.glade.h:9
 msgid "<big><b>File exists already</b></big>\n"
 msgstr "<big><b>El fitxer ja existeix</b></big>\n"
 
-#: ../data/soundconverter.glade.h:9
-msgid "<i>Example filename:</i>"
-msgstr "<i>Exemple de nom de fitxer:</i>"
-
-#: ../data/soundconverter.glade.h:10
-msgid "AAC"
-msgstr ""
-
 #: ../data/soundconverter.glade.h:11
-msgid "AAC (.m4a)"
-msgstr ""
-
-#: ../data/soundconverter.glade.h:12
-msgid "Add _Folder"
-msgstr "Afegeix una _carpeta"
-
-#: ../data/soundconverter.glade.h:13
-msgid "Average (ABR)"
-msgstr ""
+msgid "_Apply to entire queue"
+msgstr "_Aplicar a tota la cua"
+
+#: ../data/soundconverter.glade.h:12 ../soundconverter/ui.py:387
+msgid "artist/album"
+msgstr "artista/àlbum"
+
+#: ../data/soundconverter.glade.h:13 ../soundconverter/ui.py:389
+msgid "artist - album"
+msgstr "artista - àlbum"
 
 #: ../data/soundconverter.glade.h:14
-msgid "Better (Slower)"
+msgid "Very Low"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:15
-msgid "Bitrate mode:"
-msgstr "Mode de taxa de bits:"
+msgid "Low"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:16
-msgid "Choose..."
-msgstr "Trieu..."
+msgid "Normal"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:17
-msgid "Compression:"
-msgstr "Compressió:"
+msgid "High"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:18
-msgid "Constant (CBR)"
+msgid "Very High"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:19
-msgid "Create subfolders: "
-msgstr "Crea subcarpetes: "
+msgid "Insanely High"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:20
-msgid "Default"
+msgid "8 bits (very low quality)"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:21
-msgid "Delete original file"
-msgstr "Suprimeix el fitxer original"
+msgid "16 bits (default)"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:22
-msgid "Error"
-msgstr "S'ha produït un error"
+msgid "32 bits"
+msgstr "32 bits"
 
 #: ../data/soundconverter.glade.h:23
-msgid "FLAC"
-msgstr "FLAC"
+msgid "Less (Faster)"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:24
-msgid "FLAC Lossless (.flac)"
+msgid "Default"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:25
-msgid "File exists already"
-msgstr "El fitxer ja existeix"
+msgid "Better (Slower)"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:26
-msgid "Filename pattern: "
-msgstr "Patró del nom de fitxer "
+msgid "Constant (CBR)"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:27
-msgid "Filter "
-msgstr "Filtre "
+msgid "Average (ABR)"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:28
-msgid "Force mono output"
-msgstr "Forçar la soritda a mono"
+msgid "Variable (VBR) - Best quality"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:29
-msgid "Format: "
-msgstr "Format: "
+msgid "Ogg Vorbis (.ogg)"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:30
-msgid "GNOME Audio Profile"
+msgid "MP3 (.mp3)"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:31
-msgid "GNOME-powered Sound Conversion"
+msgid "FLAC Lossless (.flac)"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:32
-msgid "High"
+msgid "MS Wave (.wav)"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:33
-msgid "Insanely High"
+msgid "AAC (.m4a)"
 msgstr ""
 
 #: ../data/soundconverter.glade.h:34
-msgid "Into a specified folder"
-msgstr "En una carpeta especificada"
+msgid "GNOME Audio Profile"
+msgstr ""
 
 #: ../data/soundconverter.glade.h:35
-msgid "Less (Faster)"
+msgid "track_number - track_title"
 msgstr ""