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

Proposed by Logan Rosen
Status: Merged
Merged at revision: 31
Proposed branch: lp:~logan/ubuntu/raring/soundconverter/new-upstream
Merge into: lp:ubuntu/raring/soundconverter
Diff against target: 36554 lines (+11364/-9824)
71 files modified
ChangeLog (+151/-0)
INSTALL (+7/-2)
Makefile.in (+83/-33)
NEWS (+48/-0)
aclocal.m4 (+110/-65)
bin/Makefile.in (+52/-11)
bin/soundconverter.py (+55/-22)
configure (+96/-57)
configure.in (+3/-3)
data/Makefile.in (+67/-23)
data/soundconverter.desktop (+30/-50)
data/soundconverter.desktop.in (+1/-1)
data/soundconverter.desktop.in.in (+1/-1)
data/soundconverter.glade (+68/-3)
debian/changelog (+12/-0)
debian/control (+2/-1)
doc/Makefile.in (+60/-15)
doc/soundconverter.1 (+1/-0)
install-sh (+18/-11)
missing (+4/-49)
po/Makefile.in.in (+9/-4)
po/ar.po (+230/-224)
po/bg.po (+209/-206)
po/br.po (+205/-203)
po/ca.po (+215/-211)
po/cs.po (+237/-231)
po/da.po (+205/-203)
po/de.po (+306/-296)
po/el.po (+219/-217)
po/en_AU.po (+226/-230)
po/en_GB.po (+269/-258)
po/eo.po (+213/-215)
po/es.po (+237/-234)
po/et.po (+229/-226)
po/eu.po (+240/-232)
po/fa.po (+174/-168)
po/fi.po (+214/-211)
po/fr.po (+271/-265)
po/fr_CA.po (+609/-0)
po/gl.po (+237/-231)
po/he.po (+205/-202)
po/hi.po (+174/-168)
po/hu.po (+228/-226)
po/it.po (+244/-246)
po/ja.po (+218/-219)
po/ml.po (+162/-156)
po/ms.po (+282/-272)
po/nl.po (+247/-243)
po/pl.po (+286/-268)
po/pt.po (+203/-197)
po/pt_BR.po (+237/-238)
po/ru.po (+273/-265)
po/sk.po (+216/-213)
po/sl.po (+215/-219)
po/sr.po (+289/-277)
po/sr@Latn.po (+205/-199)
po/sr@latin.po (+238/-235)
po/sv.po (+244/-238)
po/te.po (+184/-178)
po/tr.po (+215/-220)
po/uk.po (+205/-202)
po/vi.po (+205/-202)
po/zh_CN.po (+211/-208)
po/zh_TW.po (+243/-237)
py-compile (+33/-18)
soundconverter/Makefile.am (+2/-1)
soundconverter/Makefile.in (+62/-20)
soundconverter/batch.py (+130/-0)
soundconverter/gstreamer.py (+30/-32)
soundconverter/namegenerator.py (+5/-1)
soundconverter/ui.py (+50/-12)
To merge this branch: bzr merge lp:~logan/ubuntu/raring/soundconverter/new-upstream
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+135480@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Charlie_Smotherman (cjsmo) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ChangeLog'
--- ChangeLog 2012-02-22 21:58:39 +0000
+++ ChangeLog 2012-11-21 17:48:22 +0000
@@ -1,3 +1,154 @@
12012-10-07 kassoulet <gautier@soundconverter.org>
2
3 * NEWS, po/fr.po: version 2.0.4
4
52012-10-07 kassoulet <gautier@soundconverter.org>
6
7 * po/ar.po, po/ast.po, po/bg.po, po/br.po, po/ca.po, po/cs.po,
8 po/da.po, po/de.po, po/el.po, po/en_AU.po, po/en_GB.po, po/eo.po,
9 po/es.po, po/et.po, po/eu.po, po/fa.po, po/fi.po, po/fr.po,
10 po/fr_CA.po, po/gl.po, po/he.po, po/hi.po, po/hu.po, po/it.po,
11 po/ja.po, po/ko.po, po/lv.po, po/ml.po, po/ms.po, po/nl.po,
12 po/pl.po, po/pt.po, po/pt_BR.po, po/ru.po, po/sk.po, po/sl.po,
13 po/soundconverter.pot, po/sr.po, po/sr@Latn.po, po/sr@latin.po,
14 po/sv.po, po/te.po, po/tr.po, po/uk.po, po/vi.po, po/zh_CN.po,
15 po/zh_TW.po: Update translations.
16
172012-10-06 kassoulet <gautier@soundconverter.org>
18
19 * bin/soundconverter.py: Finally fix the setlocale problem.
20
212012-10-06 kassoulet <gautier@soundconverter.org>
22
23 * soundconverter/ui.py: Fix typo with opus-bitrate setting.
24
252012-10-06 kassoulet <gautier@soundconverter.org>
26
27 * configure.in: upgrade configure.in
28
292012-10-06 kassoulet <gautier@soundconverter.org>
30
31 * soundconverter/ui.py: Add Opus quality settings
32
332012-10-04 kassoulet <gautier@soundconverter.org>
34
35 * soundconverter/gstreamer.py: Support for Opus codec.
36
372012-10-04 kassoulet <gautier@soundconverter.org>
38
39 * data/soundconverter.glade, soundconverter/gstreamer.py,
40 soundconverter/ui.py: UI additions for opus support.
41
422012-07-30 kassoulet <gautier@soundconverter.org>
43
44 * soundconverter/gstreamer.py: Remove profile setting from faac
45 encoding, since it seems that some gstreamer instalations don't
46 support this. Closes lp:954555, thanks Patrick and zebul666.
47
482012-06-29 kassoulet <gautier@soundconverter.org>
49
50 * soundconverter/ui.py: Fix crash with folderchooser. Closes
51 fedora:836338, thanks Michael.
52
532012-05-20 kassoulet <gautier@soundconverter.org>
54
55 * bin/soundconverter.py: Handle exceptions with setlocale. Closes
56 lp:1001347, thanks Edward.
57
582012-05-13 kassoulet <gautier@soundconverter.org>
59
60 * soundconverter/ui.py: Use parent folder as base path when only one
61 folder is passed to add_uris. Closes lp:998371, thank Bastian.
62
632012-05-10 kassoulet <gautier@soundconverter.org>
64
65 * bin/soundconverter.py, doc/soundconverter.1,
66 soundconverter/gstreamer.py, soundconverter/ui.py: Fix arguments
67 parsing so -m and -s work. Closes lp:988262, thanks Michael. Add missing default encoding parameters so batch mode stops
68 crashing. Closes lp:995862, thanks Michael.
69
702012-04-29 kassoulet <gautier@soundconverter.org>
71
72 * bin/soundconverter.py, soundconverter/gstreamer.py,
73 soundconverter/ui.py: Finalize batch mode. No more message dialogs
74 in gtreamer.py + notification failback.
75
762012-04-27 kassoulet <gautier@soundconverter.org>
77
78 * bin/soundconverter.py: Fix batch mode failback.
79
802012-04-27 kassoulet <gautier@soundconverter.org>
81
82 * bin/soundconverter.py, soundconverter/Makefile.am,
83 soundconverter/batch.py, soundconverter/gstreamer.py: WIP batch mode
84 fix.
85
862012-04-27 kassoulet <gautier@soundconverter.org>
87
88 * bin/soundconverter.py: change error message when importing a not
89 supported version version of pygtk.
90
912012-04-23 kassoulet <gautier@soundconverter.org>
92
93 * NEWS: Version 2.0.3
94
952012-04-19 kassoulet <gautier@soundconverter.org>
96
97 * soundconverter/gstreamer.py: Increase lowpass frequency to 20KHz
98 when encoding to high quality mp3. Fix lp:881413, thanks Michael.
99
1002012-04-18 kassoulet <gautier@soundconverter.org>
101
102 * po/Makefile.in.in, po/ar.po, po/ast.po, po/bg.po, po/br.po,
103 po/ca.po, po/cs.po, po/da.po, po/de.po, po/el.po, po/en_AU.po,
104 po/en_GB.po, po/eo.po, po/es.po, po/et.po, po/eu.po, po/fa.po,
105 po/fi.po, po/fr.po, po/fr_CA.po, po/gl.po, po/he.po, po/hi.po,
106 po/hu.po, po/it.po, po/ja.po, po/ko.po, po/lv.po, po/ml.po,
107 po/ms.po, po/nl.po, po/pl.po, po/pt.po, po/pt_BR.po, po/ru.po,
108 po/sk.po, po/sl.po, po/soundconverter.pot, po/sr.po, po/sr@Latn.po,
109 po/sr@latin.po, po/sv.po, po/te.po, po/tr.po, po/uk.po, po/vi.po,
110 po/zh_CN.po, po/zh_TW.po: Update translations.
111
1122012-04-18 kassoulet <gautier@soundconverter.org>
113
114 * soundconverter/namegenerator.py: Use the original filename as a
115 title by default, so filename generation works even if there are no
116 tags. fix lp:984790
117
1182012-04-18 kassoulet <gautier@soundconverter.org>
119
120 * soundconverter/ui.py: pulse_progress can be at 0, disabling
121 progress while it was in fact used.
122
1232012-04-03 kassoulet <gautier@soundconverter.org>
124
125 * soundconverter/namegenerator.py: Disable common root handling when
126 we are creating folder using tags. (thanks Eric, closes #972158)
127
1282012-03-19 kassoulet <gautier@soundconverter.org>
129
130 * configure.in, soundconverter/gstreamer.py, soundconverter/ui.py:
131 Fix row progress.
132
1332012-02-27 kassoulet <gautier@soundconverter.org>
134
135 * soundconverter/ui.py: Fix progress-related blocking by speeding up
136 the progress update. Closes #940648, thanks Ben.
137
1382012-02-22 kassoulet <gautier@soundconverter.org>
139
140 * INSTALL: Remove INSTALL file as it's generated.
141
1422012-02-22 kassoulet <gautier@soundconverter.org>
143
144 * configure.in, po/fr_CA.po: Add canadian french.
145
1462012-02-21 kassoulet <gautier@soundconverter.org>
147
148 * bin/soundconverter.py, data/soundconverter.desktop.in.in,
149 data/soundconverter.glade, soundconverter/gstreamer.py: Fix many
150 English spelling errors. (Thanks Alain-Olivier)
151
12012-01-30 kassoulet <gautier@soundconverter.org>1522012-01-30 kassoulet <gautier@soundconverter.org>
2153
3 * NEWS, configure.in: readying 2.0.1154 * NEWS, configure.in: readying 2.0.1
4155
=== modified file 'INSTALL'
--- INSTALL 2011-11-26 12:14:13 +0000
+++ INSTALL 2012-11-21 17:48:22 +0000
@@ -1,8 +1,8 @@
1Installation Instructions1Installation Instructions
2*************************2*************************
33
4Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,4Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
52006, 2007, 2008, 2009 Free Software Foundation, Inc.5Inc.
66
7 Copying and distribution of this file, with or without modification,7 Copying and distribution of this file, with or without modification,
8are permitted in any medium without royalty provided the copyright8are permitted in any medium without royalty provided the copyright
@@ -226,6 +226,11 @@
226226
227and if that doesn't work, install pre-built binaries of GCC for HP-UX.227and if that doesn't work, install pre-built binaries of GCC for HP-UX.
228228
229 HP-UX `make' updates targets which have the same time stamps as
230their prerequisites, which makes it generally unusable when shipped
231generated files such as `configure' are involved. Use GNU `make'
232instead.
233
229 On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot234 On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
230parse its `<wchar.h>' header file. The option `-nodtk' can be used as235parse its `<wchar.h>' header file. The option `-nodtk' can be used as
231a workaround. If GNU CC is not installed, it is therefore recommended236a workaround. If GNU CC is not installed, it is therefore recommended
232237
=== 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 @@
1# Makefile.in generated by automake 1.11.1 from Makefile.am.1# Makefile.in generated by automake 1.11.6 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,5# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6# Inc.6# Foundation, Inc.
7# This Makefile.in is free software; the Free Software Foundation7# This Makefile.in is free software; the Free Software Foundation
8# gives unlimited permission to copy and/or distribute it,8# gives unlimited permission to copy and/or distribute it,
9# with or without modifications, as long as this notice is preserved.9# with or without modifications, as long as this notice is preserved.
@@ -15,6 +15,23 @@
1515
16@SET_MAKE@16@SET_MAKE@
17VPATH = @srcdir@17VPATH = @srcdir@
18am__make_dryrun = \
19 { \
20 am__dry=no; \
21 case $$MAKEFLAGS in \
22 *\\[\ \ ]*) \
23 echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
24 | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
25 *) \
26 for am__flg in $$MAKEFLAGS; do \
27 case $$am__flg in \
28 *=*|--*) ;; \
29 *n*) am__dry=yes; break;; \
30 esac; \
31 done;; \
32 esac; \
33 test $$am__dry = yes; \
34 }
18pkgdatadir = $(datadir)/@PACKAGE@35pkgdatadir = $(datadir)/@PACKAGE@
19pkgincludedir = $(includedir)/@PACKAGE@36pkgincludedir = $(includedir)/@PACKAGE@
20pkglibdir = $(libdir)/@PACKAGE@37pkglibdir = $(libdir)/@PACKAGE@
@@ -54,6 +71,11 @@
54 install-pdf-recursive install-ps-recursive install-recursive \71 install-pdf-recursive install-ps-recursive install-recursive \
55 installcheck-recursive installdirs-recursive pdf-recursive \72 installcheck-recursive installdirs-recursive pdf-recursive \
56 ps-recursive uninstall-recursive73 ps-recursive uninstall-recursive
74am__can_run_installinfo = \
75 case $$AM_UPDATE_INFO_DIR in \
76 n|no|NO) false;; \
77 *) (install-info --version) >/dev/null 2>&1;; \
78 esac
57RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \79RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
58 distclean-recursive maintainer-clean-recursive80 distclean-recursive maintainer-clean-recursive
59AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \81AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -66,9 +88,11 @@
66distdir = $(PACKAGE)-$(VERSION)88distdir = $(PACKAGE)-$(VERSION)
67top_distdir = $(distdir)89top_distdir = $(distdir)
68am__remove_distdir = \90am__remove_distdir = \
69 { test ! -d "$(distdir)" \91 if test -d "$(distdir)"; then \
70 || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \92 find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
71 && rm -fr "$(distdir)"; }; }93 && rm -rf "$(distdir)" \
94 || { sleep 5 && rm -rf "$(distdir)"; }; \
95 else :; fi
72am__relativize = \96am__relativize = \
73 dir0=`pwd`; \97 dir0=`pwd`; \
74 sed_first='s,^\([^/]*\)/.*$$,\1,'; \98 sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -97,10 +121,13 @@
97GZIP_ENV = --best121GZIP_ENV = --best
98DIST_ARCHIVES = $(distdir).tar.xz122DIST_ARCHIVES = $(distdir).tar.xz
99distuninstallcheck_listfiles = find . -type f -print123distuninstallcheck_listfiles = find . -type f -print
124am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
125 | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
100distcleancheck_listfiles = find . -type f -print126distcleancheck_listfiles = find . -type f -print
101ACLOCAL = @ACLOCAL@127ACLOCAL = @ACLOCAL@
102ALL_LINGUAS = @ALL_LINGUAS@128ALL_LINGUAS = @ALL_LINGUAS@
103AMTAR = @AMTAR@129AMTAR = @AMTAR@
130AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
104AUTOCONF = @AUTOCONF@131AUTOCONF = @AUTOCONF@
105AUTOHEADER = @AUTOHEADER@132AUTOHEADER = @AUTOHEADER@
106AUTOMAKE = @AUTOMAKE@133AUTOMAKE = @AUTOMAKE@
@@ -136,6 +163,10 @@
136INTLTOOL_MERGE = @INTLTOOL_MERGE@163INTLTOOL_MERGE = @INTLTOOL_MERGE@
137INTLTOOL_PERL = @INTLTOOL_PERL@164INTLTOOL_PERL = @INTLTOOL_PERL@
138INTLTOOL_UPDATE = @INTLTOOL_UPDATE@165INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
166INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
167INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
168INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
169INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
139LDFLAGS = @LDFLAGS@170LDFLAGS = @LDFLAGS@
140LIBOBJS = @LIBOBJS@171LIBOBJS = @LIBOBJS@
141LIBS = @LIBS@172LIBS = @LIBS@
@@ -193,6 +224,8 @@
193includedir = @includedir@224includedir = @includedir@
194infodir = @infodir@225infodir = @infodir@
195install_sh = @install_sh@226install_sh = @install_sh@
227intltool__v_merge_options_ = @intltool__v_merge_options_@
228intltool__v_merge_options_0 = @intltool__v_merge_options_0@
196libdir = @libdir@229libdir = @libdir@
197libexecdir = @libexecdir@230libexecdir = @libexecdir@
198localedir = @localedir@231localedir = @localedir@
@@ -224,7 +257,7 @@
224all: all-recursive257all: all-recursive
225258
226.SUFFIXES:259.SUFFIXES:
227am--refresh:260am--refresh: Makefile
228 @:261 @:
229$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)262$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
230 @for dep in $?; do \263 @for dep in $?; do \
@@ -428,13 +461,10 @@
428 done461 done
429 @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \462 @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
430 if test "$$subdir" = .; then :; else \463 if test "$$subdir" = .; then :; else \
431 test -d "$(distdir)/$$subdir" \464 $(am__make_dryrun) \
432 || $(MKDIR_P) "$(distdir)/$$subdir" \465 || test -d "$(distdir)/$$subdir" \
433 || exit 1; \466 || $(MKDIR_P) "$(distdir)/$$subdir" \
434 fi; \467 || exit 1; \
435 done
436 @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
437 if test "$$subdir" = .; then :; else \
438 dir1=$$subdir; dir2="$(distdir)/$$subdir"; \468 dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
439 $(am__relativize); \469 $(am__relativize); \
440 new_distdir=$$reldir; \470 new_distdir=$$reldir; \
@@ -466,14 +496,18 @@
466 $(am__remove_distdir)496 $(am__remove_distdir)
467497
468dist-bzip2: distdir498dist-bzip2: distdir
469 tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2499 tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
500 $(am__remove_distdir)
501
502dist-lzip: distdir
503 tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
470 $(am__remove_distdir)504 $(am__remove_distdir)
471505
472dist-lzma: distdir506dist-lzma: distdir
473 tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma507 tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
474 $(am__remove_distdir)508 $(am__remove_distdir)
475dist-xz: distdir509dist-xz: distdir
476 tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz510 tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
477 $(am__remove_distdir)511 $(am__remove_distdir)
478512
479dist-tarZ: distdir513dist-tarZ: distdir
@@ -490,7 +524,7 @@
490 $(am__remove_distdir)524 $(am__remove_distdir)
491525
492dist dist-all: distdir526dist dist-all: distdir
493 tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz527 tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
494 $(am__remove_distdir)528 $(am__remove_distdir)
495529
496# This target untars the dist file and tries a VPATH configuration. Then530# This target untars the dist file and tries a VPATH configuration. Then
@@ -504,6 +538,8 @@
504 bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\538 bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
505 *.tar.lzma*) \539 *.tar.lzma*) \
506 lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\540 lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
541 *.tar.lz*) \
542 lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
507 *.tar.xz*) \543 *.tar.xz*) \
508 xz -dc $(distdir).tar.xz | $(am__untar) ;;\544 xz -dc $(distdir).tar.xz | $(am__untar) ;;\
509 *.tar.Z*) \545 *.tar.Z*) \
@@ -513,7 +549,7 @@
513 *.zip*) \549 *.zip*) \
514 unzip $(distdir).zip ;;\550 unzip $(distdir).zip ;;\
515 esac551 esac
516 chmod -R a-w $(distdir); chmod a+w $(distdir)552 chmod -R a-w $(distdir); chmod u+w $(distdir)
517 mkdir $(distdir)/_build553 mkdir $(distdir)/_build
518 mkdir $(distdir)/_inst554 mkdir $(distdir)/_inst
519 chmod a-w $(distdir)555 chmod a-w $(distdir)
@@ -523,6 +559,7 @@
523 && am__cwd=`pwd` \559 && am__cwd=`pwd` \
524 && $(am__cd) $(distdir)/_build \560 && $(am__cd) $(distdir)/_build \
525 && ../configure --srcdir=.. --prefix="$$dc_install_base" \561 && ../configure --srcdir=.. --prefix="$$dc_install_base" \
562 $(AM_DISTCHECK_CONFIGURE_FLAGS) \
526 $(DISTCHECK_CONFIGURE_FLAGS) \563 $(DISTCHECK_CONFIGURE_FLAGS) \
527 && $(MAKE) $(AM_MAKEFLAGS) \564 && $(MAKE) $(AM_MAKEFLAGS) \
528 && $(MAKE) $(AM_MAKEFLAGS) dvi \565 && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -551,8 +588,16 @@
551 list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \588 list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
552 sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'589 sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
553distuninstallcheck:590distuninstallcheck:
554 @$(am__cd) '$(distuninstallcheck_dir)' \591 @test -n '$(distuninstallcheck_dir)' || { \
555 && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \592 echo 'ERROR: trying to run $@ with an empty' \
593 '$$(distuninstallcheck_dir)' >&2; \
594 exit 1; \
595 }; \
596 $(am__cd) '$(distuninstallcheck_dir)' || { \
597 echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
598 exit 1; \
599 }; \
600 test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
556 || { echo "ERROR: files left after uninstall:" ; \601 || { echo "ERROR: files left after uninstall:" ; \
557 if test -n "$(DESTDIR)"; then \602 if test -n "$(DESTDIR)"; then \
558 echo " (check DESTDIR support)"; \603 echo " (check DESTDIR support)"; \
@@ -583,10 +628,15 @@
583628
584installcheck: installcheck-recursive629installcheck: installcheck-recursive
585install-strip:630install-strip:
586 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \631 if test -z '$(STRIP)'; then \
587 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \632 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
588 `test -z '$(STRIP)' || \633 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
589 echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install634 install; \
635 else \
636 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
637 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
638 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
639 fi
590mostlyclean-generic:640mostlyclean-generic:
591641
592clean-generic:642clean-generic:
@@ -675,15 +725,15 @@
675.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \725.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
676 all all-am am--refresh check check-am clean clean-generic \726 all all-am am--refresh check check-am clean clean-generic \
677 ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \727 ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
678 dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \728 dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
679 distclean distclean-generic distclean-tags distcleancheck \729 distcheck distclean distclean-generic distclean-tags \
680 distdir distuninstallcheck dvi dvi-am html html-am info \730 distcleancheck distdir distuninstallcheck dvi dvi-am html \
681 info-am install install-am install-data install-data-am \731 html-am info info-am install install-am install-data \
682 install-dvi install-dvi-am install-exec install-exec-am \732 install-data-am install-dvi install-dvi-am install-exec \
683 install-html install-html-am install-info install-info-am \733 install-exec-am install-html install-html-am install-info \
684 install-man install-pdf install-pdf-am install-ps \734 install-info-am install-man install-pdf install-pdf-am \
685 install-ps-am install-strip installcheck installcheck-am \735 install-ps install-ps-am install-strip installcheck \
686 installdirs installdirs-am maintainer-clean \736 installcheck-am installdirs installdirs-am maintainer-clean \
687 maintainer-clean-generic mostlyclean mostlyclean-generic pdf \737 maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
688 pdf-am ps ps-am tags tags-recursive uninstall uninstall-am738 pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
689739
690740
=== modified file 'NEWS'
--- NEWS 2012-02-22 21:58:39 +0000
+++ NEWS 2012-11-21 17:48:22 +0000
@@ -1,4 +1,52 @@
11
2Version 2.0.4
3=============
4
5Add support for Opus codec (http://www.opus-codec.org/)
6
7Fix command line arguments parsing.
8(Closes lp:995862, thanks Michael)
9
10Fix problem with AAC settings.
11(closes lp:954555, thanks Patrick and zebul666)
12
13Fix crash in FolderChooser.
14(Closes fedora:836338, thanks Michael)
15
16Fix yet another problem with URIs handling.
17(Closes lp:998371, thanks Bastian)
18
19
20Version 2.0.3
21=============
22
23Fix stability and progress related problems.
24
25Disable common path when creating folders using tags.
26(Closes lp:972158, thanks Eric)
27
28Increase Low pass filter frequency when converting to MP3.
29(Closes lp:881413, thanks Michael)
30
31Use original filename as title when tags are not present.
32(Closes lp:984790)
33
34Update Translations.
35
36
37Version 2.0.2
38=============
39
40Fix progress-related blocking by speeding up the progress update.
41(Closes lp:940648, thanks Ben)
42
43Add canadian french.
44(Thanks Alain-Olivier)
45
46Fix many English spelling errors.
47(Thanks Alain-Olivier)
48
49
2Version 2.0.150Version 2.0.1
3=============51=============
452
553
=== 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 @@
1# generated automatically by aclocal 1.11.1 -*- Autoconf -*-1# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
22
3# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,3# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.4# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
5# Inc.
5# This file is free software; the Free Software Foundation6# This file is free software; the Free Software Foundation
6# gives unlimited permission to copy and/or distribute it,7# gives unlimited permission to copy and/or distribute it,
7# with or without modifications, as long as this notice is preserved.8# with or without modifications, as long as this notice is preserved.
@@ -260,6 +261,10 @@
260 [CATOBJEXT=.mo261 [CATOBJEXT=.mo
261 DATADIRNAME=lib])262 DATADIRNAME=lib])
262 ;;263 ;;
264 *-*-openbsd*)
265 CATOBJEXT=.mo
266 DATADIRNAME=share
267 ;;
263 *)268 *)
264 CATOBJEXT=.mo269 CATOBJEXT=.mo
265 DATADIRNAME=lib270 DATADIRNAME=lib
@@ -454,7 +459,7 @@
454459
455460
456dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])461dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
457# serial 40 IT_PROG_INTLTOOL462# serial 42 IT_PROG_INTLTOOL
458AC_DEFUN([IT_PROG_INTLTOOL], [463AC_DEFUN([IT_PROG_INTLTOOL], [
459AC_PREREQ([2.50])dnl464AC_PREREQ([2.50])dnl
460AC_REQUIRE([AM_NLS])dnl465AC_REQUIRE([AM_NLS])dnl
@@ -467,13 +472,11 @@
467 ;;472 ;;
468esac473esac
469474
475INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
476INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
477INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
470if test -n "$1"; then478if test -n "$1"; then
471 AC_MSG_CHECKING([for intltool >= $1])479 AC_MSG_CHECKING([for intltool >= $1])
472
473 INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
474 INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
475 [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
476 ]
477 AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])480 AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
478 test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||481 test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
479 AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])482 AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
@@ -486,25 +489,48 @@
486 AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])489 AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
487fi490fi
488491
489 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 $< [$]@' 492if test -z "$AM_DEFAULT_VERBOSITY"; then
490INTLTOOL_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 $< [$]@' 493 AM_DEFAULT_VERBOSITY=1
491 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 $< [$]@' 494fi
492 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 $< [$]@' 495AC_SUBST([AM_DEFAULT_VERBOSITY])
493 INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'496
494 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 $< [$]@' 497INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
495 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 $< [$]@' 498INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
496 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 $< [$]@' 499INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;'
497INTLTOOL_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 $< [$]@' 500AC_SUBST(INTLTOOL_V_MERGE)
498 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 $< [$]@' 501AC_SUBST(INTLTOOL__v_MERGE_)
499 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 $< [$]@' 502AC_SUBST(INTLTOOL__v_MERGE_0)
500 INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 503
501 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 $< [$]@' 504INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
502 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 $< [$]@' 505intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
503 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 $< [$]@' 506intltool__v_merge_options_0='-q'
504 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 $< [$]@' 507AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
505 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 $< [$]@' 508AC_SUBST(intltool__v_merge_options_)
506 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 $< [$]@'509AC_SUBST(intltool__v_merge_options_0)
507 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 $< [$]@'510
511 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 $< [$]@'
512INTLTOOL_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 $< [$]@'
513 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 $< [$]@'
514 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 $< [$]@'
515 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 $< [$]@'
516 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 $< [$]@'
517 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 $< [$]@'
518 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 $< [$]@'
519INTLTOOL_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 $< [$]@'
520 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 $< [$]@'
521 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 $< [$]@'
522if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
523 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 $< [$]@'
524else
525 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'
526fi
527 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 $< [$]@'
528 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 $< [$]@'
529 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 $< [$]@'
530 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 $< [$]@'
531 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 $< [$]@'
532 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 $< [$]@'
533 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 $< [$]@'
508534
509_IT_SUBST(INTLTOOL_DESKTOP_RULE)535_IT_SUBST(INTLTOOL_DESKTOP_RULE)
510_IT_SUBST(INTLTOOL_DIRECTORY_RULE)536_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
@@ -550,7 +576,7 @@
550if test $? -ne 0; then576if test $? -ne 0; then
551 AC_MSG_ERROR([perl 5.8.1 is required for intltool])577 AC_MSG_ERROR([perl 5.8.1 is required for intltool])
552else578else
553 IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"579 IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
554 AC_MSG_RESULT([$IT_PERL_VERSION])580 AC_MSG_RESULT([$IT_PERL_VERSION])
555fi581fi
556if test "x$2" != "xno-xml"; then582if test "x$2" != "xno-xml"; then
@@ -679,12 +705,15 @@
679 AC_SUBST([USE_NLS])705 AC_SUBST([USE_NLS])
680])706])
681707
682# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.708# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
709# Foundation, Inc.
683#710#
684# This file is free software; the Free Software Foundation711# This file is free software; the Free Software Foundation
685# gives unlimited permission to copy and/or distribute it,712# gives unlimited permission to copy and/or distribute it,
686# with or without modifications, as long as this notice is preserved.713# with or without modifications, as long as this notice is preserved.
687714
715# serial 1
716
688# AM_AUTOMAKE_VERSION(VERSION)717# AM_AUTOMAKE_VERSION(VERSION)
689# ----------------------------718# ----------------------------
690# Automake X.Y traces this macro to ensure aclocal.m4 has been719# Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -694,7 +723,7 @@
694[am__api_version='1.11'723[am__api_version='1.11'
695dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to724dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
696dnl require some minimum version. Point them to the right macro.725dnl require some minimum version. Point them to the right macro.
697m4_if([$1], [1.11.1], [],726m4_if([$1], [1.11.6], [],
698 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl727 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
699])728])
700729
@@ -710,19 +739,21 @@
710# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.739# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
711# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.740# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
712AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],741AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
713[AM_AUTOMAKE_VERSION([1.11.1])dnl742[AM_AUTOMAKE_VERSION([1.11.6])dnl
714m4_ifndef([AC_AUTOCONF_VERSION],743m4_ifndef([AC_AUTOCONF_VERSION],
715 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl744 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
716_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])745_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
717746
718# AM_AUX_DIR_EXPAND -*- Autoconf -*-747# AM_AUX_DIR_EXPAND -*- Autoconf -*-
719748
720# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.749# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
721#750#
722# This file is free software; the Free Software Foundation751# This file is free software; the Free Software Foundation
723# gives unlimited permission to copy and/or distribute it,752# gives unlimited permission to copy and/or distribute it,
724# with or without modifications, as long as this notice is preserved.753# with or without modifications, as long as this notice is preserved.
725754
755# serial 1
756
726# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets757# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
727# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to758# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
728# `$srcdir', `$srcdir/..', or `$srcdir/../..'.759# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -804,14 +835,14 @@
804Usually this means the macro was only invoked conditionally.]])835Usually this means the macro was only invoked conditionally.]])
805fi])])836fi])])
806837
807# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009838# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
808# Free Software Foundation, Inc.839# 2010, 2011 Free Software Foundation, Inc.
809#840#
810# This file is free software; the Free Software Foundation841# This file is free software; the Free Software Foundation
811# gives unlimited permission to copy and/or distribute it,842# gives unlimited permission to copy and/or distribute it,
812# with or without modifications, as long as this notice is preserved.843# with or without modifications, as long as this notice is preserved.
813844
814# serial 10845# serial 12
815846
816# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be847# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
817# written in clear, in which case automake, when reading aclocal.m4,848# written in clear, in which case automake, when reading aclocal.m4,
@@ -851,6 +882,7 @@
851 # instance it was reported that on HP-UX the gcc test will end up882 # instance it was reported that on HP-UX the gcc test will end up
852 # making a dummy file named `D' -- because `-MD' means `put the output883 # making a dummy file named `D' -- because `-MD' means `put the output
853 # in D'.884 # in D'.
885 rm -rf conftest.dir
854 mkdir conftest.dir886 mkdir conftest.dir
855 # Copy depcomp to subdir because otherwise we won't find it if we're887 # Copy depcomp to subdir because otherwise we won't find it if we're
856 # using a relative directory.888 # using a relative directory.
@@ -915,7 +947,7 @@
915 break947 break
916 fi948 fi
917 ;;949 ;;
918 msvisualcpp | msvcmsys)950 msvc7 | msvc7msys | msvisualcpp | msvcmsys)
919 # This compiler won't grok `-c -o', but also, the minuso test has951 # This compiler won't grok `-c -o', but also, the minuso test has
920 # not run yet. These depmodes are late enough in the game, and952 # not run yet. These depmodes are late enough in the game, and
921 # so weak that their functioning should not be impacted.953 # so weak that their functioning should not be impacted.
@@ -980,10 +1012,13 @@
980if test "x$enable_dependency_tracking" != xno; then1012if test "x$enable_dependency_tracking" != xno; then
981 am_depcomp="$ac_aux_dir/depcomp"1013 am_depcomp="$ac_aux_dir/depcomp"
982 AMDEPBACKSLASH='\'1014 AMDEPBACKSLASH='\'
1015 am__nodep='_no'
983fi1016fi
984AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])1017AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
985AC_SUBST([AMDEPBACKSLASH])dnl1018AC_SUBST([AMDEPBACKSLASH])dnl
986_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl1019_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
1020AC_SUBST([am__nodep])dnl
1021_AM_SUBST_NOTMAKE([am__nodep])dnl
987])1022])
9881023
989# Generate code to set up dependency tracking. -*- Autoconf -*-1024# Generate code to set up dependency tracking. -*- Autoconf -*-
@@ -1205,12 +1240,15 @@
1205done1240done
1206echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])1241echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
12071242
1208# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.1243# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
1244# Inc.
1209#1245#
1210# This file is free software; the Free Software Foundation1246# This file is free software; the Free Software Foundation
1211# gives unlimited permission to copy and/or distribute it,1247# gives unlimited permission to copy and/or distribute it,
1212# with or without modifications, as long as this notice is preserved.1248# with or without modifications, as long as this notice is preserved.
12131249
1250# serial 1
1251
1214# AM_PROG_INSTALL_SH1252# AM_PROG_INSTALL_SH
1215# ------------------1253# ------------------
1216# Define $install_sh.1254# Define $install_sh.
@@ -1342,12 +1380,15 @@
1342fi1380fi
1343])1381])
13441382
1345# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.1383# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
1384# Inc.
1346#1385#
1347# This file is free software; the Free Software Foundation1386# This file is free software; the Free Software Foundation
1348# gives unlimited permission to copy and/or distribute it,1387# gives unlimited permission to copy and/or distribute it,
1349# with or without modifications, as long as this notice is preserved.1388# with or without modifications, as long as this notice is preserved.
13501389
1390# serial 1
1391
1351# AM_PROG_MKDIR_P1392# AM_PROG_MKDIR_P
1352# ---------------1393# ---------------
1353# Check for `mkdir -p'.1394# Check for `mkdir -p'.
@@ -1370,13 +1411,14 @@
13701411
1371# Helper functions for option handling. -*- Autoconf -*-1412# Helper functions for option handling. -*- Autoconf -*-
13721413
1373# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.1414# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
1415# Foundation, Inc.
1374#1416#
1375# This file is free software; the Free Software Foundation1417# This file is free software; the Free Software Foundation
1376# gives unlimited permission to copy and/or distribute it,1418# gives unlimited permission to copy and/or distribute it,
1377# with or without modifications, as long as this notice is preserved.1419# with or without modifications, as long as this notice is preserved.
13781420
1379# serial 41421# serial 5
13801422
1381# _AM_MANGLE_OPTION(NAME)1423# _AM_MANGLE_OPTION(NAME)
1382# -----------------------1424# -----------------------
@@ -1384,13 +1426,13 @@
1384[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])1426[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
13851427
1386# _AM_SET_OPTION(NAME)1428# _AM_SET_OPTION(NAME)
1387# ------------------------------1429# --------------------
1388# Set option NAME. Presently that only means defining a flag for this option.1430# Set option NAME. Presently that only means defining a flag for this option.
1389AC_DEFUN([_AM_SET_OPTION],1431AC_DEFUN([_AM_SET_OPTION],
1390[m4_define(_AM_MANGLE_OPTION([$1]), 1)])1432[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
13911433
1392# _AM_SET_OPTIONS(OPTIONS)1434# _AM_SET_OPTIONS(OPTIONS)
1393# ----------------------------------1435# ------------------------
1394# OPTIONS is a space-separated list of Automake options.1436# OPTIONS is a space-separated list of Automake options.
1395AC_DEFUN([_AM_SET_OPTIONS],1437AC_DEFUN([_AM_SET_OPTIONS],
1396[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])1438[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -1401,13 +1443,15 @@
1401AC_DEFUN([_AM_IF_OPTION],1443AC_DEFUN([_AM_IF_OPTION],
1402[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])1444[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
14031445
1404# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 20091446# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009,
1405# Free Software Foundation, Inc.1447# 2011 Free Software Foundation, Inc.
1406#1448#
1407# This file is free software; the Free Software Foundation1449# This file is free software; the Free Software Foundation
1408# gives unlimited permission to copy and/or distribute it,1450# gives unlimited permission to copy and/or distribute it,
1409# with or without modifications, as long as this notice is preserved.1451# with or without modifications, as long as this notice is preserved.
14101452
1453# serial 2
1454
1411# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])1455# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
1412# ---------------------------------------------------------------------------1456# ---------------------------------------------------------------------------
1413# Adds support for distributing Python modules and packages. To1457# Adds support for distributing Python modules and packages. To
@@ -1435,8 +1479,10 @@
1435 dnl Find a Python interpreter. Python versions prior to 2.0 are not1479 dnl Find a Python interpreter. Python versions prior to 2.0 are not
1436 dnl supported. (2.0 was released on October 16, 2000).1480 dnl supported. (2.0 was released on October 16, 2000).
1437 m4_define_default([_AM_PYTHON_INTERPRETER_LIST],1481 m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
1438 [python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl1482[python python2 python3 python3.2 python3.1 python3.0 python2.7 dnl
1439python2.1 python2.0])1483 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0])
1484
1485 AC_ARG_VAR([PYTHON], [the Python interpreter])
14401486
1441 m4_if([$1],[],[1487 m4_if([$1],[],[
1442 dnl No version check is needed.1488 dnl No version check is needed.
@@ -1508,9 +1554,7 @@
1508 dnl site-packages directory, not the python standard library1554 dnl site-packages directory, not the python standard library
1509 dnl directory like in previous automake betas. This behavior1555 dnl directory like in previous automake betas. This behavior
1510 dnl is more consistent with lispdir.m4 for example.1556 dnl is more consistent with lispdir.m4 for example.
1511 dnl Query distutils for this directory. distutils does not exist in1557 dnl Query distutils for this directory.
1512 dnl Python 1.5, so we fall back to the hardcoded directory if it
1513 dnl doesn't work.
1514 AC_CACHE_CHECK([for $am_display_PYTHON script directory],1558 AC_CACHE_CHECK([for $am_display_PYTHON script directory],
1515 [am_cv_python_pythondir],1559 [am_cv_python_pythondir],
1516 [if test "x$prefix" = xNONE1560 [if test "x$prefix" = xNONE
@@ -1519,8 +1563,7 @@
1519 else1563 else
1520 am_py_prefix=$prefix1564 am_py_prefix=$prefix
1521 fi1565 fi
1522 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 ||1566 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`
1523 echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
1524 case $am_cv_python_pythondir in1567 case $am_cv_python_pythondir in
1525 $am_py_prefix*)1568 $am_py_prefix*)
1526 am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`1569 am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
@@ -1546,9 +1589,7 @@
15461589
1547 dnl pyexecdir -- directory for installing python extension modules1590 dnl pyexecdir -- directory for installing python extension modules
1548 dnl (shared libraries)1591 dnl (shared libraries)
1549 dnl Query distutils for this directory. distutils does not exist in1592 dnl Query distutils for this directory.
1550 dnl Python 1.5, so we fall back to the hardcoded directory if it
1551 dnl doesn't work.
1552 AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],1593 AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
1553 [am_cv_python_pyexecdir],1594 [am_cv_python_pyexecdir],
1554 [if test "x$exec_prefix" = xNONE1595 [if test "x$exec_prefix" = xNONE
@@ -1557,8 +1598,7 @@
1557 else1598 else
1558 am_py_exec_prefix=$exec_prefix1599 am_py_exec_prefix=$exec_prefix
1559 fi1600 fi
1560 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 ||1601 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`
1561 echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
1562 case $am_cv_python_pyexecdir in1602 case $am_cv_python_pyexecdir in
1563 $am_py_exec_prefix*)1603 $am_py_exec_prefix*)
1564 am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`1604 am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
@@ -1606,12 +1646,14 @@
1606sys.exit(sys.hexversion < minverhex)"1646sys.exit(sys.hexversion < minverhex)"
1607 AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])1647 AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
16081648
1609# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.1649# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
1610#1650#
1611# This file is free software; the Free Software Foundation1651# This file is free software; the Free Software Foundation
1612# gives unlimited permission to copy and/or distribute it,1652# gives unlimited permission to copy and/or distribute it,
1613# with or without modifications, as long as this notice is preserved.1653# with or without modifications, as long as this notice is preserved.
16141654
1655# serial 1
1656
1615# AM_RUN_LOG(COMMAND)1657# AM_RUN_LOG(COMMAND)
1616# -------------------1658# -------------------
1617# Run COMMAND, save the exit status in ac_status, and log it.1659# Run COMMAND, save the exit status in ac_status, and log it.
@@ -1688,12 +1730,14 @@
1688fi1730fi
1689AC_MSG_RESULT(yes)])1731AC_MSG_RESULT(yes)])
16901732
1691# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.1733# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
1692#1734#
1693# This file is free software; the Free Software Foundation1735# This file is free software; the Free Software Foundation
1694# gives unlimited permission to copy and/or distribute it,1736# gives unlimited permission to copy and/or distribute it,
1695# with or without modifications, as long as this notice is preserved.1737# with or without modifications, as long as this notice is preserved.
16961738
1739# serial 1
1740
1697# AM_PROG_INSTALL_STRIP1741# AM_PROG_INSTALL_STRIP
1698# ---------------------1742# ---------------------
1699# One issue with vendor `install' (even GNU) is that you can't1743# One issue with vendor `install' (even GNU) is that you can't
@@ -1716,13 +1760,13 @@
1716INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"1760INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
1717AC_SUBST([INSTALL_STRIP_PROGRAM])])1761AC_SUBST([INSTALL_STRIP_PROGRAM])])
17181762
1719# Copyright (C) 2006, 2008 Free Software Foundation, Inc.1763# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
1720#1764#
1721# This file is free software; the Free Software Foundation1765# This file is free software; the Free Software Foundation
1722# gives unlimited permission to copy and/or distribute it,1766# gives unlimited permission to copy and/or distribute it,
1723# with or without modifications, as long as this notice is preserved.1767# with or without modifications, as long as this notice is preserved.
17241768
1725# serial 21769# serial 3
17261770
1727# _AM_SUBST_NOTMAKE(VARIABLE)1771# _AM_SUBST_NOTMAKE(VARIABLE)
1728# ---------------------------1772# ---------------------------
@@ -1731,13 +1775,13 @@
1731AC_DEFUN([_AM_SUBST_NOTMAKE])1775AC_DEFUN([_AM_SUBST_NOTMAKE])
17321776
1733# AM_SUBST_NOTMAKE(VARIABLE)1777# AM_SUBST_NOTMAKE(VARIABLE)
1734# ---------------------------1778# --------------------------
1735# Public sister of _AM_SUBST_NOTMAKE.1779# Public sister of _AM_SUBST_NOTMAKE.
1736AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])1780AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
17371781
1738# Check how to create a tarball. -*- Autoconf -*-1782# Check how to create a tarball. -*- Autoconf -*-
17391783
1740# Copyright (C) 2004, 2005 Free Software Foundation, Inc.1784# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
1741#1785#
1742# This file is free software; the Free Software Foundation1786# This file is free software; the Free Software Foundation
1743# gives unlimited permission to copy and/or distribute it,1787# gives unlimited permission to copy and/or distribute it,
@@ -1759,10 +1803,11 @@
1759# a tarball read from stdin.1803# a tarball read from stdin.
1760# $(am__untar) < result.tar1804# $(am__untar) < result.tar
1761AC_DEFUN([_AM_PROG_TAR],1805AC_DEFUN([_AM_PROG_TAR],
1762[# Always define AMTAR for backward compatibility.1806[# Always define AMTAR for backward compatibility. Yes, it's still used
1763AM_MISSING_PROG([AMTAR], [tar])1807# in the wild :-( We should find a proper way to deprecate it ...
1808AC_SUBST([AMTAR], ['$${TAR-tar}'])
1764m4_if([$1], [v7],1809m4_if([$1], [v7],
1765 [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],1810 [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
1766 [m4_case([$1], [ustar],, [pax],,1811 [m4_case([$1], [ustar],, [pax],,
1767 [m4_fatal([Unknown tar format])])1812 [m4_fatal([Unknown tar format])])
1768AC_MSG_CHECKING([how to create a $1 tar archive])1813AC_MSG_CHECKING([how to create a $1 tar archive])
17691814
=== 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 @@
1# Makefile.in generated by automake 1.11.1 from Makefile.am.1# Makefile.in generated by automake 1.11.6 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,5# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6# Inc.6# Foundation, Inc.
7# This Makefile.in is free software; the Free Software Foundation7# This Makefile.in is free software; the Free Software Foundation
8# gives unlimited permission to copy and/or distribute it,8# gives unlimited permission to copy and/or distribute it,
9# with or without modifications, as long as this notice is preserved.9# with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
16@SET_MAKE@16@SET_MAKE@
1717
18VPATH = @srcdir@18VPATH = @srcdir@
19am__make_dryrun = \
20 { \
21 am__dry=no; \
22 case $$MAKEFLAGS in \
23 *\\[\ \ ]*) \
24 echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
25 | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
26 *) \
27 for am__flg in $$MAKEFLAGS; do \
28 case $$am__flg in \
29 *=*|--*) ;; \
30 *n*) am__dry=yes; break;; \
31 esac; \
32 done;; \
33 esac; \
34 test $$am__dry = yes; \
35 }
19pkgdatadir = $(datadir)/@PACKAGE@36pkgdatadir = $(datadir)/@PACKAGE@
20pkgincludedir = $(includedir)/@PACKAGE@37pkgincludedir = $(includedir)/@PACKAGE@
21pkglibdir = $(libdir)/@PACKAGE@38pkglibdir = $(libdir)/@PACKAGE@
@@ -62,14 +79,26 @@
62am__base_list = \79am__base_list = \
63 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \80 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
64 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'81 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
82am__uninstall_files_from_dir = { \
83 test -z "$$files" \
84 || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
85 || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
86 $(am__cd) "$$dir" && rm -f $$files; }; \
87 }
65am__installdirs = "$(DESTDIR)$(bindir)"88am__installdirs = "$(DESTDIR)$(bindir)"
66SCRIPTS = $(bin_SCRIPTS)89SCRIPTS = $(bin_SCRIPTS)
67SOURCES =90SOURCES =
68DIST_SOURCES =91DIST_SOURCES =
92am__can_run_installinfo = \
93 case $$AM_UPDATE_INFO_DIR in \
94 n|no|NO) false;; \
95 *) (install-info --version) >/dev/null 2>&1;; \
96 esac
69DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)97DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
70ACLOCAL = @ACLOCAL@98ACLOCAL = @ACLOCAL@
71ALL_LINGUAS = @ALL_LINGUAS@99ALL_LINGUAS = @ALL_LINGUAS@
72AMTAR = @AMTAR@100AMTAR = @AMTAR@
101AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
73AUTOCONF = @AUTOCONF@102AUTOCONF = @AUTOCONF@
74AUTOHEADER = @AUTOHEADER@103AUTOHEADER = @AUTOHEADER@
75AUTOMAKE = @AUTOMAKE@104AUTOMAKE = @AUTOMAKE@
@@ -105,6 +134,10 @@
105INTLTOOL_MERGE = @INTLTOOL_MERGE@134INTLTOOL_MERGE = @INTLTOOL_MERGE@
106INTLTOOL_PERL = @INTLTOOL_PERL@135INTLTOOL_PERL = @INTLTOOL_PERL@
107INTLTOOL_UPDATE = @INTLTOOL_UPDATE@136INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
137INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
138INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
139INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
140INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
108LDFLAGS = @LDFLAGS@141LDFLAGS = @LDFLAGS@
109LIBOBJS = @LIBOBJS@142LIBOBJS = @LIBOBJS@
110LIBS = @LIBS@143LIBS = @LIBS@
@@ -162,6 +195,8 @@
162includedir = @includedir@195includedir = @includedir@
163infodir = @infodir@196infodir = @infodir@
164install_sh = @install_sh@197install_sh = @install_sh@
198intltool__v_merge_options_ = @intltool__v_merge_options_@
199intltool__v_merge_options_0 = @intltool__v_merge_options_0@
165libdir = @libdir@200libdir = @libdir@
166libexecdir = @libexecdir@201libexecdir = @libexecdir@
167localedir = @localedir@202localedir = @localedir@
@@ -225,8 +260,11 @@
225$(am__aclocal_m4_deps):260$(am__aclocal_m4_deps):
226install-binSCRIPTS: $(bin_SCRIPTS)261install-binSCRIPTS: $(bin_SCRIPTS)
227 @$(NORMAL_INSTALL)262 @$(NORMAL_INSTALL)
228 test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
229 @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \263 @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
264 if test -n "$$list"; then \
265 echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
266 $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
267 fi; \
230 for p in $$list; do \268 for p in $$list; do \
231 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \269 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
232 if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \270 if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -254,9 +292,7 @@
254 @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \292 @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
255 files=`for p in $$list; do echo "$$p"; done | \293 files=`for p in $$list; do echo "$$p"; done | \
256 sed -e 's,.*/,,;$(transform)'`; \294 sed -e 's,.*/,,;$(transform)'`; \
257 test -n "$$list" || exit 0; \295 dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
258 echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
259 cd "$(DESTDIR)$(bindir)" && rm -f $$files
260tags: TAGS296tags: TAGS
261TAGS:297TAGS:
262298
@@ -311,10 +347,15 @@
311347
312installcheck: installcheck-am348installcheck: installcheck-am
313install-strip:349install-strip:
314 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \350 if test -z '$(STRIP)'; then \
315 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \351 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
316 `test -z '$(STRIP)' || \352 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
317 echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install353 install; \
354 else \
355 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
356 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
357 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
358 fi
318mostlyclean-generic:359mostlyclean-generic:
319360
320clean-generic:361clean-generic:
321362
=== 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 @@
40GLADEFILE = '@datadir@/soundconverter/soundconverter.glade'40GLADEFILE = '@datadir@/soundconverter/soundconverter.glade'
4141
42PACKAGE = NAME.lower()42PACKAGE = NAME.lower()
43gettext.bindtextdomain(PACKAGE,'@datadir@/locale')43try:
44locale.setlocale(locale.LC_ALL,'')44 gettext.bindtextdomain(PACKAGE,'@datadir@/locale')
45gettext.textdomain(PACKAGE)45 locale.setlocale(locale.LC_ALL,'')
46gettext.install(PACKAGE,localedir='@datadir@/locale',unicode=1)46 gettext.textdomain(PACKAGE)
4747 gettext.install(PACKAGE,localedir='@datadir@/locale',unicode=1)
48from gettext import gettext as _48 #from gettext import gettext as _
49except locale.Error:
50 print ' cannot use system locale.'
51 locale.setlocale(locale.LC_ALL,'C')
52 gettext.textdomain(PACKAGE)
53 gettext.install(PACKAGE,localedir='@datadir@/locale',unicode=1)
4954
50def _add_soundconverter_path():55def _add_soundconverter_path():
51 global localedir56 global localedir
@@ -68,8 +73,10 @@
68 gobject.threads_init()73 gobject.threads_init()
69 import gnomevfs74 import gnomevfs
70 except ImportError:75 except ImportError:
71 print '%s needs pygtk and gnome-python >= 2.12!' % NAME76 print '%s needs pygtk and gnome-python >= 2.24!' % NAME
72 sys.exit(1)77 sys.exit(1)
78 except:
79 pass
7380
74 try:81 try:
75 import pygst82 import pygst
@@ -83,7 +90,18 @@
83 '.'.join([str(s) for s in gst.gst_version]))90 '.'.join([str(s) for s in gst.gst_version]))
8491
8592
8693def check_mime_type(mime):
94 types = {'vorbis': 'audio/x-vorbis', 'flac': 'audio/x-flac', 'wav' : 'audio/x-wav',
95 'mp3': 'audio/mpeg', 'aac': 'audio/x-m4a'}
96 mime = types.get(mime, mime)
97 if mime not in types.values():
98 print 'Cannot use "%s" mime type.' % mime
99 print 'Supported shortcuts and mime types:',
100 for k,v in sorted(types.iteritems()):
101 print '%s %s' % (k,v),
102 print
103 raise SystemExit
104 return mime
87105
88106
89def mode_callback(option, opt, value, parser, **kwargs):107def mode_callback(option, opt, value, parser, **kwargs):
@@ -99,31 +117,29 @@
99 'can use this from, say, shell scripts.'))117 'can use this from, say, shell scripts.'))
100 parser.add_option('-t', '--tags', dest="mode", action='callback',118 parser.add_option('-t', '--tags', dest="mode", action='callback',
101 callback=mode_callback, callback_kwargs={'mode':'tags'},119 callback=mode_callback, callback_kwargs={'mode':'tags'},
102 help=_('Show tags for input files instead of converting'120 help=_('Show tags for input files instead of converting '
103 'them. This indicates \n command line batch mode'121 'them. This indicates \n command line batch mode '
104 'and disables the graphical user interface.'))122 'and disables the graphical user interface.'))
105 parser.add_option('-m', '--mime-type', action="store_true",123 parser.add_option('-m', '--mime-type', dest="cli-output-type",
106 dest="batch_mime",124 help=_('Set the output MIME type for batch mode. The default '
107 help=_('Set the output MIME type for batch mode. The default'125 'is %s. Note that you probably want to set the output '
108 'is %s. Note that you probably want to set the output'
109 'suffix as well.') % settings['cli-output-type'])126 'suffix as well.') % settings['cli-output-type'])
110 parser.add_option('-q', '--quiet', action="store_true", dest="quiet",127 parser.add_option('-q', '--quiet', action="store_true", dest="quiet",
111 help=_("Be quiet. Don't write normal output, only errors."))128 help=_("Be quiet. Don't write normal output, only errors."))
112 parser.add_option('-d', '--debug', action="store_true", dest="debug",129 parser.add_option('-d', '--debug', action="store_true", dest="debug",
113 help=_('Print additional debug information'))130 help=_('Displays additional debug information'))
114 parser.add_option('-s', '--suffix', dest="new_suffix",131 parser.add_option('-s', '--suffix', dest="cli-output-suffix",
115 help=_('Set the output filename suffix for batch mode.'132 help=_('Set the output filename suffix for batch mode.'
116 'The default is %s . Note that the suffix does not'133 'The default is %s . Note that the suffix does not '
117 'affect\n the output MIME type.') % settings['cli-output-suffix'])134 'affect\n the output MIME type.') % settings['cli-output-suffix'])
118 parser.add_option('-j', '--jobs', action='store', type='int', dest='jobs',135 parser.add_option('-j', '--jobs', action='store', type='int', dest='jobs',
119 metavar='NUM', help=_('Force number of concurrent conversions.'))136 metavar='NUM', help=_('Force number of concurrent conversions.'))
120 parser.add_option('--help-gst', action="store_true", dest="_unused",137 parser.add_option('--help-gst', action="store_true", dest="_unused",
121 help=_('Show GStreamer Options'))138 help=_('Shows GStreamer Options'))
122 return parser139 return parser
123140
124141
125_add_soundconverter_path()142_add_soundconverter_path()
126_check_libs()
127143
128import soundconverter144import soundconverter
129soundconverter.NAME = NAME145soundconverter.NAME = NAME
@@ -145,14 +161,31 @@
145 continue161 continue
146 settings[k] = getattr(options, k)162 settings[k] = getattr(options, k)
147163
164settings['cli-output-type'] = check_mime_type(settings['cli-output-type'])
165
166_check_libs()
167
148print ' using %d thread(s)' % settings['jobs']168print ' using %d thread(s)' % settings['jobs']
149169
150from soundconverter.ui import gui_main170from soundconverter.batch import cli_convert_main
171from soundconverter.batch import cli_tags_main
151from soundconverter.fileoperations import filename_to_uri172from soundconverter.fileoperations import filename_to_uri
152
153files = map(filename_to_uri, files)173files = map(filename_to_uri, files)
154gui_main(NAME, VERSION, GLADEFILE, files)
155174
175try:
176 from soundconverter.ui import gui_main
177except:
178 if settings['mode'] == 'gui':
179 settings['mode'] = 'batch'
180
181if settings['mode'] == 'gui':
182 gui_main(NAME, VERSION, GLADEFILE, files)
183elif settings['mode'] == 'tags':
184 if not files: print 'nothing to do...'
185 cli_tags_main(files)
186else:
187 if not files: print 'nothing to do...'
188 cli_convert_main(files)
156189
157190
158191
159192
=== modified file 'configure'
--- configure 2012-02-22 21:58:39 +0000
+++ configure 2012-11-21 17:48:22 +0000
@@ -1,6 +1,6 @@
1#! /bin/sh1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles.2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.68.3# Generated by GNU Autoconf 2.68 for soundconverter 2.0.4.
4#4#
5#5#
6# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,6# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -555,12 +555,12 @@
555MAKEFLAGS=555MAKEFLAGS=
556556
557# Identity of this package.557# Identity of this package.
558PACKAGE_NAME=558PACKAGE_NAME='soundconverter'
559PACKAGE_TARNAME=559PACKAGE_TARNAME='soundconverter'
560PACKAGE_VERSION=560PACKAGE_VERSION='2.0.4'
561PACKAGE_STRING=561PACKAGE_STRING='soundconverter 2.0.4'
562PACKAGE_BUGREPORT=562PACKAGE_BUGREPORT=''
563PACKAGE_URL=563PACKAGE_URL=''
564564
565ac_unique_file="bin/soundconverter.py"565ac_unique_file="bin/soundconverter.py"
566# Factoring default headers for most tests.566# Factoring default headers for most tests.
@@ -634,6 +634,13 @@
634INTLTOOL_KEYS_RULE634INTLTOOL_KEYS_RULE
635INTLTOOL_DIRECTORY_RULE635INTLTOOL_DIRECTORY_RULE
636INTLTOOL_DESKTOP_RULE636INTLTOOL_DESKTOP_RULE
637intltool__v_merge_options_0
638intltool__v_merge_options_
639INTLTOOL_V_MERGE_OPTIONS
640INTLTOOL__v_MERGE_0
641INTLTOOL__v_MERGE_
642INTLTOOL_V_MERGE
643AM_DEFAULT_VERBOSITY
637INTLTOOL_EXTRACT644INTLTOOL_EXTRACT
638INTLTOOL_MERGE645INTLTOOL_MERGE
639INTLTOOL_UPDATE646INTLTOOL_UPDATE
@@ -659,6 +666,7 @@
659am__fastdepCC_FALSE666am__fastdepCC_FALSE
660am__fastdepCC_TRUE667am__fastdepCC_TRUE
661CCDEPMODE668CCDEPMODE
669am__nodep
662AMDEPBACKSLASH670AMDEPBACKSLASH
663AMDEP_FALSE671AMDEP_FALSE
664AMDEP_TRUE672AMDEP_TRUE
@@ -748,7 +756,8 @@
748LDFLAGS756LDFLAGS
749LIBS757LIBS
750CPPFLAGS758CPPFLAGS
751CPP'759CPP
760PYTHON'
752761
753762
754# Initialize some variables set by options.763# Initialize some variables set by options.
@@ -789,7 +798,7 @@
789localstatedir='${prefix}/var'798localstatedir='${prefix}/var'
790includedir='${prefix}/include'799includedir='${prefix}/include'
791oldincludedir='/usr/include'800oldincludedir='/usr/include'
792docdir='${datarootdir}/doc/${PACKAGE}'801docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
793infodir='${datarootdir}/info'802infodir='${datarootdir}/info'
794htmldir='${docdir}'803htmldir='${docdir}'
795dvidir='${docdir}'804dvidir='${docdir}'
@@ -1291,7 +1300,7 @@
1291 # Omit some internal or obsolete options to make the list less imposing.1300 # Omit some internal or obsolete options to make the list less imposing.
1292 # This message is too long to be a string in the A/UX 3.1 sh.1301 # This message is too long to be a string in the A/UX 3.1 sh.
1293 cat <<_ACEOF1302 cat <<_ACEOF
1294\`configure' configures this package to adapt to many kinds of systems.1303\`configure' configures soundconverter 2.0.4 to adapt to many kinds of systems.
12951304
1296Usage: $0 [OPTION]... [VAR=VALUE]...1305Usage: $0 [OPTION]... [VAR=VALUE]...
12971306
@@ -1339,7 +1348,7 @@
1339 --infodir=DIR info documentation [DATAROOTDIR/info]1348 --infodir=DIR info documentation [DATAROOTDIR/info]
1340 --localedir=DIR locale-dependent data [DATAROOTDIR/locale]1349 --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
1341 --mandir=DIR man documentation [DATAROOTDIR/man]1350 --mandir=DIR man documentation [DATAROOTDIR/man]
1342 --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]1351 --docdir=DIR documentation root [DATAROOTDIR/doc/soundconverter]
1343 --htmldir=DIR html documentation [DOCDIR]1352 --htmldir=DIR html documentation [DOCDIR]
1344 --dvidir=DIR dvi documentation [DOCDIR]1353 --dvidir=DIR dvi documentation [DOCDIR]
1345 --pdfdir=DIR pdf documentation [DOCDIR]1354 --pdfdir=DIR pdf documentation [DOCDIR]
@@ -1356,7 +1365,9 @@
1356fi1365fi
13571366
1358if test -n "$ac_init_help"; then1367if test -n "$ac_init_help"; then
13591368 case $ac_init_help in
1369 short | recursive ) echo "Configuration of soundconverter 2.0.4:";;
1370 esac
1360 cat <<\_ACEOF1371 cat <<\_ACEOF
13611372
1362Optional Features:1373Optional Features:
@@ -1376,6 +1387,7 @@
1376 CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if1387 CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
1377 you have headers in a nonstandard directory <include dir>1388 you have headers in a nonstandard directory <include dir>
1378 CPP C preprocessor1389 CPP C preprocessor
1390 PYTHON the Python interpreter
13791391
1380Use these variables to override the choices made by `configure' or to help1392Use these variables to override the choices made by `configure' or to help
1381it to find libraries and programs with nonstandard names/locations.1393it to find libraries and programs with nonstandard names/locations.
@@ -1443,7 +1455,7 @@
1443test -n "$ac_init_help" && exit $ac_status1455test -n "$ac_init_help" && exit $ac_status
1444if $ac_init_version; then1456if $ac_init_version; then
1445 cat <<\_ACEOF1457 cat <<\_ACEOF
1446configure1458soundconverter configure 2.0.4
1447generated by GNU Autoconf 2.681459generated by GNU Autoconf 2.68
14481460
1449Copyright (C) 2010 Free Software Foundation, Inc.1461Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1808,7 +1820,7 @@
1808This file contains any messages produced by compilers while1820This file contains any messages produced by compilers while
1809running configure, to aid debugging if configure makes a mistake.1821running configure, to aid debugging if configure makes a mistake.
18101822
1811It was created by $as_me, which was1823It was created by soundconverter $as_me 2.0.4, which was
1812generated by GNU Autoconf 2.68. Invocation command line was1824generated by GNU Autoconf 2.68. Invocation command line was
18131825
1814 $ $0 $@1826 $ $0 $@
@@ -2623,8 +2635,8 @@
26232635
26242636
2625# Define the identity of the package.2637# Define the identity of the package.
2626 PACKAGE=soundconverter2638 PACKAGE='soundconverter'
2627 VERSION=2.0.12639 VERSION='2.0.4'
26282640
26292641
2630cat >>confdefs.h <<_ACEOF2642cat >>confdefs.h <<_ACEOF
@@ -2654,11 +2666,11 @@
26542666
2655# We need awk for the "check" target. The system "awk" is bad on2667# We need awk for the "check" target. The system "awk" is bad on
2656# some platforms.2668# some platforms.
2657# Always define AMTAR for backward compatibility.2669# Always define AMTAR for backward compatibility. Yes, it's still used
26582670# in the wild :-( We should find a proper way to deprecate it ...
2659AMTAR=${AMTAR-"${am_missing_run}tar"}2671AMTAR='$${TAR-tar}'
26602672
2661am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'2673am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
26622674
26632675
26642676
@@ -2672,7 +2684,7 @@
26722684
2673ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"2685ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
26742686
2675ALL_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"2687ALL_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"
26762688
2677GETTEXT_PACKAGE="soundconverter"2689GETTEXT_PACKAGE="soundconverter"
26782690
@@ -2733,6 +2745,7 @@
2733if test "x$enable_dependency_tracking" != xno; then2745if test "x$enable_dependency_tracking" != xno; then
2734 am_depcomp="$ac_aux_dir/depcomp"2746 am_depcomp="$ac_aux_dir/depcomp"
2735 AMDEPBACKSLASH='\'2747 AMDEPBACKSLASH='\'
2748 am__nodep='_no'
2736fi2749fi
2737 if test "x$enable_dependency_tracking" != xno; then2750 if test "x$enable_dependency_tracking" != xno; then
2738 AMDEP_TRUE=2751 AMDEP_TRUE=
@@ -3546,6 +3559,7 @@
3546 # instance it was reported that on HP-UX the gcc test will end up3559 # instance it was reported that on HP-UX the gcc test will end up
3547 # making a dummy file named `D' -- because `-MD' means `put the output3560 # making a dummy file named `D' -- because `-MD' means `put the output
3548 # in D'.3561 # in D'.
3562 rm -rf conftest.dir
3549 mkdir conftest.dir3563 mkdir conftest.dir
3550 # Copy depcomp to subdir because otherwise we won't find it if we're3564 # Copy depcomp to subdir because otherwise we won't find it if we're
3551 # using a relative directory.3565 # using a relative directory.
@@ -3605,7 +3619,7 @@
3605 break3619 break
3606 fi3620 fi
3607 ;;3621 ;;
3608 msvisualcpp | msvcmsys)3622 msvc7 | msvc7msys | msvisualcpp | msvcmsys)
3609 # This compiler won't grok `-c -o', but also, the minuso test has3623 # This compiler won't grok `-c -o', but also, the minuso test has
3610 # not run yet. These depmodes are late enough in the game, and3624 # not run yet. These depmodes are late enough in the game, and
3611 # so weak that their functioning should not be impacted.3625 # so weak that their functioning should not be impacted.
@@ -4643,6 +4657,10 @@
4643fi4657fi
46444658
4645 ;;4659 ;;
4660 *-*-openbsd*)
4661 CATOBJEXT=.mo
4662 DATADIRNAME=share
4663 ;;
4646 *)4664 *)
4647 CATOBJEXT=.mo4665 CATOBJEXT=.mo
4648 DATADIRNAME=lib4666 DATADIRNAME=lib
@@ -4786,14 +4804,12 @@
4786 ;;4804 ;;
4787esac4805esac
47884806
4807INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
4808INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
4809INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
4789if test -n ""; then4810if test -n ""; then
4790 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= " >&54811 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= " >&5
4791$as_echo_n "checking for intltool >= ... " >&6; }4812$as_echo_n "checking for intltool >= ... " >&6; }
4792
4793 INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
4794 INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
4795 INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
4796
4797 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&54813 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
4798$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }4814$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
4799 test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||4815 test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
@@ -4924,25 +4940,48 @@
4924 as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 54940 as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
4925fi4941fi
49264942
4927 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 $< $@'4943if test -z "$AM_DEFAULT_VERBOSITY"; then
4928INTLTOOL_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 $< $@'4944 AM_DEFAULT_VERBOSITY=1
4929 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 $< $@'4945fi
4930 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 $< $@'4946
4931 INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'4947
4932 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 $< $@'4948INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
4933 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 $< $@'4949INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
4934 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 $< $@'4950INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;'
4935INTLTOOL_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 $< $@'4951
4936 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 $< $@'4952
4937 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 $< $@'4953
4938 INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'4954
4939 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 $< $@'4955INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
4940 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 $< $@'4956intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
4941 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 $< $@'4957intltool__v_merge_options_0='-q'
4942 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 $< $@'4958
4943 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 $< $@'4959
4944 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 $< $@'4960
4945 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 $< $@'4961
4962 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 $< $@'
4963INTLTOOL_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 $< $@'
4964 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 $< $@'
4965 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 $< $@'
4966 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 $< $@'
4967 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 $< $@'
4968 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 $< $@'
4969 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 $< $@'
4970INTLTOOL_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 $< $@'
4971 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 $< $@'
4972 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 $< $@'
4973if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
4974 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 $< $@'
4975else
4976 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'
4977fi
4978 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 $< $@'
4979 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 $< $@'
4980 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 $< $@'
4981 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 $< $@'
4982 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 $< $@'
4983 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 $< $@'
4984 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 $< $@'
49464985
49474986
49484987
@@ -5261,7 +5300,7 @@
5261if test $? -ne 0; then5300if test $? -ne 0; then
5262 as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 55301 as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
5263else5302else
5264 IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"5303 IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
5265 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&55304 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
5266$as_echo "$IT_PERL_VERSION" >&6; }5305$as_echo "$IT_PERL_VERSION" >&6; }
5267fi5306fi
@@ -5325,6 +5364,8 @@
53255364
53265365
53275366
5367
5368
5328 if test -n "$PYTHON"; then5369 if test -n "$PYTHON"; then
5329 # If the user set $PYTHON, use it and don't search something else.5370 # If the user set $PYTHON, use it and don't search something else.
5330 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.5" >&55371 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.5" >&5
@@ -5358,7 +5399,7 @@
5358 $as_echo_n "(cached) " >&65399 $as_echo_n "(cached) " >&6
5359else5400else
53605401
5361 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; do5402 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
5362 test "$am_cv_pathless_PYTHON" = none && break5403 test "$am_cv_pathless_PYTHON" = none && break
5363 prog="import sys5404 prog="import sys
5364# split strings by '.' and convert to numeric. Append some zeros5405# split strings by '.' and convert to numeric. Append some zeros
@@ -5467,7 +5508,7 @@
54675508
54685509
54695510
5470 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&55511 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
5471$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }5512$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
5472if ${am_cv_python_pythondir+:} false; then :5513if ${am_cv_python_pythondir+:} false; then :
5473 $as_echo_n "(cached) " >&65514 $as_echo_n "(cached) " >&6
@@ -5478,8 +5519,7 @@
5478 else5519 else
5479 am_py_prefix=$prefix5520 am_py_prefix=$prefix
5480 fi5521 fi
5481 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 ||5522 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`
5482 echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
5483 case $am_cv_python_pythondir in5523 case $am_cv_python_pythondir in
5484 $am_py_prefix*)5524 $am_py_prefix*)
5485 am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`5525 am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
@@ -5505,7 +5545,7 @@
5505 pkgpythondir=\${pythondir}/$PACKAGE5545 pkgpythondir=\${pythondir}/$PACKAGE
55065546
55075547
5508 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&55548 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
5509$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }5549$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
5510if ${am_cv_python_pyexecdir+:} false; then :5550if ${am_cv_python_pyexecdir+:} false; then :
5511 $as_echo_n "(cached) " >&65551 $as_echo_n "(cached) " >&6
@@ -5516,8 +5556,7 @@
5516 else5556 else
5517 am_py_exec_prefix=$exec_prefix5557 am_py_exec_prefix=$exec_prefix
5518 fi5558 fi
5519 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 ||5559 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`
5520 echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
5521 case $am_cv_python_pyexecdir in5560 case $am_cv_python_pyexecdir in
5522 $am_py_exec_prefix*)5561 $am_py_exec_prefix*)
5523 am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`5562 am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
@@ -6157,7 +6196,7 @@
6157# report actual input values of CONFIG_FILES etc. instead of their6196# report actual input values of CONFIG_FILES etc. instead of their
6158# values after options handling.6197# values after options handling.
6159ac_log="6198ac_log="
6160This file was extended by $as_me, which was6199This file was extended by soundconverter $as_me 2.0.4, which was
6161generated by GNU Autoconf 2.68. Invocation command line was6200generated by GNU Autoconf 2.68. Invocation command line was
61626201
6163 CONFIG_FILES = $CONFIG_FILES6202 CONFIG_FILES = $CONFIG_FILES
@@ -6214,7 +6253,7 @@
6214cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=16253cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
6215ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"6254ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
6216ac_cs_version="\\6255ac_cs_version="\\
6217config.status6256soundconverter config.status 2.0.4
6218configured by $0, generated by GNU Autoconf 2.68,6257configured by $0, generated by GNU Autoconf 2.68,
6219 with options \\"\$ac_cs_config\\"6258 with options \\"\$ac_cs_config\\"
62206259
62216260
=== 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 @@
1dnl -*- Mode: autoconf -*-1dnl -*- Mode: autoconf -*-
2dnl Process this file with autoconf to produce a configure script.2dnl Process this file with autoconf to produce a configure script.
3AC_PREREQ([2.68])3AC_PREREQ([2.68])
4AC_INIT4AC_INIT([soundconverter], [2.0.4])
5AC_CONFIG_SRCDIR([bin/soundconverter.py])5AC_CONFIG_SRCDIR([bin/soundconverter.py])
6AM_INIT_AUTOMAKE([soundconverter], [2.0.1])6AM_INIT_AUTOMAKE
77
8m4_define(required_python_abi, [2.5])8m4_define(required_python_abi, [2.5])
9m4_define(required_python_version, [2.5])9m4_define(required_python_version, [2.5])
@@ -13,7 +13,7 @@
13dnl put the ACLOCAL flags in the makefile13dnl put the ACLOCAL flags in the makefile
14ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"14ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
1515
16ALL_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"16ALL_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"
1717
18GETTEXT_PACKAGE="soundconverter"18GETTEXT_PACKAGE="soundconverter"
19AC_SUBST([GETTEXT_PACKAGE])19AC_SUBST([GETTEXT_PACKAGE])
2020
=== 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 @@
1# Makefile.in generated by automake 1.11.1 from Makefile.am.1# Makefile.in generated by automake 1.11.6 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,5# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6# Inc.6# Foundation, Inc.
7# This Makefile.in is free software; the Free Software Foundation7# This Makefile.in is free software; the Free Software Foundation
8# gives unlimited permission to copy and/or distribute it,8# gives unlimited permission to copy and/or distribute it,
9# with or without modifications, as long as this notice is preserved.9# with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
16@SET_MAKE@16@SET_MAKE@
1717
18VPATH = @srcdir@18VPATH = @srcdir@
19am__make_dryrun = \
20 { \
21 am__dry=no; \
22 case $$MAKEFLAGS in \
23 *\\[\ \ ]*) \
24 echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
25 | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
26 *) \
27 for am__flg in $$MAKEFLAGS; do \
28 case $$am__flg in \
29 *=*|--*) ;; \
30 *n*) am__dry=yes; break;; \
31 esac; \
32 done;; \
33 esac; \
34 test $$am__dry = yes; \
35 }
19pkgdatadir = $(datadir)/@PACKAGE@36pkgdatadir = $(datadir)/@PACKAGE@
20pkgincludedir = $(includedir)/@PACKAGE@37pkgincludedir = $(includedir)/@PACKAGE@
21pkglibdir = $(libdir)/@PACKAGE@38pkglibdir = $(libdir)/@PACKAGE@
@@ -45,6 +62,11 @@
45CONFIG_CLEAN_VPATH_FILES =62CONFIG_CLEAN_VPATH_FILES =
46SOURCES =63SOURCES =
47DIST_SOURCES =64DIST_SOURCES =
65am__can_run_installinfo = \
66 case $$AM_UPDATE_INFO_DIR in \
67 n|no|NO) false;; \
68 *) (install-info --version) >/dev/null 2>&1;; \
69 esac
48am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;70am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
49am__vpath_adj = case $$p in \71am__vpath_adj = case $$p in \
50 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \72 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -66,6 +88,12 @@
66am__base_list = \88am__base_list = \
67 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \89 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
68 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'90 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
91am__uninstall_files_from_dir = { \
92 test -z "$$files" \
93 || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
94 || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
95 $(am__cd) "$$dir" && rm -f $$files; }; \
96 }
69am__installdirs = "$(DESTDIR)$(Applicationsdir)" \97am__installdirs = "$(DESTDIR)$(Applicationsdir)" \
70 "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(icondir)" \98 "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(icondir)" \
71 "$(DESTDIR)$(svgicondir)"99 "$(DESTDIR)$(svgicondir)"
@@ -75,6 +103,7 @@
75ACLOCAL = @ACLOCAL@103ACLOCAL = @ACLOCAL@
76ALL_LINGUAS = @ALL_LINGUAS@104ALL_LINGUAS = @ALL_LINGUAS@
77AMTAR = @AMTAR@105AMTAR = @AMTAR@
106AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
78AUTOCONF = @AUTOCONF@107AUTOCONF = @AUTOCONF@
79AUTOHEADER = @AUTOHEADER@108AUTOHEADER = @AUTOHEADER@
80AUTOMAKE = @AUTOMAKE@109AUTOMAKE = @AUTOMAKE@
@@ -110,6 +139,10 @@
110INTLTOOL_MERGE = @INTLTOOL_MERGE@139INTLTOOL_MERGE = @INTLTOOL_MERGE@
111INTLTOOL_PERL = @INTLTOOL_PERL@140INTLTOOL_PERL = @INTLTOOL_PERL@
112INTLTOOL_UPDATE = @INTLTOOL_UPDATE@141INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
142INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
143INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
144INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
145INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
113LDFLAGS = @LDFLAGS@146LDFLAGS = @LDFLAGS@
114LIBOBJS = @LIBOBJS@147LIBOBJS = @LIBOBJS@
115LIBS = @LIBS@148LIBS = @LIBS@
@@ -167,6 +200,8 @@
167includedir = @includedir@200includedir = @includedir@
168infodir = @infodir@201infodir = @infodir@
169install_sh = @install_sh@202install_sh = @install_sh@
203intltool__v_merge_options_ = @intltool__v_merge_options_@
204intltool__v_merge_options_0 = @intltool__v_merge_options_0@
170libdir = @libdir@205libdir = @libdir@
171libexecdir = @libexecdir@206libexecdir = @libexecdir@
172localedir = @localedir@207localedir = @localedir@
@@ -240,8 +275,11 @@
240 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@275 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
241install-ApplicationsDATA: $(Applications_DATA)276install-ApplicationsDATA: $(Applications_DATA)
242 @$(NORMAL_INSTALL)277 @$(NORMAL_INSTALL)
243 test -z "$(Applicationsdir)" || $(MKDIR_P) "$(DESTDIR)$(Applicationsdir)"
244 @list='$(Applications_DATA)'; test -n "$(Applicationsdir)" || list=; \278 @list='$(Applications_DATA)'; test -n "$(Applicationsdir)" || list=; \
279 if test -n "$$list"; then \
280 echo " $(MKDIR_P) '$(DESTDIR)$(Applicationsdir)'"; \
281 $(MKDIR_P) "$(DESTDIR)$(Applicationsdir)" || exit 1; \
282 fi; \
245 for p in $$list; do \283 for p in $$list; do \
246 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \284 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
247 echo "$$d$$p"; \285 echo "$$d$$p"; \
@@ -255,13 +293,14 @@
255 @$(NORMAL_UNINSTALL)293 @$(NORMAL_UNINSTALL)
256 @list='$(Applications_DATA)'; test -n "$(Applicationsdir)" || list=; \294 @list='$(Applications_DATA)'; test -n "$(Applicationsdir)" || list=; \
257 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \295 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
258 test -n "$$files" || exit 0; \296 dir='$(DESTDIR)$(Applicationsdir)'; $(am__uninstall_files_from_dir)
259 echo " ( cd '$(DESTDIR)$(Applicationsdir)' && rm -f" $$files ")"; \
260 cd "$(DESTDIR)$(Applicationsdir)" && rm -f $$files
261install-dist_gladeDATA: $(dist_glade_DATA)297install-dist_gladeDATA: $(dist_glade_DATA)
262 @$(NORMAL_INSTALL)298 @$(NORMAL_INSTALL)
263 test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
264 @list='$(dist_glade_DATA)'; test -n "$(gladedir)" || list=; \299 @list='$(dist_glade_DATA)'; test -n "$(gladedir)" || list=; \
300 if test -n "$$list"; then \
301 echo " $(MKDIR_P) '$(DESTDIR)$(gladedir)'"; \
302 $(MKDIR_P) "$(DESTDIR)$(gladedir)" || exit 1; \
303 fi; \
265 for p in $$list; do \304 for p in $$list; do \
266 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \305 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
267 echo "$$d$$p"; \306 echo "$$d$$p"; \
@@ -275,13 +314,14 @@
275 @$(NORMAL_UNINSTALL)314 @$(NORMAL_UNINSTALL)
276 @list='$(dist_glade_DATA)'; test -n "$(gladedir)" || list=; \315 @list='$(dist_glade_DATA)'; test -n "$(gladedir)" || list=; \
277 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \316 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
278 test -n "$$files" || exit 0; \317 dir='$(DESTDIR)$(gladedir)'; $(am__uninstall_files_from_dir)
279 echo " ( cd '$(DESTDIR)$(gladedir)' && rm -f" $$files ")"; \
280 cd "$(DESTDIR)$(gladedir)" && rm -f $$files
281install-dist_iconDATA: $(dist_icon_DATA)318install-dist_iconDATA: $(dist_icon_DATA)
282 @$(NORMAL_INSTALL)319 @$(NORMAL_INSTALL)
283 test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
284 @list='$(dist_icon_DATA)'; test -n "$(icondir)" || list=; \320 @list='$(dist_icon_DATA)'; test -n "$(icondir)" || list=; \
321 if test -n "$$list"; then \
322 echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \
323 $(MKDIR_P) "$(DESTDIR)$(icondir)" || exit 1; \
324 fi; \
285 for p in $$list; do \325 for p in $$list; do \
286 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \326 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
287 echo "$$d$$p"; \327 echo "$$d$$p"; \
@@ -295,13 +335,14 @@
295 @$(NORMAL_UNINSTALL)335 @$(NORMAL_UNINSTALL)
296 @list='$(dist_icon_DATA)'; test -n "$(icondir)" || list=; \336 @list='$(dist_icon_DATA)'; test -n "$(icondir)" || list=; \
297 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \337 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
298 test -n "$$files" || exit 0; \338 dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir)
299 echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
300 cd "$(DESTDIR)$(icondir)" && rm -f $$files
301install-dist_svgiconDATA: $(dist_svgicon_DATA)339install-dist_svgiconDATA: $(dist_svgicon_DATA)
302 @$(NORMAL_INSTALL)340 @$(NORMAL_INSTALL)
303 test -z "$(svgicondir)" || $(MKDIR_P) "$(DESTDIR)$(svgicondir)"
304 @list='$(dist_svgicon_DATA)'; test -n "$(svgicondir)" || list=; \341 @list='$(dist_svgicon_DATA)'; test -n "$(svgicondir)" || list=; \
342 if test -n "$$list"; then \
343 echo " $(MKDIR_P) '$(DESTDIR)$(svgicondir)'"; \
344 $(MKDIR_P) "$(DESTDIR)$(svgicondir)" || exit 1; \
345 fi; \
305 for p in $$list; do \346 for p in $$list; do \
306 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \347 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
307 echo "$$d$$p"; \348 echo "$$d$$p"; \
@@ -315,9 +356,7 @@
315 @$(NORMAL_UNINSTALL)356 @$(NORMAL_UNINSTALL)
316 @list='$(dist_svgicon_DATA)'; test -n "$(svgicondir)" || list=; \357 @list='$(dist_svgicon_DATA)'; test -n "$(svgicondir)" || list=; \
317 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \358 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
318 test -n "$$files" || exit 0; \359 dir='$(DESTDIR)$(svgicondir)'; $(am__uninstall_files_from_dir)
319 echo " ( cd '$(DESTDIR)$(svgicondir)' && rm -f" $$files ")"; \
320 cd "$(DESTDIR)$(svgicondir)" && rm -f $$files
321tags: TAGS360tags: TAGS
322TAGS:361TAGS:
323362
@@ -372,10 +411,15 @@
372411
373installcheck: installcheck-am412installcheck: installcheck-am
374install-strip:413install-strip:
375 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \414 if test -z '$(STRIP)'; then \
376 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \415 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
377 `test -z '$(STRIP)' || \416 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
378 echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install417 install; \
418 else \
419 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
420 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
421 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
422 fi
379mostlyclean-generic:423mostlyclean-generic:
380424
381clean-generic:425clean-generic:
382426
=== 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 @@
17Name[et]=Heli teisendaja17Name[et]=Heli teisendaja
18Name[eu]=Soinu-bihurtzailea18Name[eu]=Soinu-bihurtzailea
19Name[fi]=Äänitiedostojen muunnin19Name[fi]=Äänitiedostojen muunnin
20Name[fr]=Convertisseur Audio SoundConverter20Name[fr]=Convertisseur audio
21Name[fr_CA]=Convertisseur audio
21Name[gl]=Sound Converter22Name[gl]=Sound Converter
22Name[he]=ממיר סאונד23Name[he]=ממיר סאונד
23Name[hi]=दवानी बदलनेवला24Name[hi]=दवानी बदलनेवला
@@ -25,19 +26,19 @@
25Name[it]=Sound Converter26Name[it]=Sound Converter
26Name[ja]=サウンド変換27Name[ja]=サウンド変換
27Name[lv]=Skaņas pārveidotājs28Name[lv]=Skaņas pārveidotājs
28Name[ms]=Penukar Audio29Name[ms]=Penukar Bunyi
29Name[nl]=Geluidsconverteerder30Name[nl]=Geluidsconverteerder
30Name[pl]=Konwerter dźwięku31Name[pl]=Konwerter dźwięku
31Name[pt]=Conversor de Som32Name[pt]=Conversor de Som
32Name[pt_BR]=Conversor de Som33Name[pt_BR]=Conversor de Som
33Name[ru]=Аудиоконвертор34Name[ru]=Аудиоконвертер
34Name[sk]=Zvukový konvertor35Name[sk]=Zvukový konvertor
35Name[sl]=Pretvornik zvoka36Name[sl]=Pretvornik zvoka
36Name[sr]=Претварач звука37Name[sr]=Претварач звука
37Name[sr@Latn]=Prekoder zvuka38Name[sr@Latn]=Prekoder zvuka
38Name[sr@latin]=Prekoder zvuka39Name[sr@latin]=Prekoder zvuka
39Name[sv]=Ljudkonverterare40Name[sv]=Ljudkonverterare
40Name[te]=దవనిని మార్చేది41Name[te]=శబ్ద పరివర్తకం
41Name[tr]=Ses Dönüştürücüsü42Name[tr]=Ses Dönüştürücüsü
42Name[uk]=Конвертер аудіо43Name[uk]=Конвертер аудіо
43Name[vi]=Bộ chuyển đổi âm thanh44Name[vi]=Bộ chuyển đổi âm thanh
@@ -51,7 +52,7 @@
51GenericName[ca]=Convertidor formats d'àudio52GenericName[ca]=Convertidor formats d'àudio
52GenericName[cs]=Převaděč zvukových formátů53GenericName[cs]=Převaděč zvukových formátů
53GenericName[da]=Lydformat-konvertering54GenericName[da]=Lydformat-konvertering
54GenericName[de]=Audioformat Konverter55GenericName[de]=Audio-Formatumwandlung
55GenericName[el]=Μετατροπέας Αρχείων Ηχου56GenericName[el]=Μετατροπέας Αρχείων Ηχου
56GenericName[en_AU]=Audio Format Converter57GenericName[en_AU]=Audio Format Converter
57GenericName[en_GB]=Audio Format Converter58GenericName[en_GB]=Audio Format Converter
@@ -60,7 +61,8 @@
60GenericName[et]=Heli vormingu teisendaja61GenericName[et]=Heli vormingu teisendaja
61GenericName[eu]=Audio Formatu Bihurtzailea62GenericName[eu]=Audio Formatu Bihurtzailea
62GenericName[fi]=Äänitiedostojen muunnin63GenericName[fi]=Äänitiedostojen muunnin
63GenericName[fr]=Conversion entre formats audio64GenericName[fr]=Convertisseur de fichiers audio
65GenericName[fr_CA]=Convertisseur de fichiers audio
64GenericName[gl]=Convertedor de formatos de son66GenericName[gl]=Convertedor de formatos de son
65GenericName[he]=ממיר פורמטים של אודיו67GenericName[he]=ממיר פורמטים של אודיו
66GenericName[hu]=Audió Formátum Konvertáló68GenericName[hu]=Audió Formátum Konvertáló
@@ -69,64 +71,42 @@
69GenericName[lv]=Audio formātu pārveidotājs71GenericName[lv]=Audio formātu pārveidotājs
70GenericName[ms]=Penukar Format Audio72GenericName[ms]=Penukar Format Audio
71GenericName[nl]=Geluidsformaat-converteerder73GenericName[nl]=Geluidsformaat-converteerder
72GenericName[pl]=Konwerter Formatów Audio74GenericName[pl]=Konwerter formatów dźwięku
73GenericName[pt]=Conversor de Formatos de Áudio75GenericName[pt]=Conversor de Formatos de Áudio
74GenericName[pt_BR]=Conversor de Formato de Áudio76GenericName[pt_BR]=Conversor de Formato de Áudio
75GenericName[ru]=Аудиоконвертор77GenericName[ru]=Конвертер форматов аудио
76GenericName[sk]=Prevod formátov zvuku78GenericName[sk]=Prevod formátov zvuku
77GenericName[sl]=Pretvornik zapisov zvoka79GenericName[sl]=Pretvornik zapisov zvoka
78GenericName[sr]=Претварач формата звука80GenericName[sr]=Претварач формата звука
79GenericName[sr@Latn]=Prekodiranje zvučnih formata81GenericName[sr@Latn]=Prekodiranje zvučnih formata
80GenericName[sr@latin]=Prekodiranje zvučnih formata82GenericName[sr@latin]=Prekodiranje zvučnih formata
81GenericName[sv]=Ljudformatskonverterare83GenericName[sv]=Ljudformatskonverterare
82GenericName[te]=ధ్వని రకము మార్చేది84GenericName[te]=ఆడియో ఆకృతి పరివర్తకం
83GenericName[tr]=Ses Biçimi Dönüştürücüsü85GenericName[tr]=Ses Biçimi Dönüştürücüsü
84GenericName[uk]=Конвертер аудіоформатів86GenericName[uk]=Конвертер аудіоформатів
85GenericName[vi]=Bộ chuyển định dạng Audio87GenericName[vi]=Bộ chuyển định dạng Audio
86GenericName[zh_CN]=音频格式转换程序88GenericName[zh_CN]=音频格式转换程序
87GenericName[zh_TW]=音訊格式轉換工具89GenericName[zh_TW]=音訊格式轉換工具
88Comment=Convert audio files into other formats90Comment=Converts audio files into other formats
89Comment[ar]=تحويل الملفات الصوتيه الى صيغ اخرى91Comment[cs]=Převádí audio soubory do různých formátů
90Comment[ast]=Camudar archivos de soniu a otros formatos92Comment[de]=Konvertiert Audio-Dateien in andere Formate
91Comment[bg]=Обръщане на аудио файлове в други формати93Comment[en_GB]=Converts audio files into other formats
92Comment[br]=Amdreiñ restroù klevet ouzh furmadoù all94Comment[es]=Convierte archivos de audio a otros formatos
93Comment[ca]=Convertiu fitxers d'àudio a diferents formats95Comment[eu]=Audio fitxategiak beste formatuetara bihurtzen ditu
94Comment[cs]=Převeďte zvukové soubory do jiných formátů96Comment[fr]=Convertit des fichiers audio en d'autres formats
95Comment[da]=Konvertér lydfiler til andre formater97Comment[fr_CA]=Convertit des fichiers audio en d'autres formats
96Comment[de]=Konvertierung von Audiodateien in andere Formate98Comment[gl]=Converte os ficheiros de son a outros formatos
97Comment[el]=Μετατρέψτε αρχεία ήχου σε αρχεία διαφορετικής ψηφιακής κωδικοποίησης99Comment[it]=Converti file audio in altri formati
98Comment[en_AU]=Convert audio files into other formats
99Comment[en_GB]=Convert audio files into other formats
100Comment[eo]=Konverti sondosierojn al aliaj formoj
101Comment[es]=Convertir archivos de audio a otros formatos
102Comment[et]=Teisenda audiofaile ümber
103Comment[eu]=Bihurtu audio fitxategiak beste formatuetara
104Comment[fi]=Muunna äänitiedostoja toisiin muotoihin
105Comment[fr]=Convertit les fichiers audios vers d'autres formats
106Comment[gl]=Converter os ficheiros de son a outros formatos
107Comment[he]=ממיר קבצי אודיו לפורמטים שונים
108Comment[hu]=Audió fájlokat konvertál más formátumúra
109Comment[it]=Converte file audio in altri formati
110Comment[ja]=オーディオファイルを別のフォーマットに変換
111Comment[lv]=Pārveido audio datnes citos formātos100Comment[lv]=Pārveido audio datnes citos formātos
112Comment[ms]=Tukar file audio ke format yang lain101Comment[ms]=Tukar fail audio kepada format lain
113Comment[nl]=Geluidsbestanden naar andere formaten converteren102Comment[nl]=Converteert geluidsbestanden naar andere formaten
114Comment[pl]=Konwertuj pliki audio do innych formatów103Comment[pl]=Konwertuje pliki dźwiękowe do innych formatów
115Comment[pt]=Converter ficheiros de áudio para outros formatos104Comment[pt_BR]=Converter para outros formatos os arquivos de áudio
116Comment[pt_BR]=Converter arquivos de áudio em outros formatos105Comment[ru]=Конвертирует аудиофайлы в другие форматы
117Comment[ru]=Конвертировать аудиофайлы в другие форматы106Comment[sr]=Претварајте звучне датотеке у друге формате
118Comment[sk]=Prevedie zvukové súbory do iných formátov107Comment[sr@latin]=Konvertuje audio fajlove u druge formate
119Comment[sl]=Pretvorite zvočne datoteke v druge zapise108Comment[sv]=Konverterar ljudfiler till andra format
120Comment[sr]=Претворите датотеке звука у друге формате109Comment[zh_TW]=將音效檔轉換至不同格式
121Comment[sr@Latn]=Prevedi jedan zvučni format u druge
122Comment[sr@latin]=Prevodi jedan zvučni format u druge
123Comment[sv]=Konvertera ljudfiler till andra format
124Comment[te]=ఒక ధ్వని రకము నుంచి మొరొక రకమునకు మార్చేది
125Comment[tr]=Ses dosyalarını diğer formatlara dönüştürün
126Comment[uk]=Конвертує аудіофайли в інші формати
127Comment[vi]=Chuyển đổi file audio sang các định dạng khác
128Comment[zh_CN]=将音频文件转换为其它格式
129Comment[zh_TW]=將音訊檔案轉換為其他格式
130Icon=soundconverter110Icon=soundconverter
131MimeType=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;111MimeType=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;
132Exec=soundconverter %U112Exec=soundconverter %U
133113
=== 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 @@
2Version=1.02Version=1.0
3_Name=Sound Converter3_Name=Sound Converter
4_GenericName=Audio Format Converter4_GenericName=Audio Format Converter
5_Comment=Convert audio files into other formats5_Comment=Converts audio files into other formats
6Icon=soundconverter6Icon=soundconverter
7MimeType=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;7MimeType=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;
8Exec=soundconverter %U8Exec=soundconverter %U
99
=== 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 @@
2Version=1.02Version=1.0
3_Name=Sound Converter3_Name=Sound Converter
4_GenericName=Audio Format Converter4_GenericName=Audio Format Converter
5_Comment=Convert audio files into other formats5_Comment=Converts audio files into other formats
6Icon=soundconverter6Icon=soundconverter
7MimeType=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;7MimeType=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;
8Exec=soundconverter %U8Exec=soundconverter %U
99
=== 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 @@
667 <col id="0" translatable="yes">AAC (.m4a)</col>667 <col id="0" translatable="yes">AAC (.m4a)</col>
668 </row>668 </row>
669 <row>669 <row>
670 <col id="0" translatable="yes">Opus (.opus)</col>
671 </row>
672 <row>
670 <col id="0" translatable="yes">GNOME Audio Profile</col>673 <col id="0" translatable="yes">GNOME Audio Profile</col>
671 </row>674 </row>
672 </data>675 </data>
@@ -1044,7 +1047,7 @@
1044 <property name="visible">True</property>1047 <property name="visible">True</property>
1045 <property name="can_focus">True</property>1048 <property name="can_focus">True</property>
1046 <property name="receives_default">False</property>1049 <property name="receives_default">False</property>
1047 <property name="tooltip_text" translatable="yes">Remove all chars except letters, digits and ./_-</property>1050 <property name="tooltip_text" translatable="yes">Remove all characters except letters, digits and ./_-</property>
1048 <property name="use_action_appearance">False</property>1051 <property name="use_action_appearance">False</property>
1049 <property name="use_underline">True</property>1052 <property name="use_underline">True</property>
1050 <property name="draw_indicator">True</property>1053 <property name="draw_indicator">True</property>
@@ -1626,6 +1629,68 @@
1626 </packing>1629 </packing>
1627 </child>1630 </child>
1628 <child>1631 <child>
1632 <object class="GtkTable" id="table5b">
1633 <property name="visible">True</property>
1634 <property name="can_focus">False</property>
1635 <property name="n_rows">2</property>
1636 <property name="n_columns">2</property>
1637 <property name="column_spacing">6</property>
1638 <property name="row_spacing">6</property>
1639 <child>
1640 <object class="GtkLabel" id="label38b">
1641 <property name="width_request">100</property>
1642 <property name="visible">True</property>
1643 <property name="can_focus">False</property>
1644 <property name="xalign">0</property>
1645 <property name="label" translatable="yes">Quality:</property>
1646 </object>
1647 <packing>
1648 <property name="x_options">GTK_FILL</property>
1649 <property name="y_options"></property>
1650 </packing>
1651 </child>
1652 <child>
1653 <object class="GtkComboBox" id="opus_quality">
1654 <property name="visible">True</property>
1655 <property name="can_focus">False</property>
1656 <property name="model">liststore2</property>
1657 <signal name="changed" handler="on_opus_quality_changed" swapped="no"/>
1658 <child>
1659 <object class="GtkCellRendererText" id="cellrenderertext2b"/>
1660 <attributes>
1661 <attribute name="text">0</attribute>
1662 </attributes>
1663 </child>
1664 </object>
1665 <packing>
1666 <property name="left_attach">1</property>
1667 <property name="right_attach">2</property>
1668 <property name="y_options">GTK_FILL</property>
1669 </packing>
1670 </child>
1671 <child>
1672 <placeholder/>
1673 </child>
1674 <child>
1675 <placeholder/>
1676 </child>
1677 </object>
1678 <packing>
1679 <property name="position">5</property>
1680 </packing>
1681 </child>
1682 <child type="tab">
1683 <object class="GtkLabel" id="label111b">
1684 <property name="visible">True</property>
1685 <property name="can_focus">False</property>
1686 <property name="label" translatable="yes">Opus</property>
1687 </object>
1688 <packing>
1689 <property name="position">5</property>
1690 <property name="tab_fill">False</property>
1691 </packing>
1692 </child>
1693 <child>
1629 <object class="GtkTable" id="table7">1694 <object class="GtkTable" id="table7">
1630 <property name="visible">True</property>1695 <property name="visible">True</property>
1631 <property name="can_focus">False</property>1696 <property name="can_focus">False</property>
@@ -1667,7 +1732,7 @@
1667 </child>1732 </child>
1668 </object>1733 </object>
1669 <packing>1734 <packing>
1670 <property name="position">5</property>1735 <property name="position">6</property>
1671 </packing>1736 </packing>
1672 </child>1737 </child>
1673 <child type="tab">1738 <child type="tab">
@@ -1677,7 +1742,7 @@
1677 <property name="label" translatable="yes">gst-profile</property>1742 <property name="label" translatable="yes">gst-profile</property>
1678 </object>1743 </object>
1679 <packing>1744 <packing>
1680 <property name="position">5</property>1745 <property name="position">6</property>
1681 <property name="tab_fill">False</property>1746 <property name="tab_fill">False</property>
1682 </packing>1747 </packing>
1683 </child>1748 </child>
16841749
=== 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 @@
1soundconverter (2.0.4-0ubuntu1) raring; urgency=low
2
3 * New upstream release (LP: #1077508).
4 - Disable common path when creating folders using tags (LP: #972158).
5 - Increase Low pass filter frequency when converting to MP3 (LP: #881413).
6 - Use original filename as title when tags are not present (LP: #984790).
7 - Fix command line arguments parsing (LP: #995862).
8 - Fix problem with AAC settings (LP: #954555).
9 - Fix yet another problem with URIs handling (LP: #998371).
10
11 -- Logan Rosen <logatronico@gmail.com> Wed, 21 Nov 2012 12:38:13 -0500
12
1soundconverter (2.0.1-1) unstable; urgency=low13soundconverter (2.0.1-1) unstable; urgency=low
214
3 * New upstream version.15 * New upstream version.
416
=== 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 @@
1Source: soundconverter1Source: soundconverter
2Maintainer: Lars Wirzenius <liw@liw.fi>2Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
3XSBC-Original-Maintainer: Lars Wirzenius <liw@liw.fi>
3Section: gnome4Section: gnome
4Priority: optional5Priority: optional
5Build-Depends: debhelper (>= 9.20120115), python (>= 2.6.3-3)6Build-Depends: debhelper (>= 9.20120115), python (>= 2.6.3-3)
67
=== 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 @@
1# Makefile.in generated by automake 1.11.1 from Makefile.am.1# Makefile.in generated by automake 1.11.6 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,5# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6# Inc.6# Foundation, Inc.
7# This Makefile.in is free software; the Free Software Foundation7# This Makefile.in is free software; the Free Software Foundation
8# gives unlimited permission to copy and/or distribute it,8# gives unlimited permission to copy and/or distribute it,
9# with or without modifications, as long as this notice is preserved.9# with or without modifications, as long as this notice is preserved.
@@ -15,6 +15,23 @@
1515
16@SET_MAKE@16@SET_MAKE@
17VPATH = @srcdir@17VPATH = @srcdir@
18am__make_dryrun = \
19 { \
20 am__dry=no; \
21 case $$MAKEFLAGS in \
22 *\\[\ \ ]*) \
23 echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
24 | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
25 *) \
26 for am__flg in $$MAKEFLAGS; do \
27 case $$am__flg in \
28 *=*|--*) ;; \
29 *n*) am__dry=yes; break;; \
30 esac; \
31 done;; \
32 esac; \
33 test $$am__dry = yes; \
34 }
18pkgdatadir = $(datadir)/@PACKAGE@35pkgdatadir = $(datadir)/@PACKAGE@
19pkgincludedir = $(includedir)/@PACKAGE@36pkgincludedir = $(includedir)/@PACKAGE@
20pkglibdir = $(libdir)/@PACKAGE@37pkglibdir = $(libdir)/@PACKAGE@
@@ -42,6 +59,11 @@
42CONFIG_CLEAN_VPATH_FILES =59CONFIG_CLEAN_VPATH_FILES =
43SOURCES =60SOURCES =
44DIST_SOURCES =61DIST_SOURCES =
62am__can_run_installinfo = \
63 case $$AM_UPDATE_INFO_DIR in \
64 n|no|NO) false;; \
65 *) (install-info --version) >/dev/null 2>&1;; \
66 esac
45am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;67am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
46am__vpath_adj = case $$p in \68am__vpath_adj = case $$p in \
47 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \69 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -63,6 +85,12 @@
63am__base_list = \85am__base_list = \
64 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \86 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
65 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'87 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
88am__uninstall_files_from_dir = { \
89 test -z "$$files" \
90 || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
91 || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
92 $(am__cd) "$$dir" && rm -f $$files; }; \
93 }
66man1dir = $(mandir)/man194man1dir = $(mandir)/man1
67am__installdirs = "$(DESTDIR)$(man1dir)"95am__installdirs = "$(DESTDIR)$(man1dir)"
68NROFF = nroff96NROFF = nroff
@@ -71,6 +99,7 @@
71ACLOCAL = @ACLOCAL@99ACLOCAL = @ACLOCAL@
72ALL_LINGUAS = @ALL_LINGUAS@100ALL_LINGUAS = @ALL_LINGUAS@
73AMTAR = @AMTAR@101AMTAR = @AMTAR@
102AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
74AUTOCONF = @AUTOCONF@103AUTOCONF = @AUTOCONF@
75AUTOHEADER = @AUTOHEADER@104AUTOHEADER = @AUTOHEADER@
76AUTOMAKE = @AUTOMAKE@105AUTOMAKE = @AUTOMAKE@
@@ -106,6 +135,10 @@
106INTLTOOL_MERGE = @INTLTOOL_MERGE@135INTLTOOL_MERGE = @INTLTOOL_MERGE@
107INTLTOOL_PERL = @INTLTOOL_PERL@136INTLTOOL_PERL = @INTLTOOL_PERL@
108INTLTOOL_UPDATE = @INTLTOOL_UPDATE@137INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
138INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
139INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
140INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
141INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
109LDFLAGS = @LDFLAGS@142LDFLAGS = @LDFLAGS@
110LIBOBJS = @LIBOBJS@143LIBOBJS = @LIBOBJS@
111LIBS = @LIBS@144LIBS = @LIBS@
@@ -163,6 +196,8 @@
163includedir = @includedir@196includedir = @includedir@
164infodir = @infodir@197infodir = @infodir@
165install_sh = @install_sh@198install_sh = @install_sh@
199intltool__v_merge_options_ = @intltool__v_merge_options_@
200intltool__v_merge_options_0 = @intltool__v_merge_options_0@
166libdir = @libdir@201libdir = @libdir@
167libexecdir = @libexecdir@202libexecdir = @libexecdir@
168localedir = @localedir@203localedir = @localedir@
@@ -223,11 +258,18 @@
223$(am__aclocal_m4_deps):258$(am__aclocal_m4_deps):
224install-man1: $(man_MANS)259install-man1: $(man_MANS)
225 @$(NORMAL_INSTALL)260 @$(NORMAL_INSTALL)
226 test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"261 @list1=''; \
227 @list=''; test -n "$(man1dir)" || exit 0; \262 list2='$(man_MANS)'; \
228 { for i in $$list; do echo "$$i"; done; \263 test -n "$(man1dir)" \
229 l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \264 && test -n "`echo $$list1$$list2`" \
230 sed -n '/\.1[a-z]*$$/p'; \265 || exit 0; \
266 echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
267 $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
268 { for i in $$list1; do echo "$$i"; done; \
269 if test -n "$$list2"; then \
270 for i in $$list2; do echo "$$i"; done \
271 | sed -n '/\.1[a-z]*$$/p'; \
272 fi; \
231 } | while read p; do \273 } | while read p; do \
232 if test -f $$p; then d=; else d="$(srcdir)/"; fi; \274 if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
233 echo "$$d$$p"; echo "$$p"; \275 echo "$$d$$p"; echo "$$p"; \
@@ -256,9 +298,7 @@
256 sed -n '/\.1[a-z]*$$/p'; \298 sed -n '/\.1[a-z]*$$/p'; \
257 } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \299 } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
258 -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \300 -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
259 test -z "$$files" || { \301 dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
260 echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
261 cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
262tags: TAGS302tags: TAGS
263TAGS:303TAGS:
264304
@@ -326,10 +366,15 @@
326366
327installcheck: installcheck-am367installcheck: installcheck-am
328install-strip:368install-strip:
329 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \369 if test -z '$(STRIP)'; then \
330 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \370 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
331 `test -z '$(STRIP)' || \371 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
332 echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install372 install; \
373 else \
374 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
375 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
376 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
377 fi
333mostlyclean-generic:378mostlyclean-generic:
334379
335clean-generic:380clean-generic:
336381
=== 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 @@
21Set the output MIME type for batch mode.21Set the output MIME type for batch mode.
22The default is audio/x-vorbis.22The default is audio/x-vorbis.
23Note that you probably want to set the output suffix as well.23Note that you probably want to set the output suffix as well.
24You can also use shortcuts: aac, flac, mp3, vorbis, wav.
24.TP25.TP
25.BR \-q ", "\-\-quiet26.BR \-q ", "\-\-quiet
26Be quiet.27Be quiet.
2728
=== 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 @@
1#!/bin/sh1#!/bin/sh
2# install - install a program, script, or datafile2# install - install a program, script, or datafile
33
4scriptversion=2009-04-28.21; # UTC4scriptversion=2011-01-19.21; # UTC
55
6# This originates from X11R5 (mit/util/scripts/install.sh), which was6# This originates from X11R5 (mit/util/scripts/install.sh), which was
7# later released in X11R6 (xc/config/util/install.sh) with the7# later released in X11R6 (xc/config/util/install.sh) with the
@@ -156,6 +156,10 @@
156 -s) stripcmd=$stripprog;;156 -s) stripcmd=$stripprog;;
157157
158 -t) dst_arg=$2158 -t) dst_arg=$2
159 # Protect names problematic for `test' and other utilities.
160 case $dst_arg in
161 -* | [=\(\)!]) dst_arg=./$dst_arg;;
162 esac
159 shift;;163 shift;;
160164
161 -T) no_target_directory=true;;165 -T) no_target_directory=true;;
@@ -186,6 +190,10 @@
186 fi190 fi
187 shift # arg191 shift # arg
188 dst_arg=$arg192 dst_arg=$arg
193 # Protect names problematic for `test' and other utilities.
194 case $dst_arg in
195 -* | [=\(\)!]) dst_arg=./$dst_arg;;
196 esac
189 done197 done
190fi198fi
191199
@@ -200,7 +208,11 @@
200fi208fi
201209
202if test -z "$dir_arg"; then210if test -z "$dir_arg"; then
203 trap '(exit $?); exit' 1 2 13 15211 do_exit='(exit $ret); exit $ret'
212 trap "ret=129; $do_exit" 1
213 trap "ret=130; $do_exit" 2
214 trap "ret=141; $do_exit" 13
215 trap "ret=143; $do_exit" 15
204216
205 # Set umask so as not to create temps with too-generous modes.217 # Set umask so as not to create temps with too-generous modes.
206 # However, 'strip' requires both read and write access to temps.218 # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@
228240
229for src241for src
230do242do
231 # Protect names starting with `-'.243 # Protect names problematic for `test' and other utilities.
232 case $src in244 case $src in
233 -*) src=./$src;;245 -* | [=\(\)!]) src=./$src;;
234 esac246 esac
235247
236 if test -n "$dir_arg"; then248 if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@
252 echo "$0: no destination specified." >&2264 echo "$0: no destination specified." >&2
253 exit 1265 exit 1
254 fi266 fi
255
256 dst=$dst_arg267 dst=$dst_arg
257 # Protect names starting with `-'.
258 case $dst in
259 -*) dst=./$dst;;
260 esac
261268
262 # If destination is a directory, append the input filename; won't work269 # If destination is a directory, append the input filename; won't work
263 # if double slashes aren't ignored.270 # if double slashes aren't ignored.
@@ -385,7 +392,7 @@
385392
386 case $dstdir in393 case $dstdir in
387 /*) prefix='/';;394 /*) prefix='/';;
388 -*) prefix='./';;395 [-=\(\)!]*) prefix='./';;
389 *) prefix='';;396 *) prefix='';;
390 esac397 esac
391398
@@ -403,7 +410,7 @@
403410
404 for d411 for d
405 do412 do
406 test -z "$d" && continue413 test X"$d" = X && continue
407414
408 prefix=$prefix$d415 prefix=$prefix$d
409 if test -d "$prefix"; then416 if test -d "$prefix"; then
410417
=== modified file 'missing'
--- missing 2011-11-26 12:14:13 +0000
+++ missing 2012-11-21 17:48:22 +0000
@@ -1,10 +1,10 @@
1#! /bin/sh1#! /bin/sh
2# Common stub for a few missing GNU programs while installing.2# Common stub for a few missing GNU programs while installing.
33
4scriptversion=2009-04-28.21; # UTC4scriptversion=2012-01-06.13; # UTC
55
6# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,6# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
7# 2008, 2009 Free Software Foundation, Inc.7# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
8# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.8# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
99
10# This program is free software; you can redistribute it and/or modify10# This program is free software; you can redistribute it and/or modify
@@ -84,7 +84,6 @@
84 help2man touch the output file84 help2man touch the output file
85 lex create \`lex.yy.c', if possible, from existing .c85 lex create \`lex.yy.c', if possible, from existing .c
86 makeinfo touch the output file86 makeinfo touch the output file
87 tar try tar, gnutar, gtar, then tar without non-portable flags
88 yacc create \`y.tab.[ch]', if possible, from existing .[ch]87 yacc create \`y.tab.[ch]', if possible, from existing .[ch]
8988
90Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and89Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
@@ -122,15 +121,6 @@
122 # Not GNU programs, they don't have --version.121 # Not GNU programs, they don't have --version.
123 ;;122 ;;
124123
125 tar*)
126 if test -n "$run"; then
127 echo 1>&2 "ERROR: \`tar' requires --run"
128 exit 1
129 elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
130 exit 1
131 fi
132 ;;
133
134 *)124 *)
135 if test -z "$run" && ($1 --version) > /dev/null 2>&1; then125 if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
136 # We have it, but it failed.126 # We have it, but it failed.
@@ -226,7 +216,7 @@
226 \`Bison' from any GNU archive site."216 \`Bison' from any GNU archive site."
227 rm -f y.tab.c y.tab.h217 rm -f y.tab.c y.tab.h
228 if test $# -ne 1; then218 if test $# -ne 1; then
229 eval LASTARG="\${$#}"219 eval LASTARG=\${$#}
230 case $LASTARG in220 case $LASTARG in
231 *.y)221 *.y)
232 SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`222 SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -256,7 +246,7 @@
256 \`Flex' from any GNU archive site."246 \`Flex' from any GNU archive site."
257 rm -f lex.yy.c247 rm -f lex.yy.c
258 if test $# -ne 1; then248 if test $# -ne 1; then
259 eval LASTARG="\${$#}"249 eval LASTARG=\${$#}
260 case $LASTARG in250 case $LASTARG in
261 *.l)251 *.l)
262 SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`252 SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -318,41 +308,6 @@
318 touch $file308 touch $file
319 ;;309 ;;
320310
321 tar*)
322 shift
323
324 # We have already tried tar in the generic part.
325 # Look for gnutar/gtar before invocation to avoid ugly error
326 # messages.
327 if (gnutar --version > /dev/null 2>&1); then
328 gnutar "$@" && exit 0
329 fi
330 if (gtar --version > /dev/null 2>&1); then
331 gtar "$@" && exit 0
332 fi
333 firstarg="$1"
334 if shift; then
335 case $firstarg in
336 *o*)
337 firstarg=`echo "$firstarg" | sed s/o//`
338 tar "$firstarg" "$@" && exit 0
339 ;;
340 esac
341 case $firstarg in
342 *h*)
343 firstarg=`echo "$firstarg" | sed s/h//`
344 tar "$firstarg" "$@" && exit 0
345 ;;
346 esac
347 fi
348
349 echo 1>&2 "\
350WARNING: I can't seem to be able to run \`tar' with the given arguments.
351 You may want to install GNU tar or Free paxutils, or check the
352 command line arguments."
353 exit 1
354 ;;
355
356 *)311 *)
357 echo 1>&2 "\312 echo 1>&2 "\
358WARNING: \`$1' is needed, and is $msg.313WARNING: \`$1' is needed, and is $msg.
359314
=== 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 @@
49XGETTEXT = @XGETTEXT@49XGETTEXT = @XGETTEXT@
50INTLTOOL_UPDATE = @INTLTOOL_UPDATE@50INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
51INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@51INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
52MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist52MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
53GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot53GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
5454
55ALL_LINGUAS = @ALL_LINGUAS@55ALL_LINGUAS = @ALL_LINGUAS@
5656
@@ -73,15 +73,20 @@
73.SUFFIXES:73.SUFFIXES:
74.SUFFIXES: .po .pox .gmo .mo .msg .cat74.SUFFIXES: .po .pox .gmo .mo .msg .cat
7575
76AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
77INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V))
78INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY))
79INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@;
80
76.po.pox:81.po.pox:
77 $(MAKE) $(GETTEXT_PACKAGE).pot82 $(MAKE) $(GETTEXT_PACKAGE).pot
78 $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox83 $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
7984
80.po.mo:85.po.mo:
81 $(MSGFMT) -o $@ $<86 $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
8287
83.po.gmo:88.po.gmo:
84 file=`echo $* | sed 's,.*/,,'`.gmo \89 $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \
85 && rm -f $$file && $(GMSGFMT) -o $$file $<90 && rm -f $$file && $(GMSGFMT) -o $$file $<
8691
87.po.cat:92.po.cat:
8893
=== 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 @@
7msgstr ""7msgstr ""
8"Project-Id-Version: soundconverter\n"8"Project-Id-Version: soundconverter\n"
9"Report-Msgid-Bugs-To: \n"9"Report-Msgid-Bugs-To: \n"
10"POT-Creation-Date: 2012-01-12 22:56+0100\n"10"POT-Creation-Date: 2012-07-30 15:28+0000\n"
11"PO-Revision-Date: 2012-01-13 04:02+0000\n"11"PO-Revision-Date: 2012-07-07 13:53+0000\n"
12"Last-Translator: GautierPortet <kassoulet@gmail.com>\n"12"Last-Translator: uwe <maysara.abdulhaq@gmail.com>\n"
13"Language-Team: Arabic <ar@li.org>\n"13"Language-Team: Arabic <ar@li.org>\n"
14"MIME-Version: 1.0\n"14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2012-01-18 21:12+0000\n"17"X-Launchpad-Export-Date: 2012-10-06 15:24+0000\n"
18"X-Generator: Launchpad (build 14681)\n"18"X-Generator: Launchpad (build 16061)\n"
19"Language: ar\n"19"Language: ar\n"
2020
21#: ../data/soundconverter.desktop.in.in.h:121#: ../data/soundconverter.desktop.in.in.h:1
22msgid "Sound Converter"
23msgstr "محول صيغ صوتية"
24
25#: ../data/soundconverter.desktop.in.in.h:2
22msgid "Audio Format Converter"26msgid "Audio Format Converter"
23msgstr "محول صيغ الملفات الصوتية"27msgstr "محول صيغ الملفات الصوتية"
2428
25#: ../data/soundconverter.desktop.in.in.h:2
26msgid "Convert audio files into other formats"
27msgstr "تحويل الملفات الصوتيه الى صيغ اخرى"
28
29#: ../data/soundconverter.desktop.in.in.h:329#: ../data/soundconverter.desktop.in.in.h:3
30msgid "Sound Converter"30msgid "Converts audio files into other formats"
31msgstr "محول صيغ صوتية"31msgstr ""
3232
33#: ../data/soundconverter.glade.h:133#: ../data/soundconverter.glade.h:1
34msgid "16 bits (default)"34msgid "GNOME-powered Sound Conversion"
35msgstr "16 بت(الافتراضي)"35msgstr ""
3636
37#: ../data/soundconverter.glade.h:237#: ../data/soundconverter.glade.h:2
38msgid "32 bits"38msgid "Website"
39msgstr "32 بت"39msgstr "موقع الويب"
4040
41#: ../data/soundconverter.glade.h:341#: ../data/soundconverter.glade.h:3
42msgid "8 bits (very low quality)"42msgid "dialog1"
43msgstr "8 بت (جودة منخفصة جدا )"43msgstr "حوار1"
4444
45#: ../data/soundconverter.glade.h:445#: ../data/soundconverter.glade.h:4
46msgid "<b>How to name files?</b>"46msgid "Filter "
47msgstr "<b >كيفية تسمية الملفات ؟ </b>"47msgstr "المرشّح "
4848
49#: ../data/soundconverter.glade.h:549#: ../data/soundconverter.glade.h:5
50msgid "<b>Type of result?</b>"50msgid "Error"
51msgstr "<b>نوع النتائج ؟</b>"51msgstr "خطأ"
5252
53#: ../data/soundconverter.glade.h:653#: ../data/soundconverter.glade.h:6
54msgid "<b>Where to place results?</b>"54msgid "File exists already"
55msgstr "<b >اين تحفظ النتائج ؟ </b>"55msgstr "الملف موجود بالفعل"
5656
57#: ../data/soundconverter.glade.h:757#: ../data/soundconverter.glade.h:7
58msgid "_Overwrite"
59msgstr "ا_كتب فوقه"
60
61#: ../data/soundconverter.glade.h:8
62msgid "_Skip"
63msgstr "_تخطّي"
64
65#: ../data/soundconverter.glade.h:9
58msgid "<big><b>File exists already</b></big>\n"66msgid "<big><b>File exists already</b></big>\n"
59msgstr "<big><b>الملف موجود مسبقا</b></big>\n"67msgstr "<big><b>الملف موجود مسبقا</b></big>\n"
6068
61#: ../data/soundconverter.glade.h:9
62msgid "<i>Example filename:</i>"
63msgstr "<i>مثال لإسم الملف:</i>"
64
65#: ../data/soundconverter.glade.h:10
66msgid "AAC"
67msgstr "أي أي سي (AAC)"
68
69#: ../data/soundconverter.glade.h:1169#: ../data/soundconverter.glade.h:11
70msgid "AAC (.m4a)"70msgid "_Apply to entire queue"
71msgstr ""71msgstr "_طبق على كل القائمة"
7272
73#: ../data/soundconverter.glade.h:1273#: ../data/soundconverter.glade.h:12 ../soundconverter/ui.py:387
74msgid "Add _Folder"74msgid "artist/album"
75msgstr "إضافة _مجلد"75msgstr "فنان/ألبوم"
7676
77#: ../data/soundconverter.glade.h:1377#: ../data/soundconverter.glade.h:13 ../soundconverter/ui.py:389
78msgid "Average (ABR)"78msgid "artist - album"
79msgstr "معدل (َABR)"79msgstr "الفنان - الألبوم"
8080
81#: ../data/soundconverter.glade.h:1481#: ../data/soundconverter.glade.h:14
82msgid "Better (Slower)"82msgid "Very Low"
83msgstr "أفضل (أبطأ)"83msgstr "منخفض جداً"
8484
85#: ../data/soundconverter.glade.h:1585#: ../data/soundconverter.glade.h:15
86msgid "Bitrate mode:"86msgid "Low"
87msgstr "نمط معدل البت"87msgstr "منخفض"
8888
89#: ../data/soundconverter.glade.h:1689#: ../data/soundconverter.glade.h:16
90msgid "Choose..."90msgid "Normal"
91msgstr "إختر..."91msgstr "عادي"
9292
93#: ../data/soundconverter.glade.h:1793#: ../data/soundconverter.glade.h:17
94msgid "Compression:"94msgid "High"
95msgstr "الظغط"95msgstr ""
9696
97#: ../data/soundconverter.glade.h:1897#: ../data/soundconverter.glade.h:18
98msgid "Constant (CBR)"98msgid "Very High"
99msgstr ""99msgstr "عالي جدا"
100100
101#: ../data/soundconverter.glade.h:19101#: ../data/soundconverter.glade.h:19
102msgid "Create subfolders: "102msgid "Insanely High"
103msgstr "إنشاء مجلدات فرعية: "103msgstr ""
104104
105#: ../data/soundconverter.glade.h:20105#: ../data/soundconverter.glade.h:20
106msgid "Default"106msgid "8 bits (very low quality)"
107msgstr "إفتراضي"107msgstr "8 بت (جودة منخفصة جدا )"
108108
109#: ../data/soundconverter.glade.h:21109#: ../data/soundconverter.glade.h:21
110msgid "Delete original file"110msgid "16 bits (default)"
111msgstr "حذف الملف الأصلي"111msgstr "16 بت(الافتراضي)"
112112
113#: ../data/soundconverter.glade.h:22113#: ../data/soundconverter.glade.h:22
114msgid "Error"114msgid "32 bits"
115msgstr "خطأ"115msgstr "32 بت"
116116
117#: ../data/soundconverter.glade.h:23117#: ../data/soundconverter.glade.h:23
118msgid "FLAC"118msgid "Less (Faster)"
119msgstr "FLAC"119msgstr ""
120120
121#: ../data/soundconverter.glade.h:24121#: ../data/soundconverter.glade.h:24
122msgid "FLAC Lossless (.flac)"122msgid "Default"
123msgstr ""123msgstr "إفتراضي"
124124
125#: ../data/soundconverter.glade.h:25125#: ../data/soundconverter.glade.h:25
126msgid "File exists already"126msgid "Better (Slower)"
127msgstr "الملف موجود بالفعل"127msgstr "أفضل (أبطأ)"
128128
129#: ../data/soundconverter.glade.h:26129#: ../data/soundconverter.glade.h:26
130msgid "Filename pattern: "130msgid "Constant (CBR)"
131msgstr "نمط إسم الملف: "131msgstr ""
132132
133#: ../data/soundconverter.glade.h:27133#: ../data/soundconverter.glade.h:27
134msgid "Filter "134msgid "Average (ABR)"
135msgstr "المرشّح "135msgstr "معدل (َABR)"
136136
137#: ../data/soundconverter.glade.h:28137#: ../data/soundconverter.glade.h:28
138msgid "Force mono output"138msgid "Variable (VBR) - Best quality"
139msgstr ""139msgstr "متغير (VBR) - جودة أفضل"
140140
141#: ../data/soundconverter.glade.h:29141#: ../data/soundconverter.glade.h:29
142msgid "Format: "142msgid "Ogg Vorbis (.ogg)"
143msgstr "الصيغة: "143msgstr ""
144144
145#: ../data/soundconverter.glade.h:30145#: ../data/soundconverter.glade.h:30
146msgid "GNOME Audio Profile"146msgid "MP3 (.mp3)"
147msgstr ""147msgstr ""
148148
149#: ../data/soundconverter.glade.h:31149#: ../data/soundconverter.glade.h:31
150msgid "GNOME-powered Sound Conversion"150msgid "FLAC Lossless (.flac)"
151msgstr ""151msgstr ""
152152
153#: ../data/soundconverter.glade.h:32153#: ../data/soundconverter.glade.h:32
154msgid "High"154msgid "MS Wave (.wav)"
155msgstr ""155msgstr ""
156156
157#: ../data/soundconverter.glade.h:33157#: ../data/soundconverter.glade.h:33
158msgid "Insanely High"158msgid "AAC (.m4a)"
159msgstr ""159msgstr ""
160160
161#: ../data/soundconverter.glade.h:34161#: ../data/soundconverter.glade.h:34
162msgid "Into a specified folder"162msgid "GNOME Audio Profile"
163msgstr "داخل المجلد المحدد"163msgstr ""
164164
165#: ../data/soundconverter.glade.h:35165#: ../data/soundconverter.glade.h:35
166msgid "Less (Faster)"166msgid "track_number - track_title"
167msgstr ""167msgstr "رقم_المسار-عنوان_المسار"
168168
169#: ../data/soundconverter.glade.h:36169#: ../data/soundconverter.glade.h:36
170msgid "Limit number of parallel jobs"170msgid "track_title"
171msgstr ""171msgstr "عنوان_المسار"
172172
173#: ../data/soundconverter.glade.h:37173#: ../data/soundconverter.glade.h:37
174msgid "Low"174msgid "Preferences"
175msgstr "منخفض"175msgstr "خصائص"
176176
177#: ../data/soundconverter.glade.h:38177#: ../data/soundconverter.glade.h:38
178msgid "MP3"178msgid "Same folder as the input file"
179msgstr "MP3"179msgstr "نفس مجلد الملف المدخل"
180180
181#: ../data/soundconverter.glade.h:39181#: ../data/soundconverter.glade.h:39
182msgid "MP3 (.mp3)"182msgid "Choose..."
183msgstr ""183msgstr "إختر..."
184184
185#: ../data/soundconverter.glade.h:40185#: ../data/soundconverter.glade.h:40
186msgid "MP3 Encoder is not present."186msgid "Into a specified folder"
187msgstr "مشفر MP3 غير موجود"187msgstr "داخل المجلد المحدد"
188188
189#: ../data/soundconverter.glade.h:41189#: ../data/soundconverter.glade.h:41
190msgid "MS Wave (.wav)"190msgid "Create subfolders: "
191msgstr ""191msgstr "إنشاء مجلدات فرعية: "
192192
193#: ../data/soundconverter.glade.h:42193#: ../data/soundconverter.glade.h:42
194msgid "Normal"194msgid "Delete original file"
195msgstr "عادي"195msgstr "حذف الملف الأصلي"
196196
197#: ../data/soundconverter.glade.h:43197#: ../data/soundconverter.glade.h:43
198msgid "Ogg"198msgid "<b>Where to place results?</b>"
199msgstr ""199msgstr "<b >اين تحفظ النتائج ؟ </b>"
200200
201#: ../data/soundconverter.glade.h:44201#: ../data/soundconverter.glade.h:44
202msgid "Ogg Vorbis (.ogg)"202msgid "Filename pattern: "
203msgstr ""203msgstr "نمط إسم الملف: "
204204
205#: ../data/soundconverter.glade.h:45205#: ../data/soundconverter.glade.h:45
206msgid "Preferences"206msgid "Replace all messy characters"
207msgstr "خصائص"207msgstr ""
208208
209#: ../data/soundconverter.glade.h:46209#: ../data/soundconverter.glade.h:46
210msgid "Profile:"210msgid "Remove all characters except letters, digits and ./_-"
211msgstr ""211msgstr ""
212212
213#: ../data/soundconverter.glade.h:47213#: ../data/soundconverter.glade.h:47
214msgid "Quality:"214msgid "<i>Example filename:</i>"
215msgstr "الجودة:"215msgstr "<i>مثال لإسم الملف:</i>"
216216
217#: ../data/soundconverter.glade.h:48217#: ../data/soundconverter.glade.h:48
218msgid "Read how to install"218msgid "<b>How to name files?</b>"
219msgstr "إقرأ كيفية التثبيت"219msgstr "<b >كيفية تسمية الملفات ؟ </b>"
220220
221#: ../data/soundconverter.glade.h:49221#: ../data/soundconverter.glade.h:49
222msgid "Remove all chars except letters, digits and ./_-"222msgid "Format: "
223msgstr "حذف كل المحارف عدا الأحرف,الأرقام و ./_-"223msgstr "الصيغة: "
224224
225#: ../data/soundconverter.glade.h:50225#: ../data/soundconverter.glade.h:50
226msgid "Replace all messy characters"226msgid "Quality:"
227msgstr ""227msgstr "الجودة:"
228228
229#: ../data/soundconverter.glade.h:51229#: ../data/soundconverter.glade.h:51
230msgid "Resample"230msgid "Use .oga extension"
231msgstr "إعاده التشكيل"231msgstr "استعمل صيغة .oga"
232232
233#: ../data/soundconverter.glade.h:52233#: ../data/soundconverter.glade.h:52
234msgid "Same folder as the input file"234msgid "Ogg"
235msgstr "نفس مجلد الملف المدخل"235msgstr ""
236236
237#: ../data/soundconverter.glade.h:53237#: ../data/soundconverter.glade.h:53
238msgid "Sample width:"238msgid "Bitrate mode:"
239msgstr ""239msgstr "نمط معدل البت"
240240
241#: ../data/soundconverter.glade.h:54241#: ../data/soundconverter.glade.h:54
242msgid "SoundConverter"242msgid "MP3"
243msgstr "محول الصوتيات"243msgstr "MP3"
244244
245#: ../data/soundconverter.glade.h:55245#: ../data/soundconverter.glade.h:55
246msgid "Use .oga extension"246msgid "Compression:"
247msgstr "استعمل صيغة .oga"247msgstr "الظغط"
248248
249#: ../data/soundconverter.glade.h:56249#: ../data/soundconverter.glade.h:56
250msgid "Variable (VBR) - Best quality"250msgid "FLAC"
251msgstr "متغير (VBR) - جودة أفضل"251msgstr "FLAC"
252252
253#: ../data/soundconverter.glade.h:57253#: ../data/soundconverter.glade.h:57
254msgid "Very High"254msgid "Sample width:"
255msgstr "عالي جدا"255msgstr ""
256256
257#: ../data/soundconverter.glade.h:58257#: ../data/soundconverter.glade.h:58
258msgid "Very Low"
259msgstr "منخفض جداً"
260
261#: ../data/soundconverter.glade.h:59
262msgid "WAV"258msgid "WAV"
263msgstr "WAV"259msgstr "WAV"
264260
261#: ../data/soundconverter.glade.h:59
262msgid "AAC"
263msgstr "أي أي سي (AAC)"
264
265#: ../data/soundconverter.glade.h:60265#: ../data/soundconverter.glade.h:60
266msgid "Website"266msgid "Profile:"
267msgstr "موقع الويب"267msgstr ""
268268
269#: ../data/soundconverter.glade.h:61269#: ../data/soundconverter.glade.h:61
270msgid "Where to place results?"270msgid "gst-profile"
271msgstr "أين توضع النتائج؟"271msgstr ""
272272
273#: ../data/soundconverter.glade.h:62273#: ../data/soundconverter.glade.h:62
274msgid "_Add File"274msgid "<b>Type of result?</b>"
275msgstr "_إضافة ملف"275msgstr "<b>نوع النتائج ؟</b>"
276276
277#: ../data/soundconverter.glade.h:63277#: ../data/soundconverter.glade.h:63
278msgid "_Apply to entire queue"278msgid "Resample"
279msgstr "_طبق على كل القائمة"279msgstr "إعاده التشكيل"
280280
281#: ../data/soundconverter.glade.h:64281#: ../data/soundconverter.glade.h:64
282msgid "_Edit"282msgid "Force mono output"
283msgstr "_تحرير"283msgstr ""
284284
285#: ../data/soundconverter.glade.h:65285#: ../data/soundconverter.glade.h:65
286msgid "_File"286msgid "Limit number of parallel jobs"
287msgstr "_ملف"287msgstr ""
288288
289#: ../data/soundconverter.glade.h:66289#: ../data/soundconverter.glade.h:66
290msgid "_Help"290msgid "MP3 Encoder is not present."
291msgstr "_مساعدة"291msgstr "مشفر MP3 غير موجود"
292292
293#: ../data/soundconverter.glade.h:67293#: ../data/soundconverter.glade.h:67
294msgid "_Overwrite"294msgid "Read how to install"
295msgstr "ا_كتب فوقه"295msgstr "إقرأ كيفية التثبيت"
296296
297#: ../data/soundconverter.glade.h:68297#: ../data/soundconverter.glade.h:68
298msgid "_Skip"298msgid "Where to place results?"
299msgstr "_تخطّي"299msgstr "أين توضع النتائج؟"
300300
301#: ../data/soundconverter.glade.h:69 ../soundconverter/ui.py:408301#: ../data/soundconverter.glade.h:69
302msgid "artist - album"302msgid "SoundConverter"
303msgstr "الفنان - الألبوم"303msgstr "محول الصوتيات"
304304
305#: ../data/soundconverter.glade.h:70 ../soundconverter/ui.py:406305#: ../data/soundconverter.glade.h:70
306msgid "artist/album"306msgid "_File"
307msgstr "فنان/ألبوم"307msgstr "_ملف"
308308
309#: ../data/soundconverter.glade.h:71309#: ../data/soundconverter.glade.h:71
310msgid "dialog1"310msgid "_Edit"
311msgstr "حوار1"311msgstr "_تحرير"
312312
313#: ../data/soundconverter.glade.h:72313#: ../data/soundconverter.glade.h:72
314msgid "gst-profile"314msgid "_Help"
315msgstr ""315msgstr "_مساعدة"
316316
317#: ../data/soundconverter.glade.h:73317#: ../data/soundconverter.glade.h:73
318msgid "track_number - track_title"318msgid "_Add File"
319msgstr "رقم_المسار-عنوان_المسار"319msgstr "_إضافة ملف"
320320
321#: ../data/soundconverter.glade.h:74321#: ../data/soundconverter.glade.h:74
322msgid "track_title"322msgid "Add _Folder"
323msgstr "عنوان_المسار"323msgstr "إضافة _مجلد"
324324
325#: ../bin/soundconverter.py:97325#: ../bin/soundconverter.py:113
326msgid ""326msgid ""
327"Convert in batch mode, from command line, without a graphical user\n"327"Convert in batch mode, from command line, without a graphical user\n"
328" interface. You can use this from, say, shell scripts."328" interface. You can use this from, say, shell scripts."
@@ -330,42 +330,42 @@
330"تحويل في طور الصدفة, من سطر الأوامر, بدون واجهة رسومية للمستخدم\n"330"تحويل في طور الصدفة, من سطر الأوامر, بدون واجهة رسومية للمستخدم\n"
331" واجهة. يمكن إستخدام هذا, قول, البرامج النصية للصدفة."331" واجهة. يمكن إستخدام هذا, قول, البرامج النصية للصدفة."
332332
333#: ../bin/soundconverter.py:102333#: ../bin/soundconverter.py:118
334msgid ""334msgid ""
335"Show tags for input files instead of convertingthem. This indicates \n"335"Show tags for input files instead of converting them. This indicates \n"
336" command line batch modeand disables the graphical user interface."336" command line batch mode and disables the graphical user interface."
337msgstr ""337msgstr ""
338338
339#: ../bin/soundconverter.py:107339#: ../bin/soundconverter.py:122
340#, python-format340#, python-format
341msgid ""341msgid ""
342"Set the output MIME type for batch mode. The defaultis %s. Note that you "342"Set the output MIME type for batch mode. The default is %s. Note that you "
343"probably want to set the outputsuffix as well."343"probably want to set the output suffix as well."
344msgstr ""344msgstr ""
345345
346#: ../bin/soundconverter.py:111346#: ../bin/soundconverter.py:126
347msgid "Be quiet. Don't write normal output, only errors."347msgid "Be quiet. Don't write normal output, only errors."
348msgstr "كون هادئ. لا تكتب المخرج العادي, فقط الأخطاء."348msgstr "كون هادئ. لا تكتب المخرج العادي, فقط الأخطاء."
349349
350#: ../bin/soundconverter.py:113350#: ../bin/soundconverter.py:128
351msgid "Print additional debug information"351msgid "Displays additional debug information"
352msgstr "أظهر بيانات التنقيح الأضافية"352msgstr ""
353353
354#: ../bin/soundconverter.py:115354#: ../bin/soundconverter.py:130
355#, python-format355#, python-format
356msgid ""356msgid ""
357"Set the output filename suffix for batch mode.The default is %s . Note that "357"Set the output filename suffix for batch mode.The default is %s . Note that "
358"the suffix does notaffect\n"358"the suffix does not affect\n"
359" the output MIME type."359" the output MIME type."
360msgstr ""360msgstr ""
361361
362#: ../bin/soundconverter.py:119362#: ../bin/soundconverter.py:134
363msgid "Force number of concurrent conversions."363msgid "Force number of concurrent conversions."
364msgstr ""364msgstr ""
365365
366#: ../bin/soundconverter.py:121366#: ../bin/soundconverter.py:136
367msgid "Show GStreamer Options"367msgid "Shows GStreamer Options"
368msgstr "أظهر خيارات GStreamer"368msgstr ""
369369
370#: ../soundconverter/error.py:37370#: ../soundconverter/error.py:37
371msgid "Target exists."371msgid "Target exists."
@@ -419,50 +419,56 @@
419"خطأ : %s\n"419"خطأ : %s\n"
420"%s\n"420"%s\n"
421421
422#: ../soundconverter/gstreamer.py:482422#: ../soundconverter/gstreamer.py:189
423msgid "Plugin installation aborted."
424msgstr ""
425
426#. TODO: is this used ?
427#. TODO: add proper error management when an encoder cannot be created
428#: ../soundconverter/gstreamer.py:519
423#, python-format429#, python-format
424msgid "Cannot create a decoder for '%s' format."430msgid "Cannot create a decoder for '%s' format."
425msgstr ""431msgstr ""
426432
427#: ../soundconverter/gstreamer.py:499433#: ../soundconverter/gstreamer.py:530
428#, python-format434#, python-format
429msgid "Cannot create '%s' folder."435msgid "Cannot create '%s' folder."
430msgstr "لا يمكن إنشاء مجلد '%s'"436msgstr "لا يمكن إنشاء مجلد '%s'"
431437
432#. pass438#. pass
433#: ../soundconverter/gstreamer.py:543439#: ../soundconverter/gstreamer.py:571
434msgid "GStreamer Error:"440msgid "GStreamer Error:"
435msgstr ""441msgstr ""
436442
437#: ../soundconverter/gstreamer.py:627443#: ../soundconverter/gstreamer.py:656
438msgid "Conversion Canceled"444msgid "Conversion Canceled"
439msgstr "تم ألغاء التحويل"445msgstr "تم ألغاء التحويل"
440446
441#: ../soundconverter/gstreamer.py:634447#: ../soundconverter/gstreamer.py:663
442msgid "Conversion Error"448msgid "Conversion Error"
443msgstr "خطأ في التحويل"449msgstr "خطأ في التحويل"
444450
445#: ../soundconverter/gstreamer.py:667451#: ../soundconverter/gstreamer.py:696
446#, python-format452#, python-format
447msgid "Access denied: '%s'"453msgid "Access denied: '%s'"
448msgstr ""454msgstr ""
449455
450#: ../soundconverter/gstreamer.py:683456#: ../soundconverter/gstreamer.py:712
451msgid "Cannot overwrite source file(s)!"457msgid "Cannot overwrite source file(s)!"
452msgstr "لا يمكن استبدال الملفات الأصلية"458msgstr "لا يمكن استبدال الملفات الأصلية"
453459
454#: ../soundconverter/gstreamer.py:696460#: ../soundconverter/gstreamer.py:725
455#, python-format461#, python-format
456msgid ""462msgid ""
457"The output file <i>%s</i>\n"463"The output file <i>%s</i>\n"
458" exists already.\n"464" already exists.\n"
459" Do you want to skip the file, overwrite it or cancel the conversion?\n"465" Do you want to skip the file, overwrite it or cancel the conversion?\n"
460msgstr ""466msgstr ""
461467
462#: ../soundconverter/gstreamer.py:800468#: ../soundconverter/gstreamer.py:830
463#, python-format469#, python-format
464msgid "Conversion done, in %s"470msgid "Conversion done in %s"
465msgstr "التحويل تم، في '%s'"471msgstr ""
466472
467#: ../soundconverter/namegenerator.py:76473#: ../soundconverter/namegenerator.py:76
468msgid "Unknown Album"474msgid "Unknown Album"
@@ -472,22 +478,18 @@
472msgid "Unknown Artist"478msgid "Unknown Artist"
473msgstr ""479msgstr ""
474480
475#: ../soundconverter/namegenerator.py:78
476msgid "Unknown Title"
477msgstr ""
478
479#. traductors: These are the custom filename patterns. Only if it makes sense.481#. traductors: These are the custom filename patterns. Only if it makes sense.
480#: ../soundconverter/settings.py:43482#: ../soundconverter/settings.py:47
481msgid ""483msgid ""
482"Artist Album Title Track Total Genre Date Year Timestamp DiscNumber "484"Artist Album Title Track Total Genre Date Year Timestamp DiscNumber "
483"DiscTotal Ext"485"DiscTotal Ext"
484msgstr ""486msgstr ""
485487
486#: ../soundconverter/settings.py:80488#: ../soundconverter/settings.py:84
487msgid "All files"489msgid "All files"
488msgstr ""490msgstr ""
489491
490#: ../soundconverter/ui.py:123 ../soundconverter/ui.py:139492#: ../soundconverter/ui.py:96 ../soundconverter/ui.py:112
491#, python-format493#, python-format
492msgid ""494msgid ""
493"\n"495"\n"
@@ -495,93 +497,97 @@
495"%s\n"497"%s\n"
496msgstr ""498msgstr ""
497499
498#: ../soundconverter/ui.py:229500#: ../soundconverter/ui.py:202
499msgid "Scanning files..."501msgid "Scanning files..."
500msgstr ""502msgstr ""
501503
502#: ../soundconverter/ui.py:328504#: ../soundconverter/ui.py:309
503msgid "Adding files..."505msgid "Adding files..."
504msgstr ""506msgstr ""
505507
506#: ../soundconverter/ui.py:396508#: ../soundconverter/ui.py:377
507msgid "Same as input, but replacing the suffix"509msgid "Same as input, but replacing the suffix"
508msgstr ""510msgstr ""
509511
510#: ../soundconverter/ui.py:398512#: ../soundconverter/ui.py:379
511msgid "Same as input, but with an additional suffix"513msgid "Same as input, but with an additional suffix"
512msgstr ""514msgstr ""
513515
514#: ../soundconverter/ui.py:399516#: ../soundconverter/ui.py:380
515msgid "Track number - title"517msgid "Track number - title"
516msgstr ""518msgstr ""
517519
518#: ../soundconverter/ui.py:400520#: ../soundconverter/ui.py:381
519msgid "Track title"521msgid "Track title"
520msgstr ""522msgstr ""
521523
522#: ../soundconverter/ui.py:401524#: ../soundconverter/ui.py:382
523msgid "Artist - title"525msgid "Artist - title"
524msgstr "الفنان - العنوان"526msgstr "الفنان - العنوان"
525527
526#: ../soundconverter/ui.py:402528#: ../soundconverter/ui.py:383
527msgid "Custom filename pattern"529msgid "Custom filename pattern"
528msgstr "صيغة اسم ملف مخصصة"530msgstr "صيغة اسم ملف مخصصة"
529531
530#: ../soundconverter/ui.py:407532#: ../soundconverter/ui.py:388
531msgid "artist-album"533msgid "artist-album"
532msgstr "فنان-ألبوم"534msgstr "فنان-ألبوم"
533535
534#: ../soundconverter/ui.py:464536#: ../soundconverter/ui.py:445
535msgid "Available patterns:"537msgid "Available patterns:"
536msgstr ""538msgstr ""
537539
538#: ../soundconverter/ui.py:650540#: ../soundconverter/ui.py:631
539#, python-format541#, python-format
540msgid "Into folder %s"542msgid "Into folder %s"
541msgstr "في المجلد %s"543msgstr "في المجلد %s"
542544
543#: ../soundconverter/ui.py:727545#: ../soundconverter/ui.py:708
544#, python-format546#, python-format
545msgid "Target bitrate: %s"547msgid "Target bitrate: %s"
546msgstr "معدال البت المطلوب: '%s'"548msgstr "معدال البت المطلوب: '%s'"
547549
548#: ../soundconverter/ui.py:1069550#: ../soundconverter/ui.py:1050
549msgid "Open a file"551msgid "Open a file"
550msgstr ""552msgstr "افتح ملفا"
551553
552#: ../soundconverter/ui.py:1163554#: ../soundconverter/ui.py:1144
553msgid "Add Folder..."555msgid "Add Folder..."
554msgstr "إضافة مجلد..."556msgstr "إضافة مجلد..."
555557
556#: ../soundconverter/ui.py:1336558#: ../soundconverter/ui.py:1322
557msgid "Reading tags..."559msgid "Reading tags..."
560msgstr "تتم قراءة الوسوم..."
561
562#: ../soundconverter/ui.py:1324
563msgid "Preparing conversion..."
558msgstr ""564msgstr ""
559565
560#: ../soundconverter/ui.py:1347566#: ../soundconverter/ui.py:1339
561msgid "Conversion cancelled"567msgid "Conversion cancelled"
562msgstr ""568msgstr ""
563569
564#: ../soundconverter/ui.py:1350570#: ../soundconverter/ui.py:1342
565msgid "Error when converting"571msgid "Error when converting"
566msgstr ""572msgstr ""
567573
568#: ../soundconverter/ui.py:1364574#: ../soundconverter/ui.py:1357
569msgid "Converting"575msgid "Converting"
570msgstr "تحويل"576msgstr "تحويل"
571577
572#: ../soundconverter/ui.py:1384578#: ../soundconverter/ui.py:1377
573msgid "Canceled"579msgid "Canceled"
574msgstr "تم إلغاء الأمر"580msgstr "تم إلغاء الأمر"
575581
576#: ../soundconverter/ui.py:1457582#: ../soundconverter/ui.py:1450
577msgid "Paused"583msgid "Paused"
578msgstr "متوقّف مؤقتا"584msgstr "متوقّف مؤقتا"
579585
586#: ../soundconverter/ui.py:1468
587#, python-format
588msgid "%d:%02d left"
589msgstr ""
590
580#: ../soundconverter/ui.py:1474591#: ../soundconverter/ui.py:1474
581#, python-format
582msgid "%d:%02d left"
583msgstr ""
584
585#: ../soundconverter/ui.py:1480
586msgid "Ready"592msgid "Ready"
587msgstr "جاهز"593msgstr "جاهز"
588594
=== 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 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: soundconverter\n"9"Project-Id-Version: soundconverter\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2012-01-12 22:56+0100\n"11"POT-Creation-Date: 2012-07-30 15:28+0000\n"
12"PO-Revision-Date: 2012-01-13 03:56+0000\n"12"PO-Revision-Date: 2012-01-13 03:56+0000\n"
13"Last-Translator: Nikola Yanev <gericom.hummer@gmail.com>\n"13"Last-Translator: Nikola Yanev <gericom.hummer@gmail.com>\n"
14"Language-Team: English (United Kingdom) <en_GB@li.org>\n"14"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
15"MIME-Version: 1.0\n"15"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n"16"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"17"Content-Transfer-Encoding: 8bit\n"
18"X-Launchpad-Export-Date: 2012-01-18 21:12+0000\n"18"X-Launchpad-Export-Date: 2012-10-06 15:24+0000\n"
19"X-Generator: Launchpad (build 14681)\n"19"X-Generator: Launchpad (build 16061)\n"
20"Language: \n"20"Language: \n"
2121
22#: ../data/soundconverter.desktop.in.in.h:122#: ../data/soundconverter.desktop.in.in.h:1
23msgid "Sound Converter"
24msgstr "Sound Converter"
25
26#: ../data/soundconverter.desktop.in.in.h:2
23msgid "Audio Format Converter"27msgid "Audio Format Converter"
24msgstr "Конвертор на аудио формати"28msgstr "Конвертор на аудио формати"
2529
26#: ../data/soundconverter.desktop.in.in.h:2
27msgid "Convert audio files into other formats"
28msgstr "Обръщане на аудио файлове в други формати"
29
30#: ../data/soundconverter.desktop.in.in.h:330#: ../data/soundconverter.desktop.in.in.h:3
31msgid "Sound Converter"31msgid "Converts audio files into other formats"
32msgstr "Sound Converter"32msgstr ""
3333
34#: ../data/soundconverter.glade.h:134#: ../data/soundconverter.glade.h:1
35msgid "16 bits (default)"35msgid "GNOME-powered Sound Conversion"
36msgstr ""36msgstr ""
3737
38#: ../data/soundconverter.glade.h:238#: ../data/soundconverter.glade.h:2
39msgid "32 bits"39msgid "Website"
40msgstr ""40msgstr ""
4141
42#: ../data/soundconverter.glade.h:342#: ../data/soundconverter.glade.h:3
43msgid "8 bits (very low quality)"43msgid "dialog1"
44msgstr ""44msgstr "dialog1"
4545
46#: ../data/soundconverter.glade.h:446#: ../data/soundconverter.glade.h:4
47msgid "<b>How to name files?</b>"47msgid "Filter "
48msgstr "<b>Как ще се казва файла?</b>"48msgstr "Филтър "
4949
50#: ../data/soundconverter.glade.h:550#: ../data/soundconverter.glade.h:5
51msgid "<b>Type of result?</b>"51msgid "Error"
52msgstr "<b>Формат на изходният файл?</b>"52msgstr "Грешка"
5353
54#: ../data/soundconverter.glade.h:654#: ../data/soundconverter.glade.h:6
55msgid "<b>Where to place results?</b>"55msgid "File exists already"
56msgstr "<b>Къде да поставим резултата?</b>"56msgstr "Файла вече съществува"
5757
58#: ../data/soundconverter.glade.h:758#: ../data/soundconverter.glade.h:7
59msgid "_Overwrite"
60msgstr "_Презапиши"
61
62#: ../data/soundconverter.glade.h:8
63msgid "_Skip"
64msgstr "_Прескочи"
65
66#: ../data/soundconverter.glade.h:9
59msgid "<big><b>File exists already</b></big>\n"67msgid "<big><b>File exists already</b></big>\n"
60msgstr "<big><b>Файла вече съществува</b></big>\n"68msgstr "<big><b>Файла вече съществува</b></big>\n"
6169
62#: ../data/soundconverter.glade.h:9
63msgid "<i>Example filename:</i>"
64msgstr "<i>Примерно наименование:</i>"
65
66#: ../data/soundconverter.glade.h:10
67msgid "AAC"
68msgstr ""
69
70#: ../data/soundconverter.glade.h:1170#: ../data/soundconverter.glade.h:11
71msgid "AAC (.m4a)"71msgid "_Apply to entire queue"
72msgstr ""72msgstr "_Приложи към цялата опашка"
7373
74#: ../data/soundconverter.glade.h:1274#: ../data/soundconverter.glade.h:12 ../soundconverter/ui.py:387
75msgid "Add _Folder"75msgid "artist/album"
76msgstr "_Добави папка"76msgstr "изпълнител/албум"
7777
78#: ../data/soundconverter.glade.h:1378#: ../data/soundconverter.glade.h:13 ../soundconverter/ui.py:389
79msgid "Average (ABR)"79msgid "artist - album"
80msgstr ""80msgstr "изпълнител - албум"
8181
82#: ../data/soundconverter.glade.h:1482#: ../data/soundconverter.glade.h:14
83msgid "Better (Slower)"83msgid "Very Low"
84msgstr ""84msgstr ""
8585
86#: ../data/soundconverter.glade.h:1586#: ../data/soundconverter.glade.h:15
87msgid "Bitrate mode:"87msgid "Low"
88msgstr "Тип на плътността kb/s"88msgstr ""
8989
90#: ../data/soundconverter.glade.h:1690#: ../data/soundconverter.glade.h:16
91msgid "Choose..."91msgid "Normal"
92msgstr "Изберете..."92msgstr ""
9393
94#: ../data/soundconverter.glade.h:1794#: ../data/soundconverter.glade.h:17
95msgid "Compression:"95msgid "High"
96msgstr "Компресия:"96msgstr ""
9797
98#: ../data/soundconverter.glade.h:1898#: ../data/soundconverter.glade.h:18
99msgid "Constant (CBR)"99msgid "Very High"
100msgstr ""100msgstr ""
101101
102#: ../data/soundconverter.glade.h:19102#: ../data/soundconverter.glade.h:19
103msgid "Create subfolders: "103msgid "Insanely High"
104msgstr "Създаване на подпапки "104msgstr ""
105105
106#: ../data/soundconverter.glade.h:20106#: ../data/soundconverter.glade.h:20
107msgid "Default"107msgid "8 bits (very low quality)"
108msgstr ""108msgstr ""
109109
110#: ../data/soundconverter.glade.h:21110#: ../data/soundconverter.glade.h:21
111msgid "Delete original file"111msgid "16 bits (default)"
112msgstr "Изтриване на оригиналният файл"112msgstr ""
113113
114#: ../data/soundconverter.glade.h:22114#: ../data/soundconverter.glade.h:22
115msgid "Error"115msgid "32 bits"
116msgstr "Грешка"116msgstr ""
117117
118#: ../data/soundconverter.glade.h:23118#: ../data/soundconverter.glade.h:23
119msgid "FLAC"119msgid "Less (Faster)"
120msgstr "FLAC"120msgstr ""
121121
122#: ../data/soundconverter.glade.h:24122#: ../data/soundconverter.glade.h:24
123msgid "FLAC Lossless (.flac)"123msgid "Default"
124msgstr ""124msgstr ""
125125
126#: ../data/soundconverter.glade.h:25126#: ../data/soundconverter.glade.h:25
127msgid "File exists already"127msgid "Better (Slower)"
128msgstr "Файла вече съществува"128msgstr ""
129129
130#: ../data/soundconverter.glade.h:26130#: ../data/soundconverter.glade.h:26
131msgid "Filename pattern: "131msgid "Constant (CBR)"
132msgstr "Шаблон за наименоване "132msgstr ""
133133
134#: ../data/soundconverter.glade.h:27134#: ../data/soundconverter.glade.h:27
135msgid "Filter "135msgid "Average (ABR)"
136msgstr "Филтър "136msgstr ""
137137
138#: ../data/soundconverter.glade.h:28138#: ../data/soundconverter.glade.h:28
139msgid "Force mono output"139msgid "Variable (VBR) - Best quality"
140msgstr ""140msgstr ""
141141
142#: ../data/soundconverter.glade.h:29142#: ../data/soundconverter.glade.h:29
143msgid "Format: "143msgid "Ogg Vorbis (.ogg)"
144msgstr "Формат: "144msgstr ""
145145
146#: ../data/soundconverter.glade.h:30146#: ../data/soundconverter.glade.h:30
147msgid "GNOME Audio Profile"147msgid "MP3 (.mp3)"
148msgstr ""148msgstr ""
149149
150#: ../data/soundconverter.glade.h:31150#: ../data/soundconverter.glade.h:31
151msgid "GNOME-powered Sound Conversion"151msgid "FLAC Lossless (.flac)"
152msgstr ""152msgstr ""
153153
154#: ../data/soundconverter.glade.h:32154#: ../data/soundconverter.glade.h:32
155msgid "High"155msgid "MS Wave (.wav)"
156msgstr ""156msgstr ""
157157
158#: ../data/soundconverter.glade.h:33158#: ../data/soundconverter.glade.h:33
159msgid "Insanely High"159msgid "AAC (.m4a)"
160msgstr ""160msgstr ""
161161
162#: ../data/soundconverter.glade.h:34162#: ../data/soundconverter.glade.h:34
163msgid "Into a specified folder"163msgid "GNOME Audio Profile"
164msgstr "В изрично упомената папка"164msgstr ""
165165
166#: ../data/soundconverter.glade.h:35166#: ../data/soundconverter.glade.h:35
167msgid "Less (Faster)"167msgid "track_number - track_title"
168msgstr ""168msgstr ""
169169
170#: ../data/soundconverter.glade.h:36170#: ../data/soundconverter.glade.h:36
171msgid "Limit number of parallel jobs"171msgid "track_title"
172msgstr ""172msgstr ""
173173
174#: ../data/soundconverter.glade.h:37174#: ../data/soundconverter.glade.h:37
175msgid "Low"175msgid "Preferences"
176msgstr ""176msgstr "Настройки"
177177
178#: ../data/soundconverter.glade.h:38178#: ../data/soundconverter.glade.h:38
179msgid "MP3"179msgid "Same folder as the input file"
180msgstr "MP3"180msgstr "В същата папка, в която се намира входящия файл"
181181
182#: ../data/soundconverter.glade.h:39182#: ../data/soundconverter.glade.h:39
183msgid "MP3 (.mp3)"183msgid "Choose..."
184msgstr ""184msgstr "Изберете..."
185185
186#: ../data/soundconverter.glade.h:40186#: ../data/soundconverter.glade.h:40
187msgid "MP3 Encoder is not present."187msgid "Into a specified folder"
188msgstr "Не е намерен кодек за MP3"188msgstr "В изрично упомената папка"
189189
190#: ../data/soundconverter.glade.h:41190#: ../data/soundconverter.glade.h:41
191msgid "MS Wave (.wav)"191msgid "Create subfolders: "
192msgstr ""192msgstr "Създаване на подпапки "
193193
194#: ../data/soundconverter.glade.h:42194#: ../data/soundconverter.glade.h:42
195msgid "Normal"195msgid "Delete original file"
196msgstr ""196msgstr "Изтриване на оригиналният файл"
197197
198#: ../data/soundconverter.glade.h:43198#: ../data/soundconverter.glade.h:43
199msgid "Ogg"199msgid "<b>Where to place results?</b>"
200msgstr ""200msgstr "<b>Къде да поставим резултата?</b>"
201201
202#: ../data/soundconverter.glade.h:44202#: ../data/soundconverter.glade.h:44
203msgid "Ogg Vorbis (.ogg)"203msgid "Filename pattern: "
204msgstr ""204msgstr "Шаблон за наименоване "
205205
206#: ../data/soundconverter.glade.h:45206#: ../data/soundconverter.glade.h:45
207msgid "Preferences"207msgid "Replace all messy characters"
208msgstr "Настройки"208msgstr "Заместване на всички неправилни символи"
209209
210#: ../data/soundconverter.glade.h:46210#: ../data/soundconverter.glade.h:46
211msgid "Profile:"211msgid "Remove all characters except letters, digits and ./_-"
212msgstr ""212msgstr ""
213213
214#: ../data/soundconverter.glade.h:47214#: ../data/soundconverter.glade.h:47
215msgid "Quality:"215msgid "<i>Example filename:</i>"
216msgstr "Качество:"216msgstr "<i>Примерно наименование:</i>"
217217
218#: ../data/soundconverter.glade.h:48218#: ../data/soundconverter.glade.h:48
219msgid "Read how to install"219msgid "<b>How to name files?</b>"
220msgstr "Прочетете как се инсталира"220msgstr "<b>Как ще се казва файла?</b>"
221221
222#: ../data/soundconverter.glade.h:49222#: ../data/soundconverter.glade.h:49
223msgid "Remove all chars except letters, digits and ./_-"223msgid "Format: "
224msgstr "Премахване на всички символи, с изключение на букви, цифри и ./_-"224msgstr "Формат: "
225225
226#: ../data/soundconverter.glade.h:50226#: ../data/soundconverter.glade.h:50
227msgid "Replace all messy characters"227msgid "Quality:"
228msgstr "Заместване на всички неправилни символи"228msgstr "Качество:"
229229
230#: ../data/soundconverter.glade.h:51230#: ../data/soundconverter.glade.h:51
231msgid "Resample"231msgid "Use .oga extension"
232msgstr ""232msgstr "Използвай .oga разширение"
233233
234#: ../data/soundconverter.glade.h:52234#: ../data/soundconverter.glade.h:52
235msgid "Same folder as the input file"235msgid "Ogg"
236msgstr "В същата папка, в която се намира входящия файл"236msgstr ""
237237
238#: ../data/soundconverter.glade.h:53238#: ../data/soundconverter.glade.h:53
239msgid "Sample width:"239msgid "Bitrate mode:"
240msgstr ""240msgstr "Тип на плътността kb/s"
241241
242#: ../data/soundconverter.glade.h:54242#: ../data/soundconverter.glade.h:54
243msgid "SoundConverter"243msgid "MP3"
244msgstr "SoundConverter"244msgstr "MP3"
245245
246#: ../data/soundconverter.glade.h:55246#: ../data/soundconverter.glade.h:55
247msgid "Use .oga extension"247msgid "Compression:"
248msgstr "Използвай .oga разширение"248msgstr "Компресия:"
249249
250#: ../data/soundconverter.glade.h:56250#: ../data/soundconverter.glade.h:56
251msgid "Variable (VBR) - Best quality"251msgid "FLAC"
252msgstr ""252msgstr "FLAC"
253253
254#: ../data/soundconverter.glade.h:57254#: ../data/soundconverter.glade.h:57
255msgid "Very High"255msgid "Sample width:"
256msgstr ""256msgstr ""
257257
258#: ../data/soundconverter.glade.h:58258#: ../data/soundconverter.glade.h:58
259msgid "Very Low"
260msgstr ""
261
262#: ../data/soundconverter.glade.h:59
263msgid "WAV"259msgid "WAV"
264msgstr "WAV"260msgstr "WAV"
265261
262#: ../data/soundconverter.glade.h:59
263msgid "AAC"
264msgstr ""
265
266#: ../data/soundconverter.glade.h:60266#: ../data/soundconverter.glade.h:60
267msgid "Website"267msgid "Profile:"
268msgstr ""268msgstr ""
269269
270#: ../data/soundconverter.glade.h:61270#: ../data/soundconverter.glade.h:61
271msgid "Where to place results?"271msgid "gst-profile"
272msgstr "Къде да поставим резултата?"272msgstr ""
273273
274#: ../data/soundconverter.glade.h:62274#: ../data/soundconverter.glade.h:62
275msgid "_Add File"275msgid "<b>Type of result?</b>"
276msgstr "_Добави файл"276msgstr "<b>Формат на изходният файл?</b>"
277277
278#: ../data/soundconverter.glade.h:63278#: ../data/soundconverter.glade.h:63
279msgid "_Apply to entire queue"279msgid "Resample"
280msgstr "_Приложи към цялата опашка"280msgstr ""
281281
282#: ../data/soundconverter.glade.h:64282#: ../data/soundconverter.glade.h:64
283msgid "_Edit"283msgid "Force mono output"
284msgstr "_Редактиране"284msgstr ""
285285
286#: ../data/soundconverter.glade.h:65286#: ../data/soundconverter.glade.h:65
287msgid "_File"287msgid "Limit number of parallel jobs"
288msgstr ""288msgstr ""
289289
290#: ../data/soundconverter.glade.h:66290#: ../data/soundconverter.glade.h:66
291msgid "_Help"291msgid "MP3 Encoder is not present."
292msgstr ""292msgstr "Не е намерен кодек за MP3"
293293
294#: ../data/soundconverter.glade.h:67294#: ../data/soundconverter.glade.h:67
295msgid "_Overwrite"295msgid "Read how to install"
296msgstr "_Презапиши"296msgstr "Прочетете как се инсталира"
297297
298#: ../data/soundconverter.glade.h:68298#: ../data/soundconverter.glade.h:68
299msgid "_Skip"299msgid "Where to place results?"
300msgstr "_Прескочи"300msgstr "Къде да поставим резултата?"
301301
302#: ../data/soundconverter.glade.h:69 ../soundconverter/ui.py:408302#: ../data/soundconverter.glade.h:69
303msgid "artist - album"303msgid "SoundConverter"
304msgstr "изпълнител - албум"304msgstr "SoundConverter"
305305
306#: ../data/soundconverter.glade.h:70 ../soundconverter/ui.py:406306#: ../data/soundconverter.glade.h:70
307msgid "artist/album"307msgid "_File"
308msgstr "изпълнител/албум"308msgstr ""
309309
310#: ../data/soundconverter.glade.h:71310#: ../data/soundconverter.glade.h:71
311msgid "dialog1"311msgid "_Edit"
312msgstr "dialog1"312msgstr "_Редактиране"
313313
314#: ../data/soundconverter.glade.h:72314#: ../data/soundconverter.glade.h:72
315msgid "gst-profile"315msgid "_Help"
316msgstr ""316msgstr ""
317317
318#: ../data/soundconverter.glade.h:73318#: ../data/soundconverter.glade.h:73
319msgid "track_number - track_title"319msgid "_Add File"
320msgstr ""320msgstr "_Добави файл"
321321
322#: ../data/soundconverter.glade.h:74322#: ../data/soundconverter.glade.h:74
323msgid "track_title"323msgid "Add _Folder"
324msgstr ""324msgstr "_Добави папка"
325325
326#: ../bin/soundconverter.py:97326#: ../bin/soundconverter.py:113
327msgid ""327msgid ""
328"Convert in batch mode, from command line, without a graphical user\n"328"Convert in batch mode, from command line, without a graphical user\n"
329" interface. You can use this from, say, shell scripts."329" interface. You can use this from, say, shell scripts."
@@ -331,41 +331,41 @@
331"Конвертирай в пакетен режим, от командния ред, без графичен\n"331"Конвертирай в пакетен режим, от командния ред, без графичен\n"
332" интерфейс. Това е използваемо, да кажем, чрез скриптове"332" интерфейс. Това е използваемо, да кажем, чрез скриптове"
333333
334#: ../bin/soundconverter.py:102334#: ../bin/soundconverter.py:118
335msgid ""335msgid ""
336"Show tags for input files instead of convertingthem. This indicates \n"336"Show tags for input files instead of converting them. This indicates \n"
337" command line batch modeand disables the graphical user interface."337" command line batch mode and disables the graphical user interface."
338msgstr ""338msgstr ""
339339
340#: ../bin/soundconverter.py:107340#: ../bin/soundconverter.py:122
341#, python-format341#, python-format
342msgid ""342msgid ""
343"Set the output MIME type for batch mode. The defaultis %s. Note that you "343"Set the output MIME type for batch mode. The default is %s. Note that you "
344"probably want to set the outputsuffix as well."344"probably want to set the output suffix as well."
345msgstr ""345msgstr ""
346346
347#: ../bin/soundconverter.py:111347#: ../bin/soundconverter.py:126
348msgid "Be quiet. Don't write normal output, only errors."348msgid "Be quiet. Don't write normal output, only errors."
349msgstr "Съобщавай само грешките."349msgstr "Съобщавай само грешките."
350350
351#: ../bin/soundconverter.py:113351#: ../bin/soundconverter.py:128
352msgid "Print additional debug information"352msgid "Displays additional debug information"
353msgstr ""353msgstr ""
354354
355#: ../bin/soundconverter.py:115355#: ../bin/soundconverter.py:130
356#, python-format356#, python-format
357msgid ""357msgid ""
358"Set the output filename suffix for batch mode.The default is %s . Note that "358"Set the output filename suffix for batch mode.The default is %s . Note that "
359"the suffix does notaffect\n"359"the suffix does not affect\n"
360" the output MIME type."360" the output MIME type."
361msgstr ""361msgstr ""
362362
363#: ../bin/soundconverter.py:119363#: ../bin/soundconverter.py:134
364msgid "Force number of concurrent conversions."364msgid "Force number of concurrent conversions."
365msgstr ""365msgstr ""
366366
367#: ../bin/soundconverter.py:121367#: ../bin/soundconverter.py:136
368msgid "Show GStreamer Options"368msgid "Shows GStreamer Options"
369msgstr ""369msgstr ""
370370
371#: ../soundconverter/error.py:37371#: ../soundconverter/error.py:37
@@ -420,53 +420,56 @@
420"Грешка: %s\n"420"Грешка: %s\n"
421"%s\n"421"%s\n"
422422
423#: ../soundconverter/gstreamer.py:482423#: ../soundconverter/gstreamer.py:189
424msgid "Plugin installation aborted."
425msgstr ""
426
427#. TODO: is this used ?
428#. TODO: add proper error management when an encoder cannot be created
429#: ../soundconverter/gstreamer.py:519
424#, python-format430#, python-format
425msgid "Cannot create a decoder for '%s' format."431msgid "Cannot create a decoder for '%s' format."
426msgstr "Невъзможно създаването на декодер за формата '%s'"432msgstr "Невъзможно създаването на декодер за формата '%s'"
427433
428#: ../soundconverter/gstreamer.py:499434#: ../soundconverter/gstreamer.py:530
429#, python-format435#, python-format
430msgid "Cannot create '%s' folder."436msgid "Cannot create '%s' folder."
431msgstr "Невъзможно създаването на папка '%s'"437msgstr "Невъзможно създаването на папка '%s'"
432438
433#. pass439#. pass
434#: ../soundconverter/gstreamer.py:543440#: ../soundconverter/gstreamer.py:571
435msgid "GStreamer Error:"441msgid "GStreamer Error:"
436msgstr ""442msgstr ""
437443
438#: ../soundconverter/gstreamer.py:627444#: ../soundconverter/gstreamer.py:656
439msgid "Conversion Canceled"445msgid "Conversion Canceled"
440msgstr ""446msgstr ""
441447
442#: ../soundconverter/gstreamer.py:634448#: ../soundconverter/gstreamer.py:663
443msgid "Conversion Error"449msgid "Conversion Error"
444msgstr ""450msgstr ""
445451
446#: ../soundconverter/gstreamer.py:667452#: ../soundconverter/gstreamer.py:696
447#, python-format453#, python-format
448msgid "Access denied: '%s'"454msgid "Access denied: '%s'"
449msgstr ""455msgstr ""
450456
451#: ../soundconverter/gstreamer.py:683457#: ../soundconverter/gstreamer.py:712
452msgid "Cannot overwrite source file(s)!"458msgid "Cannot overwrite source file(s)!"
453msgstr ""459msgstr ""
454460
455#: ../soundconverter/gstreamer.py:696461#: ../soundconverter/gstreamer.py:725
456#, python-format462#, python-format
457msgid ""463msgid ""
458"The output file <i>%s</i>\n"464"The output file <i>%s</i>\n"
459" exists already.\n"465" already exists.\n"
460" Do you want to skip the file, overwrite it or cancel the conversion?\n"466" Do you want to skip the file, overwrite it or cancel the conversion?\n"
461msgstr ""467msgstr ""
462"Изходният файл <i>%s</i>\n"
463" вече съществува.\n"
464" Искате ли да го прескочим, да го презапишем или да отменим конвертирането?\n"
465468
466#: ../soundconverter/gstreamer.py:800469#: ../soundconverter/gstreamer.py:830
467#, python-format470#, python-format
468msgid "Conversion done, in %s"471msgid "Conversion done in %s"
469msgstr "Конвертирането е готово за %s"472msgstr ""
470473
471#: ../soundconverter/namegenerator.py:76474#: ../soundconverter/namegenerator.py:76
472msgid "Unknown Album"475msgid "Unknown Album"
@@ -476,22 +479,18 @@
476msgid "Unknown Artist"479msgid "Unknown Artist"
477msgstr ""480msgstr ""
478481
479#: ../soundconverter/namegenerator.py:78
480msgid "Unknown Title"
481msgstr ""
482
483#. traductors: These are the custom filename patterns. Only if it makes sense.482#. traductors: These are the custom filename patterns. Only if it makes sense.
484#: ../soundconverter/settings.py:43483#: ../soundconverter/settings.py:47
485msgid ""484msgid ""
486"Artist Album Title Track Total Genre Date Year Timestamp DiscNumber "485"Artist Album Title Track Total Genre Date Year Timestamp DiscNumber "
487"DiscTotal Ext"486"DiscTotal Ext"
488msgstr ""487msgstr ""
489488
490#: ../soundconverter/settings.py:80489#: ../soundconverter/settings.py:84
491msgid "All files"490msgid "All files"
492msgstr ""491msgstr ""
493492
494#: ../soundconverter/ui.py:123 ../soundconverter/ui.py:139493#: ../soundconverter/ui.py:96 ../soundconverter/ui.py:112
495#, python-format494#, python-format
496msgid ""495msgid ""
497"\n"496"\n"
@@ -499,93 +498,97 @@
499"%s\n"498"%s\n"
500msgstr ""499msgstr ""
501500
502#: ../soundconverter/ui.py:229501#: ../soundconverter/ui.py:202
503msgid "Scanning files..."502msgid "Scanning files..."
504msgstr ""503msgstr ""
505504
506#: ../soundconverter/ui.py:328505#: ../soundconverter/ui.py:309
507msgid "Adding files..."506msgid "Adding files..."
508msgstr ""507msgstr ""
509508
510#: ../soundconverter/ui.py:396509#: ../soundconverter/ui.py:377
511msgid "Same as input, but replacing the suffix"510msgid "Same as input, but replacing the suffix"
512msgstr "Като оригиналния файл, но замествайки разширението"511msgstr "Като оригиналния файл, но замествайки разширението"
513512
514#: ../soundconverter/ui.py:398513#: ../soundconverter/ui.py:379
515msgid "Same as input, but with an additional suffix"514msgid "Same as input, but with an additional suffix"
516msgstr "Като оригиналния файл, но добавяйки разширение"515msgstr "Като оригиналния файл, но добавяйки разширение"
517516
518#: ../soundconverter/ui.py:399517#: ../soundconverter/ui.py:380
519msgid "Track number - title"518msgid "Track number - title"
520msgstr "Номер на песен - Заглавие"519msgstr "Номер на песен - Заглавие"
521520
522#: ../soundconverter/ui.py:400521#: ../soundconverter/ui.py:381
523msgid "Track title"522msgid "Track title"
524msgstr ""523msgstr ""
525524
526#: ../soundconverter/ui.py:401525#: ../soundconverter/ui.py:382
527msgid "Artist - title"526msgid "Artist - title"
528msgstr "Изпълнител - Заглавие"527msgstr "Изпълнител - Заглавие"
529528
530#: ../soundconverter/ui.py:402529#: ../soundconverter/ui.py:383
531msgid "Custom filename pattern"530msgid "Custom filename pattern"
532msgstr "Собствен шаблон за наименование на файла"531msgstr "Собствен шаблон за наименование на файла"
533532
534#: ../soundconverter/ui.py:407533#: ../soundconverter/ui.py:388
535msgid "artist-album"534msgid "artist-album"
536msgstr "изпълнител-албум"535msgstr "изпълнител-албум"
537536
538#: ../soundconverter/ui.py:464537#: ../soundconverter/ui.py:445
539msgid "Available patterns:"538msgid "Available patterns:"
540msgstr ""539msgstr ""
541540
542#: ../soundconverter/ui.py:650541#: ../soundconverter/ui.py:631
543#, python-format542#, python-format
544msgid "Into folder %s"543msgid "Into folder %s"
545msgstr "В папка %s"544msgstr "В папка %s"
546545
547#: ../soundconverter/ui.py:727546#: ../soundconverter/ui.py:708
548#, python-format547#, python-format
549msgid "Target bitrate: %s"548msgid "Target bitrate: %s"
550msgstr "Изходна плътност kb/s: %s"549msgstr "Изходна плътност kb/s: %s"
551550
552#: ../soundconverter/ui.py:1069551#: ../soundconverter/ui.py:1050
553msgid "Open a file"552msgid "Open a file"
554msgstr ""553msgstr ""
555554
556#: ../soundconverter/ui.py:1163555#: ../soundconverter/ui.py:1144
557msgid "Add Folder..."556msgid "Add Folder..."
558msgstr "Добави папка..."557msgstr "Добави папка..."
559558
560#: ../soundconverter/ui.py:1336559#: ../soundconverter/ui.py:1322
561msgid "Reading tags..."560msgid "Reading tags..."
562msgstr ""561msgstr ""
563562
564#: ../soundconverter/ui.py:1347563#: ../soundconverter/ui.py:1324
564msgid "Preparing conversion..."
565msgstr ""
566
567#: ../soundconverter/ui.py:1339
565msgid "Conversion cancelled"568msgid "Conversion cancelled"
566msgstr ""569msgstr ""
567570
568#: ../soundconverter/ui.py:1350571#: ../soundconverter/ui.py:1342
569msgid "Error when converting"572msgid "Error when converting"
570msgstr ""573msgstr ""
571574
572#: ../soundconverter/ui.py:1364575#: ../soundconverter/ui.py:1357
573msgid "Converting"576msgid "Converting"
574msgstr "Конвертиране"577msgstr "Конвертиране"
575578
576#: ../soundconverter/ui.py:1384579#: ../soundconverter/ui.py:1377
577msgid "Canceled"580msgid "Canceled"
578msgstr "Отменено"581msgstr "Отменено"
579582
580#: ../soundconverter/ui.py:1457583#: ../soundconverter/ui.py:1450
581msgid "Paused"584msgid "Paused"
582msgstr "Прекъснато"585msgstr "Прекъснато"
583586
584#: ../soundconverter/ui.py:1474587#: ../soundconverter/ui.py:1468
585#, python-format588#, python-format
586msgid "%d:%02d left"589msgid "%d:%02d left"
587msgstr "Остават %d:%02d"590msgstr "Остават %d:%02d"
588591
589#: ../soundconverter/ui.py:1480592#: ../soundconverter/ui.py:1474
590msgid "Ready"593msgid "Ready"
591msgstr "Готово"594msgstr "Готово"
592595
=== 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 @@
9msgstr ""9msgstr ""
10"Project-Id-Version: soundconverter\n"10"Project-Id-Version: soundconverter\n"
11"Report-Msgid-Bugs-To: \n"11"Report-Msgid-Bugs-To: \n"
12"POT-Creation-Date: 2012-01-12 22:56+0100\n"12"POT-Creation-Date: 2012-07-30 15:28+0000\n"
13"PO-Revision-Date: 2012-01-13 03:53+0000\n"13"PO-Revision-Date: 2012-01-13 03:53+0000\n"
14"Last-Translator: GautierPortet <kassoulet@gmail.com>\n"14"Last-Translator: GautierPortet <kassoulet@gmail.com>\n"
15"Language-Team: Breton <br@li.org>\n"15"Language-Team: Breton <br@li.org>\n"
16"MIME-Version: 1.0\n"16"MIME-Version: 1.0\n"
17"Content-Type: text/plain; charset=UTF-8\n"17"Content-Type: text/plain; charset=UTF-8\n"
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
19"X-Launchpad-Export-Date: 2012-01-18 21:12+0000\n"19"X-Launchpad-Export-Date: 2012-10-06 15:24+0000\n"
20"X-Generator: Launchpad (build 14681)\n"20"X-Generator: Launchpad (build 16061)\n"
21"Language: br\n"21"Language: br\n"
2222
23#: ../data/soundconverter.desktop.in.in.h:123#: ../data/soundconverter.desktop.in.in.h:1
24msgid "Sound Converter"
25msgstr "Amdroer Sound Converter"
26
27#: ../data/soundconverter.desktop.in.in.h:2
24msgid "Audio Format Converter"28msgid "Audio Format Converter"
25msgstr "Amdroadur etre furmadoù klevet"29msgstr "Amdroadur etre furmadoù klevet"
2630
27#: ../data/soundconverter.desktop.in.in.h:2
28msgid "Convert audio files into other formats"
29msgstr "Amdreiñ restroù klevet ouzh furmadoù all"
30
31#: ../data/soundconverter.desktop.in.in.h:331#: ../data/soundconverter.desktop.in.in.h:3
32msgid "Sound Converter"32msgid "Converts audio files into other formats"
33msgstr "Amdroer Sound Converter"33msgstr ""
3434
35#: ../data/soundconverter.glade.h:135#: ../data/soundconverter.glade.h:1
36msgid "16 bits (default)"36msgid "GNOME-powered Sound Conversion"
37msgstr ""37msgstr ""
3838
39#: ../data/soundconverter.glade.h:239#: ../data/soundconverter.glade.h:2
40msgid "32 bits"40msgid "Website"
41msgstr ""41msgstr ""
4242
43#: ../data/soundconverter.glade.h:343#: ../data/soundconverter.glade.h:3
44msgid "8 bits (very low quality)"44msgid "dialog1"
45msgstr ""45msgstr "dialog1"
4646
47#: ../data/soundconverter.glade.h:447#: ../data/soundconverter.glade.h:4
48msgid "<b>How to name files?</b>"48msgid "Filter "
49msgstr "<b>Penaos adanviñ ar restroù?</b>"49msgstr "Sil "
5050
51#: ../data/soundconverter.glade.h:551#: ../data/soundconverter.glade.h:5
52msgid "<b>Type of result?</b>"52msgid "Error"
53msgstr "<b>Furmad ar restr er maez?</b>"53msgstr "Fazi"
5454
55#: ../data/soundconverter.glade.h:655#: ../data/soundconverter.glade.h:6
56msgid "<b>Where to place results?</b>"56msgid "File exists already"
57msgstr "<b>Pelec'h lechiañ ar restroù amdreet?</b>"57msgstr "Bez eus c'hoazh ar restr"
5858
59#: ../data/soundconverter.glade.h:759#: ../data/soundconverter.glade.h:7
60msgid "_Overwrite"
61msgstr "_Flastrañ"
62
63#: ../data/soundconverter.glade.h:8
64msgid "_Skip"
65msgstr "_Mont e biou"
66
67#: ../data/soundconverter.glade.h:9
60msgid "<big><b>File exists already</b></big>\n"68msgid "<big><b>File exists already</b></big>\n"
61msgstr "<big><b>Bez eus c'hoazh ar restr</b></big>\n"69msgstr "<big><b>Bez eus c'hoazh ar restr</b></big>\n"
6270
63#: ../data/soundconverter.glade.h:9
64msgid "<i>Example filename:</i>"
65msgstr "<i>Skouer anv restr:</i>"
66
67#: ../data/soundconverter.glade.h:10
68msgid "AAC"
69msgstr ""
70
71#: ../data/soundconverter.glade.h:1171#: ../data/soundconverter.glade.h:11
72msgid "AAC (.m4a)"72msgid "_Apply to entire queue"
73msgstr ""73msgstr "_Arloañ evit tout ar steudad c'hortoz"
7474
75#: ../data/soundconverter.glade.h:1275#: ../data/soundconverter.glade.h:12 ../soundconverter/ui.py:387
76msgid "Add _Folder"76msgid "artist/album"
77msgstr "Ouzhpennañ un _teuliad"77msgstr "arzour/albom"
7878
79#: ../data/soundconverter.glade.h:1379#: ../data/soundconverter.glade.h:13 ../soundconverter/ui.py:389
80msgid "Average (ABR)"80msgid "artist - album"
81msgstr ""81msgstr "arzour - albom"
8282
83#: ../data/soundconverter.glade.h:1483#: ../data/soundconverter.glade.h:14
84msgid "Better (Slower)"84msgid "Very Low"
85msgstr ""85msgstr ""
8686
87#: ../data/soundconverter.glade.h:1587#: ../data/soundconverter.glade.h:15
88msgid "Bitrate mode:"88msgid "Low"
89msgstr "Kas binarel:"89msgstr ""
9090
91#: ../data/soundconverter.glade.h:1691#: ../data/soundconverter.glade.h:16
92msgid "Choose..."92msgid "Normal"
93msgstr "Furchal..."93msgstr ""
9494
95#: ../data/soundconverter.glade.h:1795#: ../data/soundconverter.glade.h:17
96msgid "Compression:"96msgid "High"
97msgstr ""97msgstr ""
9898
99#: ../data/soundconverter.glade.h:1899#: ../data/soundconverter.glade.h:18
100msgid "Constant (CBR)"100msgid "Very High"
101msgstr ""101msgstr ""
102102
103#: ../data/soundconverter.glade.h:19103#: ../data/soundconverter.glade.h:19
104msgid "Create subfolders: "104msgid "Insanely High"
105msgstr "Krouiñ is-teuliadoù : "105msgstr ""
106106
107#: ../data/soundconverter.glade.h:20107#: ../data/soundconverter.glade.h:20
108msgid "Default"108msgid "8 bits (very low quality)"
109msgstr ""109msgstr ""
110110
111#: ../data/soundconverter.glade.h:21111#: ../data/soundconverter.glade.h:21
112msgid "Delete original file"112msgid "16 bits (default)"
113msgstr "Skarzhañ ar restr orin"113msgstr ""
114114
115#: ../data/soundconverter.glade.h:22115#: ../data/soundconverter.glade.h:22
116msgid "Error"116msgid "32 bits"
117msgstr "Fazi"117msgstr ""
118118
119#: ../data/soundconverter.glade.h:23119#: ../data/soundconverter.glade.h:23
120msgid "FLAC"120msgid "Less (Faster)"
121msgstr "FLAC"121msgstr ""
122122
123#: ../data/soundconverter.glade.h:24123#: ../data/soundconverter.glade.h:24
124msgid "FLAC Lossless (.flac)"124msgid "Default"
125msgstr ""125msgstr ""
126126
127#: ../data/soundconverter.glade.h:25127#: ../data/soundconverter.glade.h:25
128msgid "File exists already"128msgid "Better (Slower)"
129msgstr "Bez eus c'hoazh ar restr"129msgstr ""
130130
131#: ../data/soundconverter.glade.h:26131#: ../data/soundconverter.glade.h:26
132msgid "Filename pattern: "132msgid "Constant (CBR)"
133msgstr "Goustur an anv restr : "133msgstr ""
134134
135#: ../data/soundconverter.glade.h:27135#: ../data/soundconverter.glade.h:27
136msgid "Filter "136msgid "Average (ABR)"
137msgstr "Sil "137msgstr ""
138138
139#: ../data/soundconverter.glade.h:28139#: ../data/soundconverter.glade.h:28
140msgid "Force mono output"140msgid "Variable (VBR) - Best quality"
141msgstr ""141msgstr ""
142142
143#: ../data/soundconverter.glade.h:29143#: ../data/soundconverter.glade.h:29
144msgid "Format: "144msgid "Ogg Vorbis (.ogg)"
145msgstr "Mentrezh : "145msgstr ""
146146
147#: ../data/soundconverter.glade.h:30147#: ../data/soundconverter.glade.h:30
148msgid "GNOME Audio Profile"148msgid "MP3 (.mp3)"
149msgstr ""149msgstr ""
150150
151#: ../data/soundconverter.glade.h:31151#: ../data/soundconverter.glade.h:31
152msgid "GNOME-powered Sound Conversion"152msgid "FLAC Lossless (.flac)"
153msgstr ""153msgstr ""
154154
155#: ../data/soundconverter.glade.h:32155#: ../data/soundconverter.glade.h:32
156msgid "High"156msgid "MS Wave (.wav)"
157msgstr "